| Index: content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| index e2f82e34584bb68430d33a6a1396760ae116293b..4a8bbaaee7564f2f797e52f2b9ece6be48563044 100644
|
| --- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| +++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| @@ -37,6 +37,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
|
| import org.chromium.content_public.browser.NavigationController;
|
| import org.chromium.content_public.browser.WebContents;
|
| import org.chromium.ui.base.ViewAndroidDelegate;
|
| +import org.chromium.ui.base.ViewRoot;
|
| import org.chromium.ui.base.WindowAndroid;
|
|
|
| /**
|
| @@ -68,6 +69,7 @@ public class Shell extends LinearLayout {
|
| private long mNativeShell;
|
| private ContentViewRenderView mContentViewRenderView;
|
| private WindowAndroid mWindow;
|
| + private ViewRoot mViewRoot;
|
|
|
| private boolean mLoading;
|
| private boolean mIsFullscreen;
|
| @@ -125,6 +127,7 @@ public class Shell extends LinearLayout {
|
| mWindow = null;
|
| mNativeShell = 0;
|
| mContentViewCore.destroy();
|
| + mViewRoot.destroy();
|
| }
|
|
|
| /**
|
| @@ -297,7 +300,7 @@ public class Shell extends LinearLayout {
|
| mContentViewCore = new ContentViewCore(context, "");
|
| ContentView cv = ContentView.createContentView(context, mContentViewCore);
|
| mContentViewCore.initialize(ViewAndroidDelegate.createBasicDelegate(cv), cv,
|
| - webContents, mWindow);
|
| + webContents, ViewRoot.create(mWindow));
|
| mContentViewCore.setActionModeCallback(defaultActionCallback());
|
| mContentViewCore.setContentViewClient(mContentViewClient);
|
| mWebContents = mContentViewCore.getWebContents();
|
|
|