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

Unified Diff: chrome/browser/android/vr_shell/ui_scene.h

Issue 2814443004: Refactor VR math off of GVR types, onto gfx types where possible. (Closed)
Patch Set: Fix tests 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/ui_scene.h
diff --git a/chrome/browser/android/vr_shell/ui_scene.h b/chrome/browser/android/vr_shell/ui_scene.h
index 9d3348049c8ec4fbc2cde26ca13e0b72e5ae637e..91b0c3ba20a61b8707e937d0e7fddd7adb71c714 100644
--- a/chrome/browser/android/vr_shell/ui_scene.h
+++ b/chrome/browser/android/vr_shell/ui_scene.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/macros.h"
-#include "chrome/browser/android/vr_shell/vr_math.h"
+#include "device/vr/vr_types.h"
namespace base {
class DictionaryValue;
@@ -73,7 +73,7 @@ class UiScene {
std::vector<const ContentRectangle*> GetHeadLockedElements() const;
bool HasVisibleHeadLockedElements() const;
- const Colorf& GetBackgroundColor() const;
+ const vr::Colorf& GetBackgroundColor() const;
float GetBackgroundDistance() const;
bool GetWebVrRenderingEnabled() const;
@@ -84,7 +84,7 @@ class UiScene {
std::vector<std::unique_ptr<ContentRectangle>> ui_elements_;
ContentRectangle* content_element_ = nullptr;
- Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
+ vr::Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
float background_distance_ = 10.0f;
bool webvr_rendering_enabled_ = true;
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements_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