From 410426f7ac5d9d8dfea3c96b7ccf1c082a8218cb Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Wed, 12 May 2010 22:52:58 +0000 Subject: ChromeFrame would not switch to Chrome at times. The navigation manager in ChromeFrame maintains the current top level URL which is used by the moniker patch to decide whether to wrap the callback. This url is typically set in the Bho in the BeforeNavigate callback. We also had code to update this url when we receive a navigation update from Chrome. The reason we would not switch is because of a race condition between receiving a top level navigation request from chrome and receiving a navigation update for the previous operation which caused us to not wrap the bind status callback. Fix is to not update the url in the callback when we receive a navigation status update. In any case it is Chrome's responsibility to inform ChromeFrame about top level url navigations. We should fix the bug if any in Chrome which caused this hack to go in. Fixes bug http://code.google.com/p/chromium/issues/detail?id=43922 Other changes are to replace the NOTREACHED in the chrome frame automation proxy code with a DLOG as this fires during chrome frame test runs. Bug=43922 Review URL: http://codereview.chromium.org/1991008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47086 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_frame_automation.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'chrome_frame/chrome_frame_automation.cc') diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 49971d8..8d89cbd 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -70,8 +70,7 @@ class ChromeFrameAutomationProxyImpl::TabProxyNotificationMessageFilter tab->OnMessageReceived(message); tab->Release(); } else { - NOTREACHED() << "Failed to find TabProxy for tab:" << tab_handle; - return false; + DLOG(ERROR) << "Failed to find TabProxy for tab:" << tab_handle; } return true; } -- cgit v1.1