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

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

Issue 2906423002: [vr] Migrate from vr::Colorf to SkColor (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 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 5a313fd1f0d933326c3e13b283a7deec4087fbe1..119fec7041dcf33c9df0bf69e05f7bc5ad355d49 100644
--- a/chrome/browser/android/vr_shell/ui_scene.h
+++ b/chrome/browser/android/vr_shell/ui_scene.h
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/android/vr_shell/ui_elements/ui_element_debug_id.h"
-#include "device/vr/vr_types.h"
+#include "third_party/skia/include/core/SkColor.h"
namespace base {
class ListValue;
@@ -66,8 +66,8 @@ class UiScene {
std::vector<const UiElement*> GetHeadLockedElements() const;
bool HasVisibleHeadLockedElements() const;
- void SetBackgroundColor(const vr::Colorf& color);
- const vr::Colorf& GetBackgroundColor() const;
+ void SetBackgroundColor(const SkColor& color);
+ const SkColor& GetBackgroundColor() const;
void SetBackgroundDistance(float distance);
float GetBackgroundDistance() const;
@@ -85,7 +85,7 @@ class UiScene {
std::vector<std::unique_ptr<UiElement>> ui_elements_;
UiElement* content_element_ = nullptr;
- vr::Colorf background_color_ = {0.1f, 0.1f, 0.1f, 1.0f};
+ SkColor background_color_ = 0xFF1A1A1A;
float background_distance_ = 10.0f;
bool webvr_rendering_enabled_ = true;
bool gl_initialized_ = false;
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements/ui_element.h ('k') | chrome/browser/android/vr_shell/ui_scene.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698