chrome/browser/android/vr_shell/ui_scene_manager.h - Issue 2950173002: VR: System indicator rework.

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

Issue 2950173002: VR: System indicator rework. (Closed)

Patch Set: Address comments; increase size slightly for readability, now that position is dynamic. 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

« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements/video_capture_indicator.cc ('k') | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 Loading...
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 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 UiElement* screen_capture_indicator_ = nullptr;	107 UiElement* screen_capture_indicator_ = nullptr;

107 UiElement* location_access_indicator_ = nullptr;	108 UiElement* location_access_indicator_ = nullptr;

108 UiElement* screen_dimmer_ = nullptr;	109 UiElement* screen_dimmer_ = nullptr;

109 UiElement* ceiling_ = nullptr;	110 UiElement* ceiling_ = nullptr;

110 UiElement* floor_ = nullptr;	111 UiElement* floor_ = nullptr;

111 UiElement* close_button_ = nullptr;	112 UiElement* close_button_ = nullptr;

112 UrlBar* url_bar_ = nullptr;	113 UrlBar* url_bar_ = nullptr;

113 TransientUrlBar* transient_url_bar_ = nullptr;	114 TransientUrlBar* transient_url_bar_ = nullptr;

114 LoadingIndicator* loading_indicator_ = nullptr;	115 LoadingIndicator* loading_indicator_ = nullptr;

115	116

	117 std::vector<UiElement*> system_indicators_;

	118

116 bool in_cct_;	119 bool in_cct_;

117 bool web_vr_mode_;	120 bool web_vr_mode_;

118 bool web_vr_autopresented_ = false;	121 bool web_vr_autopresented_ = false;

119 bool web_vr_show_toast_ = false;	122 bool web_vr_show_toast_ = false;

120 bool secure_origin_ = false;	123 bool secure_origin_ = false;

121 bool fullscreen_ = false;	124 bool fullscreen_ = false;

122 bool incognito_ = false;	125 bool incognito_ = false;

123 bool audio_capturing_ = false;	126 bool audio_capturing_ = false;

124 bool video_capturing_ = false;	127 bool video_capturing_ = false;

125 bool screen_capturing_ = false;	128 bool screen_capturing_ = false;

(...skipping 10 matching lines...) Expand all Loading...
136 base::OneShotTimer presentation_toast_timer_;	139 base::OneShotTimer presentation_toast_timer_;

137	140

138 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;	141 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;

139	142

140 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);	143 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);

141 };	144 };

142	145

143 } // namespace vr_shell	146 } // namespace vr_shell

144	147

145 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_	148 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_

OLD	NEW