Adding BlimpNavigationController to Tab

chrome/browser/android/tab_android.cc

 // Copyright 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 <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
+#include "blimp/client/public/blimp_client_context.h"
+#include "blimp/client/public/contents/blimp_contents.h"
+#include "blimp/client/public/contents/blimp_navigation_controller.h"
 #include "cc/layers/layer.h"
+#include "chrome/browser/android/blimp/blimp_client_context_factory.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.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/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/profiles/profile_manager.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.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"
@@ skipping 373 matching lines @@
   CHECK_EQ(GetProfile()->IsOffTheRecord(), incognito);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(GetProfile());
   if (instant_service)
     instant_service->AddObserver(this);
 
   content_layer_->InsertChild(web_contents_->GetNativeView()->GetLayer(), 0);
 }
 
+void TabAndroid::InitBlimpContents(JNIEnv* env,
+                                   const JavaParamRef<jobject>& obj) {
+  bool incognito = Java_Tab_isIncognito(env, weak_java_tab_.get(env).obj());

[David Trainor- moved to gerrit, 2016/08/18 17:06:30]

I don't think we have to bleed this through here.  If we're really curious do
DCHECK(!profile->IsOffTheRecord());

[shaktisahu, 2016/08/18 19:36:06]

profile->IsOffTheRecord() might not exactly relate to incognito since there is
not a good way to get the profile. I just wanted to double check that mBlimp &&
mIncognito == false before creating blimp contents, which is already set
correctly in the Tab.java constructor. May be I should remove this check.

+  CHECK(!incognito) << "Cannot create incognito tab in blimp mode.";
+
+  Profile* profile = ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
+  blimp::client::BlimpClientContext* context =
+      BlimpClientContextFactory::GetForBrowserContext(profile);
+  DCHECK(context);
+  blimp_contents_ = context->CreateBlimpContents();
+}
+
 void TabAndroid::UpdateDelegates(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jweb_contents_delegate,
     const JavaParamRef<jobject>& jcontext_menu_populator) {
   ContextMenuHelper::FromWebContents(web_contents())->SetPopulator(
       jcontext_menu_populator);
   web_contents_delegate_.reset(
       new chrome::android::TabWebContentsDelegateAndroid(
           env, jweb_contents_delegate));
@@ skipping 58 matching lines @@
   Profile* profile = GetProfile();
   if (!profile)
     return base::android::ScopedJavaLocalRef<jobject>();
   ProfileAndroid* profile_android = ProfileAndroid::FromProfile(profile);
   if (!profile_android)
     return base::android::ScopedJavaLocalRef<jobject>();
 
   return profile_android->GetJavaObject();
 }
 
+base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetBlimpContents(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj) {
+  if (!blimp_contents_.get())
+    return base::android::ScopedJavaLocalRef<jobject>();
+
+  return blimp_contents_->GetJavaObject();
+}
+
 TabAndroid::TabLoadStatus TabAndroid::LoadUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& url,
     const JavaParamRef<jstring>& j_extra_headers,
     const JavaParamRef<jobject>& j_post_data,
     jint page_transition,
     const JavaParamRef<jstring>& j_referrer_url,
     jint referrer_policy,
     jboolean is_renderer_initiated,
@@ skipping 45 matching lines @@
   if (!fixed_url.is_valid())
     return PAGE_LOAD_FAILED;
 
   if (!HandleNonNavigationAboutURL(fixed_url)) {
     // Record UMA "ShowHistory" here. That way it'll pick up both user
     // typing chrome://history as well as selecting from the drop down menu.
     if (fixed_url.spec() == chrome::kChromeUIHistoryURL) {
       content::RecordAction(base::UserMetricsAction("ShowHistory"));
     }
 
+    if (blimp_contents()) {
+      blimp_contents()->GetNavigationController().LoadURL(fixed_url);
+      return DEFAULT_PAGE_LOAD;
+    }
+
     content::NavigationController::LoadURLParams load_params(fixed_url);
     if (j_extra_headers) {
       load_params.extra_headers = base::android::ConvertJavaStringToUTF8(
           env,
           j_extra_headers);
     }
     if (j_post_data) {
       load_params.load_type =
           content::NavigationController::LOAD_TYPE_HTTP_POST;
       load_params.post_data =
@@ skipping 316 matching lines @@
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }