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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

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
Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index 73ec097c3c6ef119e117bed07fc18c874abed37d..01cef5515d24dda4eef8f3f4efe7e055ce87664c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -1504,7 +1504,8 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
if (isBlimpTab() && getBlimpContents() == null) {
Profile profile = Profile.getLastUsedProfile();
if (mIncognito) profile = profile.getOffTheRecordProfile();
- mBlimpContents = nativeInitBlimpContents(mNativeTabAndroid, profile);
+ mBlimpContents = nativeInitBlimpContents(
+ mNativeTabAndroid, profile, mWindowAndroid.getNativePointer());
if (mBlimpContents != null) {
getBlimpContents().addObserver(new TabBlimpContentsObserver(this));
} else {
@@ -3318,7 +3319,8 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
private native void nativeInitWebContents(long nativeTabAndroid, boolean incognito,
WebContents webContents, TabWebContentsDelegateAndroid delegate,
ContextMenuPopulator contextMenuPopulator);
- private native BlimpContents nativeInitBlimpContents(long nativeTabAndroid, Profile profile);
+ private native BlimpContents nativeInitBlimpContents(
+ long nativeTabAndroid, Profile profile, long windowAndroidPtr);
private native void nativeUpdateDelegates(long nativeTabAndroid,
TabWebContentsDelegateAndroid delegate, ContextMenuPopulator contextMenuPopulator);
private native void nativeDestroyWebContents(long nativeTabAndroid, boolean deleteNative);
« no previous file with comments | « blimp/test/run_all_unittests.cc ('k') | chrome/android/java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698