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

chrome/browser/android/vr_shell/ui_scene_manager.cc

 // Copyright 2017 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/ui_scene_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
 #include "chrome/browser/android/vr_shell/ui_elements/permanent_security_warning.h"
 #include "chrome/browser/android/vr_shell/ui_elements/transient_security_warning.h"
@@ skipping 32 matching lines @@
 static constexpr vr::Colorf kCctBackgroundHorizonColor = {0.2, 0.6, 0.2, 1.0};
 static constexpr vr::Colorf kCctBackgroundCenterColor = {0.13, 0.52, 0.13, 1.0};
 
 // Tiny distance to offset textures that should appear in the same plane.
 static constexpr float kTextureOffset = 0.01;
 
 }  // namespace
 
 UiSceneManager::UiSceneManager(VrBrowserInterface* browser,
                                UiScene* scene,
-                               bool in_cct)
+                               bool in_cct,
+                               bool in_web_vr)
     : browser_(browser),
       scene_(scene),
       in_cct_(in_cct),
+      web_vr_mode_(in_web_vr),
       weak_ptr_factory_(this) {
   CreateBackground();
   CreateContentQuad();
   CreateSecurityWarnings();
   CreateUrlBar();
 }
 
 UiSceneManager::~UiSceneManager() {}
 
 void UiSceneManager::CreateSecurityWarnings() {
@@ skipping 121 matching lines @@
   element->set_size({0.9, 0, 1});
   url_bar_ = element.get();
   browser_ui_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 }
 
 base::WeakPtr<UiSceneManager> UiSceneManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
-void UiSceneManager::SetWebVRMode(bool web_vr) {
+void UiSceneManager::SetWebVrMode(bool web_vr) {
   web_vr_mode_ = web_vr;
 
   // Make all VR scene UI elements visible if not in WebVR.
   for (UiElement* element : browser_ui_elements_) {
     element->set_visible(!web_vr_mode_);
   }
 
   ConfigureSecurityWarnings();
 }
 
-void UiSceneManager::SetWebVRSecureOrigin(bool secure) {
+void UiSceneManager::SetWebVrSecureOrigin(bool secure) {
   secure_origin_ = secure;
   ConfigureSecurityWarnings();
 }
 
 void UiSceneManager::OnAppButtonClicked() {
   // Pressing the app button currenly pauses content rendering. Note: its still
   // unclear what we want to do here and this will most likely change.
   content_rendering_enabled_ = !content_rendering_enabled_;
   scene_->SetWebVrRenderingEnabled(content_rendering_enabled_);
   browser_->OnContentPaused(!content_rendering_enabled_);
 }
 
+void UiSceneManager::OnAppButtonGesturePerformed(
+    UiInterface::Direction direction) {}
+
 void UiSceneManager::ConfigureSecurityWarnings() {
   bool enabled = web_vr_mode_ && !secure_origin_;
   permanent_security_warning_->set_visible(enabled);
   transient_security_warning_->set_visible(enabled);
   if (enabled) {
     security_warning_timer_.Start(
         FROM_HERE, base::TimeDelta::FromSeconds(kWarningTimeoutSeconds), this,
         &UiSceneManager::OnSecurityWarningTimer);
   } else {
     security_warning_timer_.Stop();
   }
 }
 
 void UiSceneManager::OnSecurityWarningTimer() {
   transient_security_warning_->set_visible(false);
 }
 
-void UiSceneManager::OnUrlChange(const GURL& gurl) {
+void UiSceneManager::SetURL(const GURL& gurl) {
   url_bar_->SetURL(gurl);
 }
 
+void UiSceneManager::SetFullscreen(bool enabled) {}

[amp, 2017/05/08 20:30:06]

I went with OnFullscreenChanged in my change since we didn't actually set
anything on the call, but if it's more consistent with the rest of the UI API to
have it 'SetXXX' feel free to change it back when you rebase.

+
+void UiSceneManager::SetSecurityLevel(int level) {}
+
+void UiSceneManager::SetLoading(bool loading) {}
+
+void UiSceneManager::SetLoadProgress(double progress) {}
+
+void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back,
+                                              bool can_go_forward) {}
+
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 }  // namespace vr_shell