Update to Chromium revision 160122.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@844 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-10-04 19:17:45 +00:00
parent 163cc7d9cc
commit 167c601f29
4 changed files with 5 additions and 6 deletions

View File

@ -295,7 +295,7 @@ void CefBrowserImpl::GetFrameNames(std::vector<CefString>& names) {
WebFrame* it = main_frame;
do {
if (it != main_frame) {
string16 str = it->name();
string16 str = it->uniqueName();
names.push_back(str);
}
it = it->traverseNext(true);
@ -688,7 +688,7 @@ CefRefPtr<CefFrame> CefBrowserImpl::UIT_GetCefFrame(WebFrame* frame) {
cef_frame = GetMainCefFrame(frame->identifier(), url);
} else {
// Locate or create the appropriate reference.
CefString name = string16(frame->name());
CefString name = string16(frame->uniqueName());
DCHECK(!name.empty());
cef_frame = GetOrCreateCefFrame(frame->identifier(), name, url);
}