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

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

Issue 2950173002: VR: System indicator rework. (Closed)
Patch Set: Cleanup. 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 void SetLoadProgress(float progress); 44 void SetLoadProgress(float progress);
45 void SetIsExiting(); 45 void SetIsExiting();
46 void SetVideoCapturingIndicator(bool enabled); 46 void SetVideoCapturingIndicator(bool enabled);
47 void SetScreenCapturingIndicator(bool enabled); 47 void SetScreenCapturingIndicator(bool enabled);
48 void SetAudioCapturingIndicator(bool enabled); 48 void SetAudioCapturingIndicator(bool enabled);
49 void SetLocationAccessIndicator(bool enabled); 49 void SetLocationAccessIndicator(bool enabled);
50 50
51 // These methods are currently stubbed. 51 // These methods are currently stubbed.
52 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward); 52 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward);
53 53
54 void OnGLInitialized();
54 void OnAppButtonClicked(); 55 void OnAppButtonClicked();
55 void OnAppButtonGesturePerformed(UiInterface::Direction direction); 56 void OnAppButtonGesturePerformed(UiInterface::Direction direction);
56 57
57 void OnSecurityIconClickedForTesting(); 58 void OnSecurityIconClickedForTesting();
58 void OnExitPromptPrimaryButtonClickedForTesting(); 59 void OnExitPromptPrimaryButtonClickedForTesting();
59 60
60 private: 61 private:
61 void CreateScreenDimmer(); 62 void CreateScreenDimmer();
62 void CreateSecurityWarnings(); 63 void CreateSecurityWarnings();
63 void CreateSystemIndicators(); 64 void CreateSystemIndicators();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 UiElement* screen_capture_indicator_ = nullptr; 103 UiElement* screen_capture_indicator_ = nullptr;
103 UiElement* location_access_indicator_ = nullptr; 104 UiElement* location_access_indicator_ = nullptr;
104 UiElement* screen_dimmer_ = nullptr; 105 UiElement* screen_dimmer_ = nullptr;
105 UiElement* ceiling_ = nullptr; 106 UiElement* ceiling_ = nullptr;
106 UiElement* floor_ = nullptr; 107 UiElement* floor_ = nullptr;
107 UiElement* close_button_ = nullptr; 108 UiElement* close_button_ = nullptr;
108 UrlBar* url_bar_ = nullptr; 109 UrlBar* url_bar_ = nullptr;
109 TransientUrlBar* transient_url_bar_ = nullptr; 110 TransientUrlBar* transient_url_bar_ = nullptr;
110 LoadingIndicator* loading_indicator_ = nullptr; 111 LoadingIndicator* loading_indicator_ = nullptr;
111 112
113 std::vector<UiElement*> system_indicators_;
114
112 bool in_cct_; 115 bool in_cct_;
113 bool web_vr_mode_; 116 bool web_vr_mode_;
114 bool web_vr_autopresented_ = false; 117 bool web_vr_autopresented_ = false;
115 bool secure_origin_ = false; 118 bool secure_origin_ = false;
116 bool fullscreen_ = false; 119 bool fullscreen_ = false;
117 bool incognito_ = false; 120 bool incognito_ = false;
118 bool audio_capturing_ = false; 121 bool audio_capturing_ = false;
119 bool video_capturing_ = false; 122 bool video_capturing_ = false;
120 bool screen_capturing_ = false; 123 bool screen_capturing_ = false;
121 bool location_access_ = false; 124 bool location_access_ = false;
122 125
123 int next_available_id_ = 1; 126 int next_available_id_ = 1;
124 127
125 std::vector<UiElement*> content_elements_; 128 std::vector<UiElement*> content_elements_;
126 std::vector<UiElement*> background_elements_; 129 std::vector<UiElement*> background_elements_;
127 std::vector<UiElement*> control_elements_; 130 std::vector<UiElement*> control_elements_;
128 131
129 base::OneShotTimer security_warning_timer_; 132 base::OneShotTimer security_warning_timer_;
130 base::OneShotTimer transient_url_bar_timer_; 133 base::OneShotTimer transient_url_bar_timer_;
131 134
132 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 135 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
133 136
134 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 137 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
135 }; 138 };
136 139
137 } // namespace vr_shell 140 } // namespace vr_shell
138 141
139 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 142 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698