Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: chrome/browser/android/vr_shell/ui_scene_manager.h

Issue 2921383002: [vr] Close exit prompt when clicking on background (Closed)
Patch Set: fix diff Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void SetAudioCapturingIndicator(bool enabled); 47 void SetAudioCapturingIndicator(bool enabled);
48 48
49 // These methods are currently stubbed. 49 // These methods are currently stubbed.
50 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward); 50 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward);
51 51
52 void OnAppButtonClicked(); 52 void OnAppButtonClicked();
53 void OnAppButtonGesturePerformed(UiInterface::Direction direction); 53 void OnAppButtonGesturePerformed(UiInterface::Direction direction);
54 54
55 private: 55 private:
56 FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, UiUpdatesExitPrompt); 56 FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, UiUpdatesExitPrompt);
57 FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, BackplaneClickClosesExitPrompt);
57 58
58 void CreateScreenDimmer(); 59 void CreateScreenDimmer();
59 void CreateSecurityWarnings(); 60 void CreateSecurityWarnings();
60 void CreateSystemIndicators(); 61 void CreateSystemIndicators();
61 void CreateContentQuad(); 62 void CreateContentQuad();
62 void CreateBackground(); 63 void CreateBackground();
63 void CreateUrlBar(); 64 void CreateUrlBar();
64 void CreateCloseButton(); 65 void CreateCloseButton();
65 66
66 void ConfigureScene(); 67 void ConfigureScene();
67 void ConfigureSecurityWarnings(); 68 void ConfigureSecurityWarnings();
68 void UpdateBackgroundColor(); 69 void UpdateBackgroundColor();
70 void CloseExitPrompt();
69 void OnSecurityWarningTimer(); 71 void OnSecurityWarningTimer();
70 void OnBackButtonClicked(); 72 void OnBackButtonClicked();
73 void OnBackplaneClicked();
71 void OnSecurityIconClicked(); 74 void OnSecurityIconClicked();
72 void OnExitPromptPrimaryButtonClicked(); 75 void OnExitPromptPrimaryButtonClicked();
73 void OnExitPromptSecondaryButtonClicked(); 76 void OnExitPromptSecondaryButtonClicked();
74 void OnCloseButtonClicked(); 77 void OnCloseButtonClicked();
75 void OnUnsupportedMode(UiUnsupportedMode mode); 78 void OnUnsupportedMode(UiUnsupportedMode mode);
76 int AllocateId(); 79 int AllocateId();
77 ColorScheme::Mode mode() const; 80 ColorScheme::Mode mode() const;
78 const ColorScheme& color_scheme() const; 81 const ColorScheme& color_scheme() const;
79 82
80 VrBrowserInterface* browser_; 83 VrBrowserInterface* browser_;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 base::OneShotTimer security_warning_timer_; 117 base::OneShotTimer security_warning_timer_;
115 118
116 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 119 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
117 120
118 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 121 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
119 }; 122 };
120 123
121 } // namespace vr_shell 124 } // namespace vr_shell
122 125
123 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 126 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698