Adding a WindowAndroidHelper class.

chrome/browser/android/tab_base_android_impl.cc

Index: chrome/browser/android/tab_base_android_impl.cc
diff --git a/chrome/browser/android/tab_base_android_impl.cc b/chrome/browser/android/tab_base_android_impl.cc
index 4753262dec53ec5d31c03c84a6874fbe1074899c..5e53b3b8f554d0f0f8459cbe93d85bea2e6035c2 100644
--- a/chrome/browser/android/tab_base_android_impl.cc
+++ b/chrome/browser/android/tab_base_android_impl.cc
@@ -8,17 +8,20 @@
 #include "base/logging.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/ui/android/window_android_helper.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "jni/TabBase_jni.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
+#include "ui/gfx/android/window_android.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using chrome::android::ChromeWebContentsDelegateAndroid;
 using content::WebContents;
+using ui::WindowAndroid;
 
 namespace {
 class ChromeWebContentsDelegateRenderAndroid
@@ -53,9 +56,12 @@ class ChromeWebContentsDelegateRenderAndroid
 
 TabBaseAndroidImpl::TabBaseAndroidImpl(JNIEnv* env,
                                        jobject obj,
-                                       WebContents* web_contents)
+                                       WebContents* web_contents,
+                                       WindowAndroid* window_android)
     : web_contents_(web_contents),
       tab_layer_(WebKit::WebLayer::create()) {
+  WindowAndroidHelper::FromWebContents(web_contents)->
+      setWindowAndroid(window_android);
 }
 
 TabBaseAndroidImpl::~TabBaseAndroidImpl() {
@@ -123,10 +129,12 @@ ScopedJavaLocalRef<jstring> TabBaseAndroidImpl::FixupUrl(JNIEnv* env,
 
 static jint Init(JNIEnv* env,
                  jobject obj,
-                 jint web_contents_ptr) {
+                 jint web_contents_ptr,
+                 jint window_android_ptr) {
   TabBaseAndroidImpl* tab = new TabBaseAndroidImpl(
       env,
       obj,
-      reinterpret_cast<WebContents*>(web_contents_ptr));
+      reinterpret_cast<WebContents*>(web_contents_ptr),
+      reinterpret_cast<WindowAndroid*>(window_android_ptr));
   return reinterpret_cast<jint>(tab);
 }