| 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 f0680690bae2a7f9248b555e5fd5e4940dec0b7d..55065786d76f3ecb2e3432ed3f70415c0dca6db7 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;
|
| }
|
|
|