Revert "Revert"Adding a WindowAndroidHelper class"

chrome/browser/android/tab_base_android_impl.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_base_android_impl.h"
 
 #include "base/android/jni_string.h"
 #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
     : public ChromeWebContentsDelegateAndroid {
  public:
   ChromeWebContentsDelegateRenderAndroid(TabBaseAndroidImpl* tab_android_impl,
                                          JNIEnv* env,
                                          jobject obj)
       : ChromeWebContentsDelegateAndroid(env, obj),
         tab_android_impl_(tab_android_impl) {
@@ skipping 14 matching lines @@
 
  private:
   TabBaseAndroidImpl* tab_android_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeWebContentsDelegateRenderAndroid);
 };
 }  // namespace
 
 TabBaseAndroidImpl::TabBaseAndroidImpl(JNIEnv* env,
                                        jobject obj,
-                                       WebContents* web_contents)
+                                       WebContents* web_contents,
+                                       WindowAndroid* window_android)
     : web_contents_(web_contents),
       tab_layer_(WebKit::WebLayer::create()) {
+  InitTabHelpers(web_contents);
+  WindowAndroidHelper::FromWebContents(web_contents)->
+      SetWindowAndroid(window_android);
 }
 
 TabBaseAndroidImpl::~TabBaseAndroidImpl() {
 }
 
 void TabBaseAndroidImpl::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 browser_sync::SyncedTabDelegate* TabBaseAndroidImpl::GetSyncedTabDelegate() {
@@ skipping 47 matching lines @@
 
   std::string fixed_spec;
   if (fixed_url.is_valid())
     fixed_spec = fixed_url.spec();
 
   return ConvertUTF8ToJavaString(env, fixed_spec);
 }
 
 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);
 }