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 337 matching lines @@
     tab_container = reinterpret_cast<ExternalTabContainer*>(
         ViewProp::GetValue(native_window, kWindowObjectKey));
   }
   return tab_container;
 }
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, content::WebContentsDelegate implementation:
 
 WebContents* ExternalTabContainer::OpenURLFromTab(WebContents* source,
                                                   const OpenURLParams& params) {
-  if (pending()) {
-    pending_open_url_requests_.push_back(params);
-    return NULL;
+  GURL referrer_url = GURL(WebSecurityPolicy::generateReferrerHeader(
+      params.referrer.policy,
+      params.url,
+      WebString::fromUTF8(params.referrer.url.spec())).utf8());
+  content::Referrer referrer = content::Referrer(referrer_url,
+                                                 params.referrer.policy);
+  return OpenUrlInExtenalHost(source, params.url, params.disposition, referrer);
+}
+
+bool ExternalTabContainer::ShouldIgnoreNavigation(
+    WebContents* source,
+    const GURL& url,
+    const content::Referrer& referrer,
+    WindowOpenDisposition disposition,
+    bool is_content_initiated,
+    content::PageTransition transition_type) {
+
+  if (is_content_initiated) {
+    OpenUrlInExtenalHost(source, url, disposition, referrer);
+    return true;
   }
-
-  switch (params.disposition) {
-    case CURRENT_TAB:
-    case SINGLETON_TAB:
-    case NEW_FOREGROUND_TAB:
-    case NEW_BACKGROUND_TAB:
-    case NEW_POPUP:
-    case NEW_WINDOW:
-    case SAVE_TO_DISK:
-      if (automation_) {
-        GURL referrer = GURL(WebSecurityPolicy::generateReferrerHeader(
-            params.referrer.policy,
-            params.url,
-            WebString::fromUTF8(params.referrer.url.spec())).utf8());
-        automation_->Send(new AutomationMsg_OpenURL(tab_handle_,
-                                                    params.url,
-                                                    referrer,
-                                                    params.disposition));
-        // TODO(ananta)
-        // We should populate other fields in the
-        // ViewHostMsg_FrameNavigate_Params structure. Another option could be
-        // to refactor the UpdateHistoryForNavigation function in TabContents.
-        content::FrameNavigateParams nav_params;
-        nav_params.referrer = content::Referrer(referrer,
-                                                params.referrer.policy);
-        nav_params.url = params.url;
-        nav_params.page_id = -1;
-        nav_params.transition = content::PAGE_TRANSITION_LINK;
-
-        content::LoadCommittedDetails details;
-        details.did_replace_entry = false;
-
-        scoped_refptr<history::HistoryAddPageArgs> add_page_args(
-            tab_contents_->history_tab_helper()->
-                CreateHistoryAddPageArgs(params.url, details, nav_params));
-        tab_contents_->history_tab_helper()->
-            UpdateHistoryForNavigation(add_page_args);
-
-        return tab_contents_->web_contents();
-      }
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-
-  return NULL;
+  return false;
 }
 
 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 724 matching lines @@
   ServicePendingOpenURLRequests();
 }
 
 void ExternalTabContainer::ServicePendingOpenURLRequests() {
   DCHECK(pending());
 
   set_pending(false);
 
   for (size_t index = 0; index < pending_open_url_requests_.size();
        ++index) {
-    const OpenURLParams& url_request = pending_open_url_requests_[index];
-    OpenURLFromTab(web_contents(), url_request);
+    const PendingOpenUrlRequest& url_request =
+        pending_open_url_requests_[index];
+    OpenUrlInExtenalHost(web_contents(), url_request.url,
+                         url_request.disposition, url_request.referrer);
   }
   pending_open_url_requests_.clear();
 }
 
 void ExternalTabContainer::SetupExternalTabView() {
   // Create a TabContentsContainer to handle focus cycling using Tab and
   // Shift-Tab.
   tab_contents_container_ = new TabContentsContainer;
 
   // The views created here will be destroyed when the ExternalTabContainer
@@ skipping 17 matching lines @@
 
   layout->StartRow(0, 0);
   layout->AddView(info_bar_container);
   layout->StartRow(1, 0);
   layout->AddView(tab_contents_container_);
   GetWidget()->SetContentsView(external_tab_view_);
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeWebContents(web_contents());
 }
 
+content::WebContents* ExternalTabContainer::OpenUrlInExtenalHost(
+    content::WebContents* source,
+    const GURL& url,
+    WindowOpenDisposition disposition,
+    const content::Referrer& referrer) {
+
+  if (pending()) {
+    PendingOpenUrlRequest pending_request;
+    pending_request.url = url;
+    pending_request.disposition = disposition;
+    pending_request.referrer = referrer;
+    pending_open_url_requests_.push_back(pending_request);
+    return NULL;
+  }
+
+  switch (disposition) {
+    case CURRENT_TAB:
+    case SINGLETON_TAB:
+    case NEW_FOREGROUND_TAB:
+    case NEW_BACKGROUND_TAB:
+    case NEW_POPUP:
+    case NEW_WINDOW:
+    case SAVE_TO_DISK:
+      if (automation_) {
+        automation_->Send(new AutomationMsg_OpenURL(tab_handle_,
+                                                    url,
+                                                    referrer.url,
+                                                    disposition));
+        // TODO(ananta)
+        // We should populate other fields in the
+        // ViewHostMsg_FrameNavigate_Params structure. Another option could be
+        // to refactor the UpdateHistoryForNavigation function in TabContents.
+        content::FrameNavigateParams nav_params;
+        nav_params.referrer = referrer;
+        nav_params.url = url;
+        nav_params.page_id = -1;
+        nav_params.transition = content::PAGE_TRANSITION_LINK;
+
+        content::LoadCommittedDetails details;
+        details.did_replace_entry = false;
+
+        scoped_refptr<history::HistoryAddPageArgs> add_page_args(
+            tab_contents_->history_tab_helper()->
+                CreateHistoryAddPageArgs(url, details, nav_params));
+        tab_contents_->history_tab_helper()->
+            UpdateHistoryForNavigation(add_page_args);
+
+        return tab_contents_->web_contents();
+      }
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+
+  return NULL;
+}
+
 TemporaryPopupExternalTabContainer::TemporaryPopupExternalTabContainer(
     AutomationProvider* automation,
     AutomationResourceMessageFilter* filter)
     : ExternalTabContainer(automation, filter) {
 }
 
 TemporaryPopupExternalTabContainer::~TemporaryPopupExternalTabContainer() {
   DVLOG(1) << __FUNCTION__;
 }
 
 WebContents* TemporaryPopupExternalTabContainer::OpenURLFromTab(
     WebContents* source,
     const OpenURLParams& params) {
   if (!automation_)
     return NULL;
 
   OpenURLParams forward_params = params;
   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;
 }