| Index: chrome/browser/android/vr_shell/ui_scene_manager.h
|
| diff --git a/chrome/browser/android/vr_shell/ui_scene_manager.h b/chrome/browser/android/vr_shell/ui_scene_manager.h
|
| index 72a8ab30d796209265422741e82c0f0eec044be8..0de03e47a94d0b3cbd5041a1351472eb2805b54a 100644
|
| --- a/chrome/browser/android/vr_shell/ui_scene_manager.h
|
| +++ b/chrome/browser/android/vr_shell/ui_scene_manager.h
|
| @@ -14,10 +14,12 @@ namespace vr_shell {
|
|
|
| struct UiElement;
|
| class UiScene;
|
| +class VrBrowserInterface;
|
|
|
| class UiSceneManager {
|
| public:
|
| - explicit UiSceneManager(UiScene* scene);
|
| + UiSceneManager(const base::WeakPtr<VrBrowserInterface>& browser,
|
| + UiScene* scene);
|
| ~UiSceneManager();
|
|
|
| base::WeakPtr<UiSceneManager> GetWeakPtr();
|
| @@ -25,6 +27,8 @@ class UiSceneManager {
|
| void SetWebVRSecureOrigin(bool secure);
|
| void SetWebVRMode(bool web_vr);
|
|
|
| + void OnAppButtonClicked();
|
| +
|
| private:
|
| void CreateSecurityWarnings();
|
| void CreateContentQuad();
|
| @@ -34,6 +38,7 @@ class UiSceneManager {
|
| void OnSecurityWarningTimer();
|
| int AllocateId();
|
|
|
| + base::WeakPtr<VrBrowserInterface> browser_;
|
| UiScene* scene_;
|
|
|
| // UI element pointers (not owned by the scene manager).
|
| @@ -43,6 +48,7 @@ class UiSceneManager {
|
|
|
| bool web_vr_mode_ = false;
|
| bool secure_origin_ = false;
|
| + bool content_rendering_enabled_ = false;
|
|
|
| int next_available_id_ = 1;
|
|
|
|
|