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

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

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: addressed nit, renamed CreateForTesting and piped through touch handling Created 4 years, 4 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
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | ui/android/java/src/org/chromium/ui/base/WindowAndroid.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 463f277a10a7e9895fec518fca7e4d600a73be7c..b6488887d91d7214a2c0ad5a585663b4871241b8 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -87,6 +87,7 @@
#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"
@@ -423,13 +424,16 @@ void TabAndroid::InitWebContents(
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.
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | ui/android/java/src/org/chromium/ui/base/WindowAndroid.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698