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

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

Issue 2834543006: Hook up insecure content warnings for http webVR presentation. (Closed)
Patch Set: rebase Created 3 years, 8 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
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 UiElement* GetUiElementById(int element_id); 59 UiElement* GetUiElementById(int element_id);
60 60
61 std::vector<const UiElement*> GetWorldElements() const; 61 std::vector<const UiElement*> GetWorldElements() const;
62 std::vector<const UiElement*> GetHeadLockedElements() const; 62 std::vector<const UiElement*> GetHeadLockedElements() const;
63 bool HasVisibleHeadLockedElements() const; 63 bool HasVisibleHeadLockedElements() const;
64 64
65 const vr::Colorf& GetBackgroundColor() const; 65 const vr::Colorf& GetBackgroundColor() const;
66 float GetBackgroundDistance() const; 66 float GetBackgroundDistance() const;
67 bool GetWebVrRenderingEnabled() const; 67 bool GetWebVrRenderingEnabled() const;
68 68
69 void OnGLInitialized();
70
69 private: 71 private:
70 void ApplyRecursiveTransforms(UiElement* element); 72 void ApplyRecursiveTransforms(UiElement* element);
71 73
72 std::vector<std::unique_ptr<UiElement>> ui_elements_; 74 std::vector<std::unique_ptr<UiElement>> ui_elements_;
73 UiElement* content_element_ = nullptr; 75 UiElement* content_element_ = nullptr;
74 vr::Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f}; 76 vr::Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
75 float background_distance_ = 10.0f; 77 float background_distance_ = 10.0f;
76 bool webvr_rendering_enabled_ = true; 78 bool webvr_rendering_enabled_ = true;
79 bool gl_initialized_ = false;
77 80
78 DISALLOW_COPY_AND_ASSIGN(UiScene); 81 DISALLOW_COPY_AND_ASSIGN(UiScene);
79 }; 82 };
80 83
81 } // namespace vr_shell 84 } // namespace vr_shell
82 85
83 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ 86 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements/ui_element_unittest.cc ('k') | chrome/browser/android/vr_shell/ui_scene.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698