Add BlimpView to a Chrome tab when Blimp is enabled.

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"
@@ skipping 69 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/resource_request_body.h"
 #include "content/public/common/top_controls_state.h"
 #include "jni/Tab_jni.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/android/view_android.h"
+#include "ui/android/window_android.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 316 matching lines @@
   if (instant_service)
     instant_service->AddObserver(this);
 
   if (!blimp_contents_)
     content_layer_->InsertChild(web_contents_->GetNativeView()->GetLayer(), 0);
 }
 
 base::android::ScopedJavaLocalRef<jobject> TabAndroid::InitBlimpContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& j_profile) {
+    const JavaParamRef<jobject>& j_profile,
+    jlong window_android_ptr) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile.obj());
   DCHECK(!profile->IsOffTheRecord());
   blimp::client::BlimpClientContext* context =
       BlimpClientContextFactory::GetForBrowserContext(profile);
   DCHECK(context);
-  blimp_contents_ = context->CreateBlimpContents();
+  ui::WindowAndroid* window =
+      reinterpret_cast<ui::WindowAndroid*>(window_android_ptr);
+  blimp_contents_ = context->CreateBlimpContents(window);
   DCHECK(blimp_contents_);
 
   // Let's detach the layer from WebContents first, just to be sure.
   if (web_contents_ && web_contents_->GetNativeView() &&
       web_contents_->GetNativeView()->GetLayer()) {
     cc::Layer* web_contents_layer = web_contents_->GetNativeView()->GetLayer();
     if (web_contents_layer->parent() == content_layer_.get())
       web_contents_layer->RemoveFromParent();
   }
 
@@ skipping 468 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);
 }