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

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

Issue 2809143004: VR: Add a native UI element scene manager (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
« no previous file with comments | « chrome/browser/android/vr_shell/vr_gl_thread.h ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('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 1093187dba1f550dee437d066f9dbccefeacf33c..e5555f65bc26974fbfacd27302b7ba1f45096407 100644
--- a/chrome/browser/android/vr_shell/vr_gl_thread.cc
+++ b/chrome/browser/android/vr_shell/vr_gl_thread.cc
@@ -6,6 +6,8 @@
#include <utility>
+#include "chrome/browser/android/vr_shell/ui_scene.h"
+#include "chrome/browser/android/vr_shell/ui_scene_manager.h"
#include "chrome/browser/android/vr_shell/vr_input_manager.h"
#include "chrome/browser/android/vr_shell/vr_shell.h"
#include "chrome/browser/android/vr_shell/vr_shell_gl.h"
@@ -30,10 +32,13 @@ VrGLThread::~VrGLThread() {
}
void VrGLThread::Init() {
- vr_shell_gl_.reset(new VrShellGl(
+ 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_));
+ initially_web_vr_, reprojected_rendering_, scene_.get());
weak_vr_shell_gl_ = vr_shell_gl_->GetWeakPtr();
+ weak_scene_manager_ = scene_manager_->GetWeakPtr();
vr_shell_gl_->Initialize();
}
« no previous file with comments | « chrome/browser/android/vr_shell/vr_gl_thread.h ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698