From 38939def12bda00e73d96fcbb6f8b90f05bc5e24 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Thu, 13 May 2010 02:32:06 +0000 Subject: 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 --- chrome_frame/chrome_active_document.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'chrome_frame/chrome_active_document.cc') 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(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 doc_object_svc; ScopedComPtr web_browser_events_svc; -- cgit v1.1