| 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 a330af6147725a9d2854f43a34214b8b5ee52dad..3f1fd0808dc8242655e3bb0c08d4d78d3245574e 100644
|
| --- a/chrome/browser/android/vr_shell/ui_scene_manager.h
|
| +++ b/chrome/browser/android/vr_shell/ui_scene_manager.h
|
| @@ -17,6 +17,7 @@
|
| namespace vr_shell {
|
|
|
| class LoadingIndicator;
|
| +class PresentationToast;
|
| class TransientUrlBar;
|
| class UiBrowserInterface;
|
| class UiElement;
|
| @@ -59,11 +60,6 @@ class UiSceneManager {
|
| void OnExitPromptPrimaryButtonClickedForTesting();
|
|
|
| private:
|
| - enum ToastState {
|
| - UNCHANGED = 0,
|
| - SET_FOR_WEB_VR,
|
| - SET_FOR_FULLSCREEN,
|
| - };
|
| void CreateScreenDimmer();
|
| void CreateSecurityWarnings();
|
| void CreateSystemIndicators();
|
| @@ -79,7 +75,6 @@ class UiSceneManager {
|
| void ConfigureSecurityWarnings();
|
| void ConfigureTransientUrlBar();
|
| void ConfigureIndicators();
|
| - void ConfigurePresentationToast();
|
| void UpdateBackgroundColor();
|
| void CloseExitPrompt();
|
| void OnSecurityWarningTimer();
|
| @@ -102,7 +97,7 @@ class UiSceneManager {
|
| // UI element pointers (not owned by the scene manager).
|
| UiElement* permanent_security_warning_ = nullptr;
|
| UiElement* transient_security_warning_ = nullptr;
|
| - UiElement* presentation_toast_ = nullptr;
|
| + PresentationToast* presentation_toast_ = nullptr;
|
| UiElement* exit_prompt_ = nullptr;
|
| UiElement* exit_prompt_backplane_ = nullptr;
|
| UiElement* exit_warning_ = nullptr;
|
| @@ -132,7 +127,6 @@ class UiSceneManager {
|
| bool video_capturing_ = false;
|
| bool screen_capturing_ = false;
|
| bool location_access_ = false;
|
| - ToastState toast_state_ = UNCHANGED;
|
|
|
| int next_available_id_ = 1;
|
|
|
| @@ -142,7 +136,6 @@ class UiSceneManager {
|
|
|
| base::OneShotTimer security_warning_timer_;
|
| base::OneShotTimer transient_url_bar_timer_;
|
| - base::OneShotTimer presentation_toast_timer_;
|
|
|
| base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
|
|
|
|
|