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/macros.h" | 9 #include "base/macros.h" |
9 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
10 #include "base/timer/timer.h" | 11 #include "base/timer/timer.h" |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "chrome/browser/android/vr_shell/ui_interface.h" | 13 #include "chrome/browser/android/vr_shell/ui_interface.h" |
13 | 14 |
14 class GURL; | 15 class GURL; |
15 | 16 |
16 namespace vr_shell { | 17 namespace vr_shell { |
17 | 18 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
68 bool content_rendering_enabled_ = true; | 69 bool content_rendering_enabled_ = true; |
69 | 70 |
70 int next_available_id_ = 1; | 71 int next_available_id_ = 1; |
71 | 72 |
72 std::vector<UiElement*> browser_ui_elements_; | 73 std::vector<UiElement*> browser_ui_elements_; |
73 | 74 |
74 base::OneShotTimer security_warning_timer_; | 75 base::OneShotTimer security_warning_timer_; |
75 | 76 |
76 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; | 77 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; |
77 | 78 |
79 FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, UiUpdatesForFullscreen); | |
cjgrant
2017/05/10 02:45:00
See other comments on how we could potentially avo
amp
2017/05/10 16:05:55
Acknowledged.
It was useful to figure out how thi
| |
80 | |
78 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); | 81 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); |
79 }; | 82 }; |
80 | 83 |
81 } // namespace vr_shell | 84 } // namespace vr_shell |
82 | 85 |
83 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ | 86 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ |
OLD | NEW |