Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/android/vr_shell/ui_scene_manager.h" | 5 #include "chrome/browser/android/vr_shell/ui_scene_manager.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h" | 9 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h" |
| 10 #include "chrome/browser/android/vr_shell/textures/ui_texture.h" | 10 #include "chrome/browser/android/vr_shell/textures/ui_texture.h" |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 388 floor_->set_center_color(center_color); | 388 floor_->set_center_color(center_color); |
| 389 ceiling_->set_edge_color(horizon_color); | 389 ceiling_->set_edge_color(horizon_color); |
| 390 ceiling_->set_center_color(center_color); | 390 ceiling_->set_center_color(center_color); |
| 391 floor_grid_->set_center_color(horizon_color); | 391 floor_grid_->set_center_color(horizon_color); |
| 392 vr::Colorf edge_color = horizon_color; | 392 vr::Colorf edge_color = horizon_color; |
| 393 edge_color.a = 0.0; | 393 edge_color.a = 0.0; |
| 394 floor_grid_->set_edge_color(edge_color); | 394 floor_grid_->set_edge_color(edge_color); |
| 395 } | 395 } |
| 396 | 396 |
| 397 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) { | 397 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) { |
| 398 audio_capture_indicator_->set_visible(enabled); | 398 audio_capture_indicator_->set_visible(enabled && !web_vr_mode_); |
|
cjgrant
2017/05/26 01:09:26
Actually, wait, this is broken, isn't it? This st
| |
| 399 } | 399 } |
| 400 | 400 |
| 401 void UiSceneManager::SetVideoCapturingIndicator(bool enabled) { | 401 void UiSceneManager::SetVideoCapturingIndicator(bool enabled) { |
| 402 video_capture_indicator_->set_visible(enabled); | 402 video_capture_indicator_->set_visible(enabled && !web_vr_mode_); |
| 403 } | 403 } |
| 404 | 404 |
| 405 void UiSceneManager::SetScreenCapturingIndicator(bool enabled) { | 405 void UiSceneManager::SetScreenCapturingIndicator(bool enabled) { |
| 406 // TODO(asimjour) add the indicator and change the visibility here. | 406 screen_capture_indicator_->set_visible(enabled && !web_vr_mode_); |
| 407 } | 407 } |
| 408 | 408 |
| 409 void UiSceneManager::SetWebVrSecureOrigin(bool secure) { | 409 void UiSceneManager::SetWebVrSecureOrigin(bool secure) { |
| 410 secure_origin_ = secure; | 410 secure_origin_ = secure; |
| 411 ConfigureSecurityWarnings(); | 411 ConfigureSecurityWarnings(); |
| 412 } | 412 } |
| 413 | 413 |
| 414 void UiSceneManager::OnAppButtonClicked() { | 414 void UiSceneManager::OnAppButtonClicked() { |
| 415 // App button click exits the WebVR presentation and fullscreen. | 415 // App button click exits the WebVR presentation and fullscreen. |
| 416 browser_->ExitPresent(); | 416 browser_->ExitPresent(); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 476 | 476 |
| 477 void UiSceneManager::OnCloseButtonClicked() { | 477 void UiSceneManager::OnCloseButtonClicked() { |
| 478 browser_->ExitCct(); | 478 browser_->ExitCct(); |
| 479 } | 479 } |
| 480 | 480 |
| 481 int UiSceneManager::AllocateId() { | 481 int UiSceneManager::AllocateId() { |
| 482 return next_available_id_++; | 482 return next_available_id_++; |
| 483 } | 483 } |
| 484 | 484 |
| 485 } // namespace vr_shell | 485 } // namespace vr_shell |
| OLD | NEW |