VR: Add a loading indicator to the scene.

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/loading_indicator.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"
 #include "chrome/browser/android/vr_shell/ui_elements/ui_element.h"
 #include "chrome/browser/android/vr_shell/ui_elements/url_bar.h"
 #include "chrome/browser/android/vr_shell/ui_scene.h"
 #include "chrome/browser/android/vr_shell/vr_browser_interface.h"
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 
 namespace vr_shell {
 
@@ skipping 41 matching lines @@
                                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();
+
+  ConfigureScene();
 }
 
 UiSceneManager::~UiSceneManager() {}
 
 void UiSceneManager::CreateSecurityWarnings() {
   std::unique_ptr<UiElement> element;
 
   // TODO(mthiesse): Programatically compute the proper texture size for these
   // textured UI elements.
   element = base::MakeUnique<PermanentSecurityWarning>(512);
@@ skipping 102 matching lines @@
   element->set_gridline_count(kFloorGridlineCount);
   element->set_draw_phase(0);
   browser_ui_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   scene_->SetBackgroundColor(horizon);
 }
 
 void UiSceneManager::CreateUrlBar() {
   // TODO(cjgrant): Incorporate final size and position.
-  // TODO(cjgrant): Add the loading progress indicator element.
-  auto element = base::MakeUnique<UrlBar>(512);
-  element->set_id(AllocateId());
-  element->set_translation({0, -0.9, -1.8});
-  element->set_size({0.9, 0, 1});
-  element->SetBackButtonCallback(
+  auto url_bar = base::MakeUnique<UrlBar>(512);
+  url_bar->set_id(AllocateId());
+  url_bar->set_translation({0, -0.9, -1.8});
+  url_bar->set_size({0.9, 0, 1});
+  url_bar->SetBackButtonCallback(
       base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this)));
-  url_bar_ = element.get();
-  browser_ui_elements_.push_back(element.get());
-  scene_->AddUiElement(std::move(element));
+  url_bar_ = url_bar.get();
+  scene_->AddUiElement(std::move(url_bar));
+
+  auto indicator = base::MakeUnique<LoadingIndicator>(256);
+  indicator->set_id(AllocateId());
+  indicator->set_translation({0, -0.8, -1.8});
+  indicator->set_size({0.4, 0, 1});
+  loading_indicator_ = indicator.get();
+  scene_->AddUiElement(std::move(indicator));
 }
 
 base::WeakPtr<UiSceneManager> UiSceneManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void UiSceneManager::SetWebVrMode(bool web_vr) {
   web_vr_mode_ = web_vr;
 
-  // Make all VR scene UI elements visible if not in WebVR.
+  ConfigureScene();
+}
+
+void UiSceneManager::ConfigureScene() {

[amp, 2017/05/12 18:46:44]

Should we have the fullscreen changes go through here as well?

It would require passing in a flag for the mode being configured, but it would
pull all the scene configuration into a single location.

Or maybe it would make sense to have a method for each mode, something like
'ConfigureSceneForWebVR, ConfigureSceneForBrowsing, ConfigureSceneForFullscreen,
...)

WDYT?

[cjgrant, 2017/05/12 18:52:12]

We could do that.  It'd look more like the original "catch all" method in the
HTML UI.

[cjgrant, 2017/05/12 21:03:06]

Done.  I refactored as suggested and retested.  PTAL when you can...

+  // Make all simple browser UI elements visible if not in WebVR.
   for (UiElement* element : browser_ui_elements_) {
     element->set_visible(!web_vr_mode_);
   }
-  url_bar_->SetEnabled(!web_vr);
 
-  ConfigureSecurityWarnings();
+  url_bar_->SetEnabled(!web_vr_mode_);
+  loading_indicator_->SetEnabled(!web_vr_mode_);
 }
 
 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.
@@ skipping 54 matching lines @@
 }
 
 void UiSceneManager::SetURL(const GURL& gurl) {
   url_bar_->SetURL(gurl);
 }
 
 void UiSceneManager::SetSecurityLevel(int level) {
   url_bar_->SetSecurityLevel(level);
 }
 
-void UiSceneManager::SetLoading(bool loading) {}
+void UiSceneManager::SetLoading(bool loading) {
+  loading_indicator_->SetLoading(loading);
+}
 
-void UiSceneManager::SetLoadProgress(double progress) {}
+void UiSceneManager::SetLoadProgress(float progress) {
+  loading_indicator_->SetLoadProgress(progress);
+}
 
 void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back,
                                               bool can_go_forward) {}
 
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 }  // namespace vr_shell