Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/vr_shell.h
diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
index cc09af90e2b8f1f3693bc61dd016ea6baf7029bd..4ce2d83a0aea4d95b1452313135bb824fdd2f3b2 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h
@@ -33,7 +33,7 @@ class WebContents;
}
namespace ui {
-class WindowAndroid;
+class ViewRoot;
}
namespace vr_shell {
@@ -64,10 +64,11 @@ class VrMetricsHelper;
// 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,
@@ -196,7 +197,7 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
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_;

Powered by Google App Engine
This is Rietveld 408576698