Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: chrome/browser/android/vr_shell/ui_scene_manager.cc

Issue 2903673002: VR: Update UiSceneManager with screen capturing flag (Closed)
Patch Set: VR: Update UiSceneManager with screen capturing flag Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/ui_scene_manager.cc
diff --git a/chrome/browser/android/vr_shell/ui_scene_manager.cc b/chrome/browser/android/vr_shell/ui_scene_manager.cc
index e8a62ad89d2e8117d898443d11a75404e96663fe..d08741ab27e7c93ccb7d724574544b1b8625abd2 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.cc
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.cc
@@ -343,6 +343,11 @@ void UiSceneManager::SetWebVrMode(bool web_vr) {
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,
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() {
@@ -395,15 +400,15 @@ void UiSceneManager::ConfigureBackgroundColor(vr::Colorf center_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) {

Powered by Google App Engine
This is Rietveld 408576698