VR: Disable system indicators in full-screen mode.

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/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
@@ skipping 418 matching lines @@
   if (web_vr_mode_ == web_vr && web_vr_autopresented_ == auto_presented &&
       web_vr_show_toast_ == show_toast) {
     return;
   }
   web_vr_mode_ = web_vr;
   web_vr_autopresented_ = auto_presented;
   web_vr_show_toast_ = show_toast;
   ConfigureScene();
   ConfigureSecurityWarnings();
   ConfigureTransientUrlBar();
-  ConfigureIndicators();
   ConfigurePresentationToast();
 }
 
 void UiSceneManager::ConfigureScene() {
   exit_warning_->SetEnabled(scene_->is_exiting());
   screen_dimmer_->SetEnabled(scene_->is_exiting());
 
   // Controls (URL bar, loading progress, etc).
   bool controls_visible = !web_vr_mode_ && !fullscreen_;
   for (UiElement* element : control_elements_) {
@@ skipping 41 matching lines @@
         gfx::Vector3dF(0, kContentVerticalOffset - (kContentHeight / 2) - 0.3,
                        -kCloseButtonDistance));
     close_button_->set_size(
         gfx::Vector3dF(kCloseButtonWidth, kCloseButtonHeight, 1));
   }
 
   scene_->SetMode(mode());
   scene_->SetBackgroundDistance(main_content_->translation().z() *
                                 -kBackgroundDistanceMultiplier);
   UpdateBackgroundColor();
+
+  ConfigureIndicators();

[amp, 2017/06/23 18:36:59]

Add a comment about why the indicators need to be configure here (instead of
with the reset of the ConfigureXXX calls).

Alternatively, should we move the ConfigureXXX calls into ConfigureScene?

[cjgrant, 2017/06/23 19:38:26]

I'll add the comment.  At a high-level, I see ConfigureScene as a dumping ground
to configure everything.  We have these other smaller helper methods to more
efficiently update certain things when bits of information change, but it should
be fair game to call all of those in here too.  The reason we can't is that the
original webvr warnings will get messed up - their timers will reset every time
the scene changes, IIRC.  When we circle back and refactor the transience stuff,
this should be cleaner.

 }
 
 void UiSceneManager::UpdateBackgroundColor() {
   // TODO(vollick): it would be nice if ceiling, floor and the grid were
   // UiElement subclasses and could respond to the OnSetMode signal.
   ceiling_->set_center_color(color_scheme().ceiling);
   ceiling_->set_edge_color(color_scheme().world_background);
   floor_->set_center_color(color_scheme().floor);
   floor_->set_edge_color(color_scheme().world_background);
   floor_->set_grid_color(color_scheme().floor_grid);
@@ skipping 27 matching lines @@
 void UiSceneManager::SetIncognito(bool incognito) {
   if (incognito == incognito_)
     return;
   incognito_ = incognito;
   ConfigureScene();
 }
 
 void UiSceneManager::OnGLInitialized() {
   scene_->OnGLInitialized();
 
-  // Indicators don't know their position until they've rendered themselves.
-  ConfigureIndicators();
+  ConfigureScene();
 }
 
 void UiSceneManager::OnAppButtonClicked() {
   // App button click exits the WebVR presentation and fullscreen.
   browser_->ExitPresent();
   browser_->ExitFullscreen();
 }
 
 void UiSceneManager::OnAppButtonGesturePerformed(
     UiInterface::Direction direction) {}
@@ skipping 12 matching lines @@
   if (enabled) {
     security_warning_timer_.Start(
         FROM_HERE, base::TimeDelta::FromSeconds(kWarningTimeoutSeconds), this,
         &UiSceneManager::OnSecurityWarningTimer);
   } else {
     security_warning_timer_.Stop();
   }
 }
 
 void UiSceneManager::ConfigureIndicators() {
-  audio_capture_indicator_->set_visible(!web_vr_mode_ && audio_capturing_);
-  video_capture_indicator_->set_visible(!web_vr_mode_ && video_capturing_);
-  screen_capture_indicator_->set_visible(!web_vr_mode_ && screen_capturing_);
-  location_access_indicator_->set_visible(!web_vr_mode_ && location_access_);
+  bool allowed = !web_vr_mode_ && !fullscreen_;
+  audio_capture_indicator_->set_visible(allowed && audio_capturing_);
+  video_capture_indicator_->set_visible(allowed && video_capturing_);
+  screen_capture_indicator_->set_visible(allowed && screen_capturing_);
+  location_access_indicator_->set_visible(allowed && location_access_);
+
+  if (!allowed)
+    return;
 
   // Position elements dynamically relative to each other, based on which
   // indicators are showing, and how big each one is.
   float total_width = kIndicatorGap * (system_indicators_.size() - 1);
   for (const UiElement* indicator : system_indicators_) {
     if (indicator->visible())
       total_width += indicator->size().x();
   }
   float x_position = -total_width / 2;
   for (UiElement* indicator : system_indicators_) {
@@ skipping 134 matching lines @@
   if (fullscreen_)
     return ColorScheme::kModeFullscreen;
   return ColorScheme::kModeNormal;
 }
 
 const ColorScheme& UiSceneManager::color_scheme() const {
   return ColorScheme::GetColorScheme(mode());
 }
 
 }  // namespace vr_shell