[vr] Migrate from vr::Colorf to SkColor

chrome/browser/android/vr_shell/ui_elements/ui_element.h

Index: chrome/browser/android/vr_shell/ui_elements/ui_element.h
diff --git a/chrome/browser/android/vr_shell/ui_elements/ui_element.h b/chrome/browser/android/vr_shell/ui_elements/ui_element.h
index a954948a6663dee69ed0e50ed2ed7034564be309..a477d47b1593223bb97aadd8089f488c7ac602cf 100644
--- a/chrome/browser/android/vr_shell/ui_elements/ui_element.h
+++ b/chrome/browser/android/vr_shell/ui_elements/ui_element.h
@@ -12,6 +12,7 @@
 #include "base/macros.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 TimeTicks;
@@ -205,13 +206,11 @@ class UiElement : public WorldRectangle {
   Fill fill() const { return fill_; }
   void set_fill(Fill fill) { fill_ = fill; }
 
-  vr::Colorf edge_color() const { return edge_color_; }
-  void set_edge_color(const vr::Colorf& edge_color) {
-    edge_color_ = edge_color;
-  }
+  SkColor edge_color() const { return edge_color_; }
+  void set_edge_color(const SkColor& edge_color) { edge_color_ = edge_color; }
 
-  vr::Colorf center_color() const { return center_color_; }
-  void set_center_color(const vr::Colorf& center_color) {
+  SkColor center_color() const { return center_color_; }
+  void set_center_color(const SkColor& center_color) {
     center_color_ = center_color;
   }
 
@@ -299,8 +298,8 @@ class UiElement : public WorldRectangle {
 
   Fill fill_ = Fill::NONE;
 
-  vr::Colorf edge_color_ = {1.0f, 1.0f, 1.0f, 1.0f};
-  vr::Colorf center_color_ = {1.0f, 1.0f, 1.0f, 1.0f};
+  SkColor edge_color_ = 0xFFFFFFFF;

[cjgrant, 2017/05/26 13:57:05]

Should we be using SkColor_WHITE here, or do you want the consistent hex format?

[Ian Vollick, 2017/05/26 14:24:46]

SK_ColorWHITE is way better - it just didn't occur to me. Updated.

+  SkColor center_color_ = 0xFFFFFFFF;
 
   int gridline_count_ = 1;