diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 02:32:06 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 02:32:06 +0000 |
| commit | 38939def12bda00e73d96fcbb6f8b90f05bc5e24 (patch) | |
| tree | 137d62da9edad2cece5e84840a45da5694a5d15e /chrome_frame/chrome_active_document.cc | |
| parent | 69731106c2858255cc7ef38d0241ee94bfa63a93 (diff) | |
| download | chromium_src-38939def12bda00e73d96fcbb6f8b90f05bc5e24.zip chromium_src-38939def12bda00e73d96fcbb6f8b90f05bc5e24.tar.gz chromium_src-38939def12bda00e73d96fcbb6f8b90f05bc5e24.tar.bz2 | |
Fix a ChromeFrame regression introduced by the fix for bug http://code.google.com/p/chromium/issues/detail?id=43922.
The active document url was not being updated when we receive the navigation state from chrome. This caused a couple
of chrome frame tests to fail.
Bug=43922
TBR=amit
Review URL: http://codereview.chromium.org/2052011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 1ef46e4..9403e41 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -685,6 +685,10 @@ void ChromeActiveDocument::UpdateNavigationState( StartsWith(static_cast<BSTR>(url_), kChromeAttachExternalTabPrefix, false); + if (new_navigation_info.url.is_valid()) { + url_.Allocate(UTF8ToWide(new_navigation_info.url.spec()).c_str()); + } + if (is_internal_navigation) { ScopedComPtr<IDocObjectService> doc_object_svc; ScopedComPtr<IWebBrowserEventsService> web_browser_events_svc; |