Implemented HandlePopupNavigation from tab_android.

chrome/browser/android/tab_android.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/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/debug/trace_event.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
+#include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h"
 #include "chrome/browser/ui/android/context_menu_helper.h"
 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/infobars/core/infobar_container.h"
 #include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/Tab_jni.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "ui/base/window_open_disposition.h"
+
+using content::GlobalRequestID;
+using content::NavigationController;
+using content::WebContents;
+
+namespace {
+
+WebContents* CreateTargetContents(const chrome::NavigateParams& params,
+                                  const GURL& url) {
+  Profile* profile = params.initiating_profile;
+
+  if (profile->IsOffTheRecord() || params.disposition == OFF_THE_RECORD) {
+    profile = profile->GetOffTheRecordProfile();
+  }
+  WebContents::CreateParams create_params(
+      profile,
+      tab_util::GetSiteInstanceForNewTab(profile, url));
+  if (params.source_contents) {
+    create_params.initial_size =
+        params.source_contents->GetContainerBounds().size();
+    if (params.should_set_opener)
+      create_params.opener = params.source_contents;
+  }
+  if (params.disposition == NEW_BACKGROUND_TAB)
+    create_params.initially_hidden = true;
+
+  WebContents* target_contents = WebContents::Create(create_params);
+
+  return target_contents;
+}
+
+}  // namespace
 
 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
   CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
   if (!core_tab_helper)
     return NULL;
 
   CoreTabHelperDelegate* core_delegate = core_tab_helper->delegate();
   if (!core_delegate)
     return NULL;
 
@@ skipping 103 matching lines @@
 
 void TabAndroid::SetSyncId(int sync_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
   if (obj.is_null())
     return;
   Java_Tab_setSyncId(env, obj.obj(), sync_id);
 }
 
 void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) {
-  NOTIMPLEMENTED();
+  if (params->disposition != SUPPRESS_OPEN &&

[David Trainor- moved to gerrit, 2014/07/16 15:29:24]

there is a dcheck for params->disposition != CURRENT_TAB inside AddNewContents()
IIRC.  If it is CURRENT_TAB should we just call LoadURLWithParams on the current
web_contents() here?

[Jitu( very slow this week), 2014/07/17 13:26:02]

Done.

+      params->disposition != SAVE_TO_DISK &&
+      params->disposition != IGNORE_ACTION) {
+    if (!params->url.is_empty()) {
+      bool was_blocked = false;
+      GURL url(params->url);
+      params->target_contents = CreateTargetContents(*params, url);
+      NavigationController::LoadURLParams load_url_params(url);
+      MakeLoadURLParams(params, &load_url_params);
+      params->target_contents->GetController().LoadURLWithParams(
+          load_url_params);
+      web_contents_delegate_->AddNewContents(params->source_contents,
+                                             params->target_contents,
+                                             params->disposition,
+                                             params->window_bounds,
+                                             params->user_gesture,
+                                             &was_blocked);
+      if (was_blocked)
+        params->target_contents = NULL;
+    }
+  }
 }
 
 bool TabAndroid::ShouldWelcomePageLinkToTermsOfService() {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool TabAndroid::HasPrerenderedUrl(GURL gurl) {
   prerender::PrerenderManager* prerender_manager = GetPrerenderManager();
   if (!prerender_manager)
     return false;
 
   std::vector<content::WebContents*> contents =
       prerender_manager->GetAllPrerenderingContents();
   prerender::PrerenderContents* prerender_contents;
   for (size_t i = 0; i < contents.size(); ++i) {
     prerender_contents = prerender_manager->
         GetPrerenderContents(contents.at(i));
     if (prerender_contents->prerender_url() == gurl &&
         prerender_contents->has_finished_loading()) {
       return true;
     }
   }
   return false;
 }
 
+void TabAndroid::MakeLoadURLParams(
+    chrome::NavigateParams* params,
+    NavigationController::LoadURLParams* load_url_params) {
+  load_url_params->referrer = params->referrer;
+  load_url_params->frame_tree_node_id = params->frame_tree_node_id;
+  load_url_params->redirect_chain = params->redirect_chain;
+  load_url_params->transition_type = params->transition;
+  load_url_params->extra_headers = params->extra_headers;
+  load_url_params->should_replace_current_entry =
+      params->should_replace_current_entry;
+
+  if (params->transferred_global_request_id != GlobalRequestID()) {
+    load_url_params->transferred_global_request_id =
+        params->transferred_global_request_id;
+  }
+    load_url_params->is_renderer_initiated = params->is_renderer_initiated;

[David Trainor- moved to gerrit, 2014/07/16 15:29:23]

fix indentation

[Jitu( very slow this week), 2014/07/17 13:26:02]

Done.

+
+  // Only allows the browser-initiated navigation to use POST.
+  if (params->uses_post && !params->is_renderer_initiated) {
+    load_url_params->load_type =
+        NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
+    load_url_params->browser_initiated_post_data =
+        params->browser_initiated_post_data;
+  }
+}
+
 void TabAndroid::SwapTabContents(content::WebContents* old_contents,
                                  content::WebContents* new_contents,
                                  bool did_start_load,
                                  bool did_finish_load) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // We need to notify the native InfobarContainer so infobars can be swapped.
   InfoBarContainerAndroid* infobar_container =
       reinterpret_cast<InfoBarContainerAndroid*>(
           Java_Tab_getNativeInfoBarContainer(
@@ skipping 310 matching lines @@
 
 static void Init(JNIEnv* env, jobject obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }