VR: Update UiSceneManager with screen capturing flag

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 325 matching lines @@
 base::WeakPtr<UiSceneManager> UiSceneManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void UiSceneManager::SetWebVrMode(bool web_vr) {
   if (web_vr_mode_ == web_vr)
     return;
   web_vr_mode_ = web_vr;
   ConfigureScene();
   ConfigureSecurityWarnings();
+  if (web_vr) {

[cjgrant, 2017/05/26 14:08:15]

More detailed explanation:

The way this is coded, it relies on VrShell to make repeated calls (currently
done due to polling).  We should fix the repeated calls to only update scene
manager when a state changes, but even then, we need unit tests to work and
can't have elements flickering in and out of site. :)  And also, without
polling, this code wouldn't restore indicator visibility when exiting webvr.

So this code should be replaced with a helper method just like
ConfigureSecurityWarnings().  In there, it's just:

capture_indicator->set_visible(!webvr_ && indicator_enabled_);

And you'd call that whenever either of those two values updates.

[asimjour1, 2017/05/26 17:00:59]

Updated according to the offline discussion

+    audio_capture_indicator_->set_visible(false);
+    video_capture_indicator_->set_visible(false);
+    screen_capture_indicator_->set_visible(false);
+  }
 }
 
 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_) {
     element->SetEnabled(controls_visible);
@@ skipping 32 matching lines @@
   floor_->set_center_color(center_color);
   ceiling_->set_edge_color(horizon_color);
   ceiling_->set_center_color(center_color);
   floor_grid_->set_center_color(horizon_color);
   vr::Colorf edge_color = horizon_color;
   edge_color.a = 0.0;
   floor_grid_->set_edge_color(edge_color);
 }
 
 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) {
-  audio_capture_indicator_->set_visible(enabled);
+  audio_capture_indicator_->set_visible(enabled && !web_vr_mode_);
 }
 
 void UiSceneManager::SetVideoCapturingIndicator(bool enabled) {
-  video_capture_indicator_->set_visible(enabled);
+  video_capture_indicator_->set_visible(enabled && !web_vr_mode_);
 }
 
 void UiSceneManager::SetScreenCapturingIndicator(bool enabled) {
-  // TODO(asimjour) add the indicator and change the visibility here.
+  screen_capture_indicator_->set_visible(enabled && !web_vr_mode_);
 }
 
 void UiSceneManager::SetWebVrSecureOrigin(bool secure) {
   secure_origin_ = secure;
   ConfigureSecurityWarnings();
 }
 
 void UiSceneManager::OnAppButtonClicked() {
   // App button click exits the WebVR presentation and fullscreen.
   browser_->ExitPresent();
@@ skipping 59 matching lines @@
 
 void UiSceneManager::OnCloseButtonClicked() {
   browser_->ExitCct();
 }
 
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 }  // namespace vr_shell