Make ViewRoot the top of the ViewAndroid tree

chrome/browser/android/vr_shell/vr_shell.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 15 matching lines @@
 
 namespace blink {
 class WebInputEvent;
 }
 
 namespace content {
 class WebContents;
 }
 
 namespace ui {
-class WindowAndroid;
+class ViewRoot;
 }
 
 namespace vr_shell {
 
 class UiInterface;
 class VrCompositor;
 class VrGLThread;
 class VrInputManager;
 class VrMetricsHelper;
 class VrShellDelegate;
@@ skipping 10 matching lines @@
   OMNIBOX_CONTENT,
   SET_CONTENT_PAUSED,
 };
 
 class VrMetricsHelper;
 
 // The native instance of the Java VrShell. This class is not threadsafe and
 // must only be used on the UI thread.
 class VrShell : public device::GvrDelegate, content::WebContentsObserver {
  public:
-  VrShell(JNIEnv* env, jobject obj,
-          ui::WindowAndroid* content_window,
+  VrShell(JNIEnv* env,
+          jobject obj,
+          ui::ViewRoot* content_view_root,
           content::WebContents* ui_contents,
-          ui::WindowAndroid* ui_window,
+          ui::ViewRoot* ui_view_root,
           bool for_web_vr,
           VrShellDelegate* delegate,
           gvr_context* gvr_api,
           bool reprojected_rendering);
   void SwapContents(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     const base::android::JavaParamRef<jobject>& web_contents);
   void LoadUIContent(JNIEnv* env,
                      const base::android::JavaParamRef<jobject>& obj);
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
@@ skipping 108 matching lines @@
 
   void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito);
 
   bool vr_shell_enabled_;
 
   std::unique_ptr<UiInterface> html_interface_;
   bool content_paused_ = false;
   bool webvr_mode_ = false;
 
   content::WebContents* main_contents_ = nullptr;
-  ui::WindowAndroid* content_window_;
+  ui::ViewRoot* content_view_root_;
   std::unique_ptr<VrCompositor> content_compositor_;
   content::WebContents* ui_contents_;
   std::unique_ptr<VrCompositor> ui_compositor_;
 
   std::unique_ptr<VrWebContentsObserver> vr_web_contents_observer_;
 
   VrShellDelegate* delegate_provider_ = nullptr;
   base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
 
   std::unique_ptr<VrInputManager> content_input_manager_;
@@ skipping 13 matching lines @@
   base::WeakPtrFactory<VrShell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShell);
 };
 
 bool RegisterVrShell(JNIEnv* env);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_