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

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

Issue 2834543006: Hook up insecure content warnings for http webVR presentation. (Closed)
Patch Set: rebase Created 3 years, 8 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_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 0697b1d71fa8e3f0bd46a8af500185b2f53c68c3..16d08aa97d14aaf6ae34a176297c3b2525b41239 100644
--- a/chrome/browser/android/vr_shell/vr_gl_thread.cc
+++ b/chrome/browser/android/vr_shell/vr_gl_thread.cc
@@ -33,18 +33,19 @@ VrGLThread::~VrGLThread() {
void VrGLThread::Init() {
scene_ = base::MakeUnique<UiScene>();
- scene_manager_ = base::MakeUnique<UiSceneManager>(scene_.get());
vr_shell_gl_ = base::MakeUnique<VrShellGl>(
std::move(weak_vr_shell_), std::move(main_thread_task_runner_), gvr_api_,
initially_web_vr_, reprojected_rendering_, scene_.get());
+ scene_manager_ = base::MakeUnique<UiSceneManager>(scene_.get());
+
weak_vr_shell_gl_ = vr_shell_gl_->GetWeakPtr();
weak_scene_manager_ = scene_manager_->GetWeakPtr();
vr_shell_gl_->Initialize();
}
void VrGLThread::CleanUp() {
- vr_shell_gl_.reset();
scene_manager_.reset();
+ vr_shell_gl_.reset();
scene_.reset();
}
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene_unittest.cc ('k') | chrome/browser/android/vr_shell/vr_shell_gl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698