Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Unified Diff: chrome/browser/android/tab_base_android_impl.cc

Issue 11098008: Adding a WindowAndroidHelper class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nilesh's nits Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..2a753b6a230c6e6377c9af364a2f9e44e049cbde 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);
}

Powered by Google App Engine
This is Rietveld 408576698