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

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: 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"
(...skipping 22 matching lines...) Expand all
33 UiScene* scene_; 33 UiScene* scene_;
34 34
35 // UI element pointers (not owned by the scene manager). 35 // UI element pointers (not owned by the scene manager).
36 UiElement* permanent_security_warning_ = nullptr; 36 UiElement* permanent_security_warning_ = nullptr;
37 UiElement* transient_security_warning_ = nullptr; 37 UiElement* transient_security_warning_ = nullptr;
38 UiElement* main_content_ = nullptr; 38 UiElement* main_content_ = nullptr;
39 39
40 bool web_vr_mode_ = false; 40 bool web_vr_mode_ = false;
41 bool secure_origin_ = false; 41 bool secure_origin_ = false;
42 42
43 std::vector<UiElement*> browser_ui_elements_;
44
43 base::OneShotTimer security_warning_timer_; 45 base::OneShotTimer security_warning_timer_;
44 46
45 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 47 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
46 48
47 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 49 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
48 }; 50 };
49 51
50 } // namespace vr_shell 52 } // namespace vr_shell
51 53
52 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 54 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698