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

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

Issue 2888283005: VR: Fix HTTP warning staying visible after exiting WebVR. (Closed)
Patch Set: Remove CCT TODO and add a test for it; fix EXPECTs on booleans; cleanup. 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_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "chrome/browser/android/vr_shell/ui_elements/ui_element_identifiers.h"
13 #include "device/vr/vr_types.h" 14 #include "device/vr/vr_types.h"
14 15
15 namespace base { 16 namespace base {
16 class ListValue; 17 class ListValue;
17 class TimeTicks; 18 class TimeTicks;
18 } 19 }
19 20
20 namespace vr_shell { 21 namespace vr_shell {
21 22
22 class Animation; 23 class Animation;
(...skipping 27 matching lines...) Expand all
50 // if necessary (eg, for animations). NB: |current_time| is the shared, 51 // if necessary (eg, for animations). NB: |current_time| is the shared,
51 // absolute begin frame time. 52 // absolute begin frame time.
52 void OnBeginFrame(const base::TimeTicks& current_time); 53 void OnBeginFrame(const base::TimeTicks& current_time);
53 54
54 // Handle a batch of commands passed from the UI HTML. 55 // Handle a batch of commands passed from the UI HTML.
55 void HandleCommands(std::unique_ptr<base::ListValue> commands, 56 void HandleCommands(std::unique_ptr<base::ListValue> commands,
56 const base::TimeTicks& current_time); 57 const base::TimeTicks& current_time);
57 58
58 const std::vector<std::unique_ptr<UiElement>>& GetUiElements() const; 59 const std::vector<std::unique_ptr<UiElement>>& GetUiElements() const;
59 60
60 UiElement* GetUiElementById(int element_id); 61 UiElement* GetUiElementById(int element_id) const;
62 UiElement* GetUiElementByIdentifier(UiElementIdentifier identifier) const;
61 63
62 std::vector<const UiElement*> GetWorldElements() const; 64 std::vector<const UiElement*> GetWorldElements() const;
63 std::vector<const UiElement*> GetHeadLockedElements() const; 65 std::vector<const UiElement*> GetHeadLockedElements() const;
64 bool HasVisibleHeadLockedElements() const; 66 bool HasVisibleHeadLockedElements() const;
65 67
66 void SetBackgroundColor(const vr::Colorf& color); 68 void SetBackgroundColor(const vr::Colorf& color);
67 const vr::Colorf& GetBackgroundColor() const; 69 const vr::Colorf& GetBackgroundColor() const;
68 void SetBackgroundDistance(float distance); 70 void SetBackgroundDistance(float distance);
69 float GetBackgroundDistance() const; 71 float GetBackgroundDistance() const;
70 72
(...skipping 12 matching lines...) Expand all
83 float background_distance_ = 10.0f; 85 float background_distance_ = 10.0f;
84 bool webvr_rendering_enabled_ = true; 86 bool webvr_rendering_enabled_ = true;
85 bool gl_initialized_ = false; 87 bool gl_initialized_ = false;
86 88
87 DISALLOW_COPY_AND_ASSIGN(UiScene); 89 DISALLOW_COPY_AND_ASSIGN(UiScene);
88 }; 90 };
89 91
90 } // namespace vr_shell 92 } // namespace vr_shell
91 93
92 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ 94 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698