| 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..abdee592d0a548a35e542521ffaf118879ee2812 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;
|
| @@ -33,6 +35,9 @@ public class BlimpContentsImpl implements BlimpContents {
|
| // single JNI hop for each call to observers.
|
| private BlimpContentsObserverProxy mObserverProxy;
|
|
|
| + // The Android View for this BlimpContents.
|
| + private BlimpView mBlimpView;
|
| +
|
| private BlimpContentsImpl(
|
| long nativeBlimpContentsImplAndroid, BlimpNavigationController navigationController) {
|
| mNativeBlimpContentsImplAndroid = nativeBlimpContentsImplAndroid;
|
| @@ -55,6 +60,16 @@ public class BlimpContentsImpl implements BlimpContents {
|
| return mNativeBlimpContentsImplAndroid;
|
| }
|
|
|
| + @CalledByNative
|
| + private void setBlimpView(BlimpView blimpView) {
|
| + mBlimpView = blimpView;
|
| + }
|
| +
|
| + @Override
|
| + public ViewGroup getView() {
|
| + return mBlimpView;
|
| + }
|
| +
|
| @Override
|
| public BlimpNavigationController getNavigationController() {
|
| return mBlimpNavigationController;
|
|
|