chrome/browser/android/vr_shell/ui_scene_manager.h - Issue 2926643003: [VrShell] Centralize color handling and enable close button on fullscreen

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

Issue 2926643003: [VrShell] Centralize color handling and enable close button on fullscreen (Closed)

Patch Set: 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:

« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene.cc ('k') | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »

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/macros.h"	8 #include "base/macros.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "base/timer/timer.h"	10 #include "base/timer/timer.h"

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 UiElement* permanent_security_warning_ = nullptr;	79 UiElement* permanent_security_warning_ = nullptr;

80 UiElement* transient_security_warning_ = nullptr;	80 UiElement* transient_security_warning_ = nullptr;

81 UiElement* exit_warning_ = nullptr;	81 UiElement* exit_warning_ = nullptr;

82 UiElement* main_content_ = nullptr;	82 UiElement* main_content_ = nullptr;

83 UiElement* audio_capture_indicator_ = nullptr;	83 UiElement* audio_capture_indicator_ = nullptr;

84 UiElement* video_capture_indicator_ = nullptr;	84 UiElement* video_capture_indicator_ = nullptr;

85 UiElement* screen_capture_indicator_ = nullptr;	85 UiElement* screen_capture_indicator_ = nullptr;

86 UiElement* screen_dimmer_ = nullptr;	86 UiElement* screen_dimmer_ = nullptr;

87 UiElement* ceiling_ = nullptr;	87 UiElement* ceiling_ = nullptr;

88 UiElement* floor_ = nullptr;	88 UiElement* floor_ = nullptr;

	89 UiElement* close_button_ = nullptr;

89 UrlBar* url_bar_ = nullptr;	90 UrlBar* url_bar_ = nullptr;

90 LoadingIndicator* loading_indicator_ = nullptr;	91 LoadingIndicator* loading_indicator_ = nullptr;

91	92

92 bool in_cct_;	93 bool in_cct_;

93 bool web_vr_mode_;	94 bool web_vr_mode_;

94 bool secure_origin_ = false;	95 bool secure_origin_ = false;

95 bool fullscreen_ = false;	96 bool fullscreen_ = false;

96 bool incognito_ = false;	97 bool incognito_ = false;

97 bool is_exiting_ = false;	98 bool is_exiting_ = false;

98 bool audio_capturing_ = false;	99 bool audio_capturing_ = false;

99 bool video_capturing_ = false;	100 bool video_capturing_ = false;

100 bool screen_capturing_ = false;	101 bool screen_capturing_ = false;

101	102

102 int next_available_id_ = 1;	103 int next_available_id_ = 1;

103	104

104 std::vector<UiElement*> content_elements_;	105 std::vector<UiElement*> content_elements_;

105 std::vector<UiElement*> control_elements_;	106 std::vector<UiElement*> control_elements_;

106	107

107 base::OneShotTimer security_warning_timer_;	108 base::OneShotTimer security_warning_timer_;

108	109

109 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;	110 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;

110	111

111 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);	112 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);

112 };	113 };

113	114

114 } // namespace vr_shell	115 } // namespace vr_shell

115	116

116 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_	117 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_

OLD	NEW