VR: Wire VrShell UI-related state to the scene manager.

chrome/browser/android/vr_shell/vr_gl_thread.cc

 // 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.
 
 #include "chrome/browser/android/vr_shell/vr_gl_thread.h"
 
 #include <utility>
 
 #include "chrome/browser/android/vr_shell/ui_interface.h"
 #include "chrome/browser/android/vr_shell/ui_scene.h"
@@ skipping 20 matching lines @@
       reprojected_rendering_(reprojected_rendering) {}
 
 VrGLThread::~VrGLThread() {
   Stop();
 }
 
 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(), in_cct_);
+  scene_manager_ = base::MakeUnique<UiSceneManager>(this, scene_.get(), in_cct_,
+                                                    initially_web_vr_);
 
   weak_vr_shell_gl_ = vr_shell_gl_->GetWeakPtr();
   weak_scene_manager_ = scene_manager_->GetWeakPtr();
   vr_shell_gl_->Initialize();
 }
 
 void VrGLThread::ContentSurfaceChanged(jobject surface) {
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VrShell::ContentSurfaceChanged, weak_vr_shell_, surface));
 }
 
 void VrGLThread::GvrDelegateReady() {
   main_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VrShell::GvrDelegateReady, weak_vr_shell_));
 }
 
 void VrGLThread::UpdateGamepadData(device::GvrGamepadData pad) {
   main_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VrShell::UpdateGamepadData, weak_vr_shell_, pad));
 }
 
-void VrGLThread::AppButtonGesturePerformed(UiInterface::Direction direction) {
-  main_thread_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&VrShell::AppButtonGesturePerformed, weak_vr_shell_,
-                            direction));
+void VrGLThread::AppButtonClicked() {
+  task_runner()->PostTask(
+      FROM_HERE,
+      base::Bind(&UiSceneManager::OnAppButtonClicked, weak_scene_manager_));
 }
 
-void VrGLThread::OnAppButtonClicked() {
-  weak_vr_shell_gl_->GetTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(&UiSceneManager::OnAppButtonClicked, weak_scene_manager_));
+void VrGLThread::AppButtonGesturePerformed(UiInterface::Direction direction) {
+  task_runner()->PostTask(
+      FROM_HERE, base::Bind(&UiSceneManager::OnAppButtonGesturePerformed,
+                            weak_scene_manager_, direction));
 }
 
 void VrGLThread::ProcessContentGesture(
     std::unique_ptr<blink::WebInputEvent> event) {
   main_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VrShell::ProcessContentGesture, weak_vr_shell_,
                             base::Passed(std::move(event))));
 }
 
 void VrGLThread::ForceExitVr() {
   main_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VrShell::ForceExitVr, weak_vr_shell_));
 }
 
 void VrGLThread::RunVRDisplayInfoCallback(
     const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
     device::mojom::VRDisplayInfoPtr* info) {
   main_thread_task_runner_->PostTask(FROM_HERE,
                                      base::Bind(callback, base::Passed(info)));
 }
 
 void VrGLThread::OnContentPaused(bool enabled) {
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VrShell::OnContentPaused, weak_vr_shell_, enabled));
 }
 
+void VrGLThread::SetFullscreen(bool enabled) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetFullscreen,
+                                                weak_scene_manager_, enabled));
+}
+
+void VrGLThread::SetHistoryButtonsEnabled(bool can_go_back,
+                                          bool can_go_forward) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(
+      FROM_HERE, base::Bind(&UiSceneManager::SetHistoryButtonsEnabled,
+                            weak_scene_manager_, can_go_forward, can_go_back));
+}
+
+void VrGLThread::SetLoadProgress(double progress) {

[cjgrant, 2017/05/08 19:17:22]

I alphabetized these as well, to match the interface.

+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE,
+                          base::Bind(&UiSceneManager::SetLoadProgress,
+                                     weak_scene_manager_, progress));
+}
+
+void VrGLThread::SetLoading(bool loading) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetLoading,
+                                                weak_scene_manager_, loading));
+}
+
+void VrGLThread::SetSecurityLevel(int level) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE,
+                          base::Bind(&UiSceneManager::SetSecurityLevel,
+                                     weak_scene_manager_, level));
+}
+
+void VrGLThread::SetURL(const GURL& gurl) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetURL,
+                                                weak_scene_manager_, gurl));
+}
+
+void VrGLThread::SetWebVrMode(bool enabled) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetWebVrMode,
+                                                weak_scene_manager_, enabled));
+}
+
+void VrGLThread::SetWebVrSecureOrigin(bool secure) {
+  WaitUntilThreadStarted();
+  task_runner()->PostTask(FROM_HERE,
+                          base::Bind(&UiSceneManager::SetWebVrSecureOrigin,
+                                     weak_scene_manager_, secure));
+}
+
 void VrGLThread::CleanUp() {
   scene_manager_.reset();
   vr_shell_gl_.reset();
   scene_.reset();
 }
 
 }  // namespace vr_shell