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

Unified Diff: blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.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: blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java
diff --git a/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java b/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java
index 849a3c9ed6576d45d9605ce17f4eebc97c673a2b..a90a803bb8a700f688cbcf577f7804a9f586c3af 100644
--- a/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java
+++ b/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java
@@ -4,6 +4,8 @@
package org.chromium.blimp.core.contents;
+import android.view.ViewGroup;
+
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.blimp_public.contents.BlimpContents;
@@ -17,9 +19,10 @@ import org.chromium.blimp_public.contents.BlimpNavigationController;
@JNINamespace("blimp::client")
public class BlimpContentsImpl implements BlimpContents {
@CalledByNative
- private static BlimpContentsImpl create(
- long nativeBlimpContentsImplAndroid, BlimpNavigationController navigationController) {
- return new BlimpContentsImpl(nativeBlimpContentsImplAndroid, navigationController);
+ private static BlimpContentsImpl create(long nativeBlimpContentsImplAndroid,
+ BlimpNavigationController navigationController, BlimpView blimpView) {
+ return new BlimpContentsImpl(
+ nativeBlimpContentsImplAndroid, navigationController, blimpView);
}
private long mNativeBlimpContentsImplAndroid;
@@ -33,10 +36,14 @@ public class BlimpContentsImpl implements BlimpContents {
// single JNI hop for each call to observers.
private BlimpContentsObserverProxy mObserverProxy;
- private BlimpContentsImpl(
- long nativeBlimpContentsImplAndroid, BlimpNavigationController navigationController) {
+ // The Android View for this BlimpContents.
+ private BlimpView mBlimpView;
+
+ private BlimpContentsImpl(long nativeBlimpContentsImplAndroid,
+ BlimpNavigationController navigationController, BlimpView blimpView) {
mNativeBlimpContentsImplAndroid = nativeBlimpContentsImplAndroid;
mBlimpNavigationController = navigationController;
+ mBlimpView = blimpView;
}
@CalledByNative
@@ -56,6 +63,11 @@ public class BlimpContentsImpl implements BlimpContents {
}
@Override
+ public ViewGroup getView() {
+ return mBlimpView;
+ }
+
+ @Override
public BlimpNavigationController getNavigationController() {
return mBlimpNavigationController;
}

Powered by Google App Engine
This is Rietveld 408576698