Merge revision 561 changes:

- Fix problem with CefBrowser::GetMainFrame() clearing the frame URL value (issue #556).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@563 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-03-30 17:20:26 +00:00
parent 407b10012d
commit 0cf1388a2c
2 changed files with 28 additions and 1 deletions

View File

@ -649,7 +649,8 @@ CefRefPtr<CefFrameImpl> CefBrowserImpl::GetMainCefFrame(int64 id,
if (id != 0)
main_frame_->set_id(id);
main_frame_->set_url(url.spec());
if (!url.is_empty())
main_frame_->set_url(url.spec());
return main_frame_;
}