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

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

Issue 2844313002: Add VR gradient and grid background to non-WebVR scene. (Closed)
Patch Set: Rebase onto amp@'s magic number CL. Created 3 years, 7 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/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"
11 #include "base/values.h" 11 #include "base/values.h"
12 12
13 namespace vr_shell { 13 namespace vr_shell {
14 14
15 struct UiElement; 15 struct UiElement;
16 class UiScene; 16 class UiScene;
17 17
18 class UiSceneManager { 18 class UiSceneManager {
19 public: 19 public:
20 explicit UiSceneManager(UiScene* scene); 20 explicit UiSceneManager(UiScene* scene);
21 ~UiSceneManager(); 21 ~UiSceneManager();
22 22
23 base::WeakPtr<UiSceneManager> GetWeakPtr(); 23 base::WeakPtr<UiSceneManager> GetWeakPtr();
24 24
25 void SetWebVRSecureOrigin(bool secure); 25 void SetWebVRSecureOrigin(bool secure);
26 void SetWebVRMode(bool web_vr); 26 void SetWebVRMode(bool web_vr);
27 27
28 private: 28 private:
29 void CreateSecurityWarnings();
30 void CreateContentQuad();
31 void CreateBackground();
32
29 void ConfigureSecurityWarnings(); 33 void ConfigureSecurityWarnings();
30 void OnSecurityWarningTimer(); 34 void OnSecurityWarningTimer();
31 void OnGLInitialized(); 35 int AllocateId();
32 36
33 UiScene* scene_; 37 UiScene* scene_;
34 38
35 // UI element pointers (not owned by the scene manager). 39 // UI element pointers (not owned by the scene manager).
36 UiElement* permanent_security_warning_ = nullptr; 40 UiElement* permanent_security_warning_ = nullptr;
37 UiElement* transient_security_warning_ = nullptr; 41 UiElement* transient_security_warning_ = nullptr;
38 UiElement* main_content_ = nullptr; 42 UiElement* main_content_ = nullptr;
39 43
40 bool web_vr_mode_ = false; 44 bool web_vr_mode_ = false;
41 bool secure_origin_ = false; 45 bool secure_origin_ = false;
42 46
47 int next_available_id_ = 1;
48
49 std::vector<UiElement*> browser_ui_elements_;
50
43 base::OneShotTimer security_warning_timer_; 51 base::OneShotTimer security_warning_timer_;
44 52
45 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 53 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
46 54
47 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 55 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
48 }; 56 };
49 57
50 } // namespace vr_shell 58 } // namespace vr_shell
51 59
52 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 60 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698