| Index: chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java
|
| diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java
|
| index 99b64bc5d6aa2886b4649dfbc3ccb1b1b9d581d0..087cf546d34c9c5c5900708f54c81acf714be39f 100644
|
| --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java
|
| +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java
|
| @@ -28,6 +28,7 @@ import org.chromium.content_public.browser.NavigationController;
|
| import org.chromium.content_public.browser.WebContents;
|
| import org.chromium.content_public.browser.WebContentsObserver;
|
| import org.chromium.ui.base.ViewAndroidDelegate;
|
| +import org.chromium.ui.base.ViewRoot;
|
| import org.chromium.ui.base.WindowAndroid;
|
|
|
| /**
|
| @@ -48,6 +49,7 @@ public class CastWindowAndroid extends LinearLayout {
|
| private WebContents mWebContents;
|
| private WebContentsObserver mWebContentsObserver;
|
| private WindowAndroid mWindow;
|
| + private ViewRoot mViewRoot;
|
|
|
| /**
|
| * Constructor for inflating via XML.
|
| @@ -138,6 +140,8 @@ public class CastWindowAndroid extends LinearLayout {
|
| mContentViewCore.initialize(ViewAndroidDelegate.createBasicDelegate(view), view,
|
| webContents, mWindow);
|
| mWebContents = mContentViewCore.getWebContents();
|
| + mViewRoot = ViewRoot.create(mWindow);
|
| + mWebContents.initViewRoot(mViewRoot);
|
| mNavigationController = mWebContents.getNavigationController();
|
| mRenderProcessId = renderProcessId;
|
|
|
| @@ -147,7 +151,7 @@ public class CastWindowAndroid extends LinearLayout {
|
| FrameLayout.LayoutParams.MATCH_PARENT,
|
| FrameLayout.LayoutParams.MATCH_PARENT));
|
| view.requestFocus();
|
| - mContentViewRenderView.setCurrentContentViewCore(mContentViewCore);
|
| + mContentViewRenderView.setCurrentContent(mContentViewCore, mViewRoot);
|
|
|
| mWebContentsObserver = new WebContentsObserver(mWebContents) {
|
| @Override
|
| @@ -168,6 +172,13 @@ public class CastWindowAndroid extends LinearLayout {
|
| }
|
|
|
| /**
|
| + * @return {@link ViewRoot} instance used to forward view/input events.
|
| + */
|
| + ViewRoot getViewRoot() {
|
| + return mViewRoot;
|
| + }
|
| +
|
| + /**
|
| * @return The {@link ViewGroup} currently shown by this Shell.
|
| */
|
| public ViewGroup getContentView() {
|
|
|