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

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

Issue 2861003003: VR: Enable browsing for CCT and make ui_scene_manager aware of whether we're in CCT. (Closed)
Patch Set: Fix test compile 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 class UiElement; 15 class UiElement;
16 class UiScene; 16 class UiScene;
17 class VrBrowserInterface; 17 class VrBrowserInterface;
18 18
19 class UiSceneManager { 19 class UiSceneManager {
20 public: 20 public:
21 UiSceneManager(VrBrowserInterface* browser, UiScene* scene); 21 UiSceneManager(VrBrowserInterface* browser, UiScene* scene, bool in_cct);
22 ~UiSceneManager(); 22 ~UiSceneManager();
23 23
24 base::WeakPtr<UiSceneManager> GetWeakPtr(); 24 base::WeakPtr<UiSceneManager> GetWeakPtr();
25 25
26 void SetWebVRSecureOrigin(bool secure); 26 void SetWebVRSecureOrigin(bool secure);
27 void SetWebVRMode(bool web_vr); 27 void SetWebVRMode(bool web_vr);
28 28
29 void OnAppButtonClicked(); 29 void OnAppButtonClicked();
30 30
31 private: 31 private:
32 void CreateSecurityWarnings(); 32 void CreateSecurityWarnings();
33 void CreateContentQuad(); 33 void CreateContentQuad();
34 void CreateBackground(); 34 void CreateBackground();
35 35
36 void ConfigureSecurityWarnings(); 36 void ConfigureSecurityWarnings();
37 void OnSecurityWarningTimer(); 37 void OnSecurityWarningTimer();
38 int AllocateId(); 38 int AllocateId();
39 39
40 VrBrowserInterface* browser_; 40 VrBrowserInterface* browser_;
41 UiScene* scene_; 41 UiScene* scene_;
42 42
43 // UI element pointers (not owned by the scene manager). 43 // UI element pointers (not owned by the scene manager).
44 UiElement* permanent_security_warning_ = nullptr; 44 UiElement* permanent_security_warning_ = nullptr;
45 UiElement* transient_security_warning_ = nullptr; 45 UiElement* transient_security_warning_ = nullptr;
46 UiElement* main_content_ = nullptr; 46 UiElement* main_content_ = nullptr;
47 47
48 bool web_vr_mode_ = false; 48 bool web_vr_mode_ = false;
49 bool secure_origin_ = false; 49 bool secure_origin_ = false;
50 bool content_rendering_enabled_ = true; 50 bool content_rendering_enabled_ = true;
51 bool in_cct_;
51 52
52 int next_available_id_ = 1; 53 int next_available_id_ = 1;
53 54
54 std::vector<UiElement*> browser_ui_elements_; 55 std::vector<UiElement*> browser_ui_elements_;
55 56
56 base::OneShotTimer security_warning_timer_; 57 base::OneShotTimer security_warning_timer_;
57 58
58 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 59 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 61 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
61 }; 62 };
62 63
63 } // namespace vr_shell 64 } // namespace vr_shell
64 65
65 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 66 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698