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

Unified Diff: chrome/browser/android/vr_shell/vr_gl_thread.cc

Issue 2861003003: VR: Enable browsing for CCT and make ui_scene_manager aware of whether we're in CCT. (Closed)
Patch Set: Fix test compile Created 3 years, 7 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
« no previous file with comments | « chrome/browser/android/vr_shell/vr_gl_thread.h ('k') | chrome/browser/android/vr_shell/vr_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/vr_gl_thread.cc
diff --git a/chrome/browser/android/vr_shell/vr_gl_thread.cc b/chrome/browser/android/vr_shell/vr_gl_thread.cc
index 0fc3ea0e6782a83f2e5fa46dea755c9945b9bae9..e2a12fd2de19d06495cc9b0774a8961597cd433d 100644
--- a/chrome/browser/android/vr_shell/vr_gl_thread.cc
+++ b/chrome/browser/android/vr_shell/vr_gl_thread.cc
@@ -20,12 +20,14 @@ VrGLThread::VrGLThread(
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
gvr_context* gvr_api,
bool initially_web_vr,
+ bool in_cct,
bool reprojected_rendering)
: base::Thread("VrShellGL"),
weak_vr_shell_(weak_vr_shell),
main_thread_task_runner_(std::move(main_thread_task_runner)),
gvr_api_(gvr_api),
initially_web_vr_(initially_web_vr),
+ in_cct_(in_cct),
reprojected_rendering_(reprojected_rendering) {}
VrGLThread::~VrGLThread() {
@@ -36,7 +38,8 @@ void VrGLThread::Init() {
scene_ = base::MakeUnique<UiScene>();
vr_shell_gl_ = base::MakeUnique<VrShellGl>(
this, gvr_api_, initially_web_vr_, reprojected_rendering_, scene_.get());
- scene_manager_ = base::MakeUnique<UiSceneManager>(this, scene_.get());
+ scene_manager_ =
+ base::MakeUnique<UiSceneManager>(this, scene_.get(), in_cct_);
weak_vr_shell_gl_ = vr_shell_gl_->GetWeakPtr();
weak_scene_manager_ = scene_manager_->GetWeakPtr();
« no previous file with comments | « chrome/browser/android/vr_shell/vr_gl_thread.h ('k') | chrome/browser/android/vr_shell/vr_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698