Chromium Code Reviews| 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 49c45158192402d05bec125a2e4f7ef5c08e08c3..95125bf25820f136918bad7d72deb500a6c2bd39 100644 |
| --- a/chrome/browser/android/vr_shell/ui_scene_manager.cc |
| +++ b/chrome/browser/android/vr_shell/ui_scene_manager.cc |
| @@ -11,6 +11,8 @@ |
| #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_scene.h" |
| +#include "chrome/browser/android/vr_shell/vr_browser_interface.h" |
| +#include "chrome/browser/android/vr_shell/vr_shell.h" |
| namespace vr_shell { |
| @@ -42,8 +44,9 @@ static constexpr float kTextureOffset = 0.01; |
| } // namespace |
| -UiSceneManager::UiSceneManager(UiScene* scene) |
| - : scene_(scene), weak_ptr_factory_(this) { |
| +UiSceneManager::UiSceneManager(const base::WeakPtr<VrBrowserInterface>& browser, |
| + UiScene* scene) |
| + : browser_(browser), scene_(scene), weak_ptr_factory_(this) { |
| std::unique_ptr<UiElement> element; |
| CreateBackground(); |
| @@ -184,6 +187,14 @@ void UiSceneManager::SetWebVRSecureOrigin(bool 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. |
| + content_rendering_enabled_ = !content_rendering_enabled_; |
| + scene_->SetWebVrRenderingEnabled(!content_rendering_enabled_); |
| + browser_->OnContentPaused(content_rendering_enabled_); |
|
mthiesse
2017/05/03 16:12:03
Need to check that this weak ptr isn't null before
ymalik
2017/05/03 20:26:38
Made it a raw ptr.
|
| +} |
| + |
| void UiSceneManager::ConfigureSecurityWarnings() { |
| bool enabled = web_vr_mode_ && !secure_origin_; |
| permanent_security_warning_->visible = enabled; |