Make browser_handles_top_level_requests synchronous.

chrome/browser/external_tab/external_tab_container_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/external_tab/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 390 matching lines @@
       }
       break;
     default:
       NOTREACHED();
       break;
   }
 
   return NULL;
 }
 
+bool ExternalTabContainer::ShouldIgnoreNavigation(
+    WebContents* source,
+    const GURL& url,
+    const content::Referrer& referrer,
+    WindowOpenDisposition disposition,
+    bool is_content_initiated,
+    content::PageTransition transition_type) {
+  // This will make every navigation browser-initiated.
+  // TODO: Investigate modifying ExternalTabContainer to work without canceling
+  // and re-issuing every navigation.
+
+  if (is_content_initiated)
+    source->GetController().LoadURL(url, referrer, transition_type,

[ananta, 2012/04/10 19:45:45]

In ChromeFrame's case we want the top level URL request to be handled by IE,
which is achieved via the RenderViewImpl::OpenURL call in the renderer. This
code as written would just reissue the navigation in the chrome browser which is
incorrect.

[mkosiba (inactive), 2012/04/11 13:49:35]

Ok, should be better now - any ideas on how to see if my changes work?

+                                    std::string());
+  return is_content_initiated;
+}
+
 void ExternalTabContainer::NavigationStateChanged(const WebContents* source,
                                                   unsigned changed_flags) {
   if (automation_) {
     NavigationInfo nav_info;
     if (InitNavigationInfo(&nav_info, content::NAVIGATION_TYPE_NAV_IGNORE, 0))
       automation_->Send(new AutomationMsg_NavigationStateChanged(
           tab_handle_, changed_flags, nav_info));
   }
 }
 
@@ skipping 788 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   WebContents* new_contents =
       ExternalTabContainer::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }