Make ViewRoot the top of the ViewAndroid tree

content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content_shell;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.ContentViewRenderView;
+import org.chromium.ui.base.ViewRoot;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container and generator of ShellViews.
  */
 @JNINamespace("content")
 public class ShellManager extends FrameLayout {
 
     public static final String DEFAULT_SHELL_URL = "http://www.google.com";
     private WindowAndroid mWindow;
+    private ViewRoot mViewRoot;
     private Shell mActiveShell;
 
     private String mStartupUrl = DEFAULT_SHELL_URL;
 
     // The target for all content rendering.
     private ContentViewRenderView mContentViewRenderView;
     private final ContentViewClient mContentViewClient = new ContentViewClient();
 
     /**
      * Constructor for inflating via XML.
      */
     public ShellManager(final Context context, AttributeSet attrs) {
         super(context, attrs);
         nativeInit(this);
     }
 
     /**
-     * @param window The window used to generate all shells.
+     * @param viewRoot The {@link ViewRoot} used to forward events to native.
      */
-    public void setWindow(WindowAndroid window) {
-        assert window != null;
-        mWindow = window;
+    public void setViewRoot(ViewRoot viewRoot) {
+        assert viewRoot != null && viewRoot.getWindowAndroid() != null;
+        mViewRoot = viewRoot;
+        mWindow = viewRoot.getWindowAndroid();
         mContentViewRenderView = new ContentViewRenderView(getContext());
-        mContentViewRenderView.onNativeLibraryLoaded(window);
+        mContentViewRenderView.onNativeLibraryLoaded(viewRoot);
     }
 
     /**
-     * @return The window used to generate all shells.
-     */
-    public WindowAndroid getWindow() {
-        return mWindow;
-    }
-
-    /**
      * Get the ContentViewRenderView.
      */
     public ContentViewRenderView getContentViewRenderView() {
         return mContentViewRenderView;
     }
 
     /**
      * Sets the startup URL for new shell windows.
      */
     public void setStartupUrl(String url) {
@@ skipping 27 matching lines @@
         mContentViewRenderView.setOverlayVideoMode(enabled);
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private Object createShell(long nativeShellPtr) {
         assert mContentViewRenderView != null;
         LayoutInflater inflater =
                 (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         Shell shellView = (Shell) inflater.inflate(R.layout.shell_view, null);
-        shellView.initialize(nativeShellPtr, mWindow, mContentViewClient);
+        shellView.initialize(nativeShellPtr, mViewRoot, mContentViewClient);
 
         // TODO(tedchoc): Allow switching back to these inactive shells.
         if (mActiveShell != null) removeShell(mActiveShell);
 
         showShell(shellView);
         return shellView;
     }
 
     private void showShell(Shell shellView) {
         shellView.setContentViewRenderView(mContentViewRenderView);
@@ skipping 23 matching lines @@
     public void destroy() {
         // Remove active shell (Currently single shell support only available).
         removeShell(mActiveShell);
         mContentViewRenderView.destroy();
         mContentViewRenderView = null;
     }
 
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }