VR: Factor transient timing out of UiSceneManager.

chrome/browser/android/vr_shell/ui_scene_manager.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/android/vr_shell/color_scheme.h"
 #include "chrome/browser/android/vr_shell/ui_interface.h"
 #include "chrome/browser/android/vr_shell/ui_unsupported_mode.h"
 
 namespace vr_shell {
 
 class LoadingIndicator;
+class PresentationToast;
 class TransientUrlBar;
 class UiBrowserInterface;
 class UiElement;
 class UiScene;
 class UrlBar;
 
 class UiSceneManager {
  public:
   UiSceneManager(UiBrowserInterface* browser,
                  UiScene* scene,
@@ skipping 22 matching lines @@
   void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward);
 
   void OnGLInitialized();
   void OnAppButtonClicked();
   void OnAppButtonGesturePerformed(UiInterface::Direction direction);
 
   void OnSecurityIconClickedForTesting();
   void OnExitPromptPrimaryButtonClickedForTesting();
 
  private:
-  enum ToastState {
-    UNCHANGED = 0,
-    SET_FOR_WEB_VR,
-    SET_FOR_FULLSCREEN,
-  };
   void CreateScreenDimmer();
   void CreateSecurityWarnings();
   void CreateSystemIndicators();
   void CreateContentQuad();
   void CreateBackground();
   void CreateUrlBar();
   void CreateTransientUrlBar();
   void CreateCloseButton();
   void CreateExitPrompt();
   void CreateToasts();
 
   void ConfigureScene();
   void ConfigureSecurityWarnings();
   void ConfigureTransientUrlBar();
   void ConfigureIndicators();
-  void ConfigurePresentationToast();
   void UpdateBackgroundColor();
   void CloseExitPrompt();
   void OnSecurityWarningTimer();
   void OnTransientUrlBarTimer();
   void OnPresentationToastTimer();
   void OnBackButtonClicked();
   void OnSecurityIconClicked();
   void OnExitPromptPrimaryButtonClicked();
   void OnExitPromptSecondaryButtonClicked();
   void OnExitPromptBackplaneClicked();
   void OnCloseButtonClicked();
   void OnUnsupportedMode(UiUnsupportedMode mode);
   int AllocateId();
   ColorScheme::Mode mode() const;
   const ColorScheme& color_scheme() const;
 
   UiBrowserInterface* browser_;
   UiScene* scene_;
 
   // 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;
   UiElement* main_content_ = nullptr;
   UiElement* audio_capture_indicator_ = nullptr;
   UiElement* video_capture_indicator_ = nullptr;
   UiElement* screen_capture_indicator_ = nullptr;
   UiElement* location_access_indicator_ = nullptr;
   UiElement* screen_dimmer_ = nullptr;
   UiElement* ceiling_ = nullptr;
   UiElement* floor_ = nullptr;
   UiElement* close_button_ = nullptr;
   UrlBar* url_bar_ = nullptr;
   TransientUrlBar* transient_url_bar_ = nullptr;
   LoadingIndicator* loading_indicator_ = nullptr;
 
   std::vector<UiElement*> system_indicators_;
 
   bool in_cct_;
   bool web_vr_mode_;
   bool web_vr_autopresented_ = false;
   bool web_vr_show_toast_ = false;
   bool secure_origin_ = false;
   bool fullscreen_ = false;
   bool incognito_ = false;
   bool audio_capturing_ = false;
   bool video_capturing_ = false;
   bool screen_capturing_ = false;
   bool location_access_ = false;
-  ToastState toast_state_ = UNCHANGED;
 
   int next_available_id_ = 1;
 
   std::vector<UiElement*> content_elements_;
   std::vector<UiElement*> background_elements_;
   std::vector<UiElement*> control_elements_;
 
   base::OneShotTimer security_warning_timer_;
   base::OneShotTimer transient_url_bar_timer_;
-  base::OneShotTimer presentation_toast_timer_;
 
   base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_