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) {
+  blimp::client::BlimpClientContext* context =
+      BlimpClientContextFactory::GetForBrowserContext(
+          ProfileManager::GetLastUsedProfile()->GetOriginalProfile());

[David Trainor- moved to gerrit, 2016/08/11 21:40:19]

Should we fail if this is an incognito tab (for now especially)?  Maybe we
shouldn't use GetOriginalProfile here and handle the null case.

[shaktisahu, 2016/08/12 22:11:49]

I discussed with Tommy about this. I added a check for incognito tab in this
function. Somewhere upstream, it should restrict users from creating incognito
tab for blimp. I am passing the original profile to BlimpClientContextFactory
and doing a DCHECK for a OffTheRecord profile during context creation.

+  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 64 matching lines @@
       load_params.post_data =
           content::ResourceRequestBody::FromJavaObject(env, j_post_data);
     }
     load_params.transition_type =
         ui::PageTransitionFromInt(page_transition);
     if (j_referrer_url) {
       load_params.referrer = content::Referrer(
           GURL(base::android::ConvertJavaStringToUTF8(env, j_referrer_url)),
           static_cast<blink::WebReferrerPolicy>(referrer_policy));
     }
+
+    if (blimp_contents()) {

[David Trainor- moved to gerrit, 2016/08/11 21:40:19]

Can we do this before we build the LoadURLParams?

[shaktisahu, 2016/08/12 22:11:49]

Done.

+      blimp_contents()->GetNavigationController().LoadURL(fixed_url);
+      return DEFAULT_PAGE_LOAD;
+    }
+
     const base::string16 search_terms =
         search::ExtractSearchTermsFromURL(GetProfile(), gurl);
     SearchTabHelper* search_tab_helper =
         SearchTabHelper::FromWebContents(web_contents_.get());
     if (!search_terms.empty() && search_tab_helper &&
         search_tab_helper->SupportsInstant()) {
       EmbeddedSearchRequestParams request_params(gurl);
       search_tab_helper->Submit(search_terms, request_params);
       return DEFAULT_PAGE_LOAD;
     }
@@ skipping 297 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);
 }