[VrShell] Centralize color handling and enable close button on fullscreen

chrome/browser/android/vr_shell/textures/close_button_texture.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
 
 #include "cc/paint/skia_paint_canvas.h"
+#include "chrome/browser/android/vr_shell/color_scheme.h"
 #include "chrome/browser/android/vr_shell/ui_elements/button.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icon_types.h"
 #include "ui/vector_icons/vector_icons.h"
 
 namespace vr_shell {
 
 namespace {
 
-const SkColor kBackgroundColor = SK_ColorWHITE;
-const SkColor kBackgroundColorHover = 0xFFE5E5E5;
-const SkColor kBackgroundColorDown = 0xFFD5D5D5;
-const SkColor kForegroundColor = 0xFF444444;
 constexpr float kIconScaleFactor = 0.75;
 
 }  // namespace
 
 CloseButtonTexture::CloseButtonTexture() = default;
 
 CloseButtonTexture::~CloseButtonTexture() = default;
 
+const ColorScheme& CloseButtonTexture::color_scheme() const {
+  return ColorScheme::GetColorScheme(mode());
+}
+
 void CloseButtonTexture::Draw(SkCanvas* sk_canvas,
                               const gfx::Size& texture_size) {
   DCHECK_EQ(texture_size.height(), texture_size.width());
   cc::SkiaPaintCanvas paint_canvas(sk_canvas);
   gfx::Canvas gfx_canvas(&paint_canvas, 1.0f);
   gfx::Canvas* canvas = &gfx_canvas;
 
   size_.set_height(texture_size.height());
   size_.set_width(texture_size.width());
 
   cc::PaintFlags flags;
-  SkColor color = hovered() ? kBackgroundColorHover : kBackgroundColor;
-  color = pressed() ? kBackgroundColorDown : color;
+  SkColor color = hovered() ? color_scheme().element_background_hover

[cjgrant, 2017/05/31 15:39:28]

In a ymalik@ CL, another element changed this ternary use to if/else if/else for
readability.  Feel free to do that here as well unless you prefer this.

[amp, 2017/06/02 01:08:35]

I think I saw that but it felt like slightly different scenario's so I left this
as is (if I'm thinking of a different one it might still be applicable, but I
think the ternary is fine).

+                            : color_scheme().element_background;
+  color = pressed() ? color_scheme().element_background_down : color;
   flags.setColor(color);
   canvas->DrawCircle(gfx::PointF(size_.width() / 2, size_.height() / 2),
                      size_.width() / 2, flags);
 
   canvas->Save();
   canvas->Translate(gfx::Vector2d(size_.height() * (1 - kIconScaleFactor) / 2,
                                   size_.height() * (1 - kIconScaleFactor) / 2));
   PaintVectorIcon(canvas, ui::kCloseIcon, size_.height() * kIconScaleFactor,
-                  kForegroundColor);
+                  color_scheme().element_foreground);
   canvas->Restore();
 }
 
 gfx::Size CloseButtonTexture::GetPreferredTextureSize(int maximum_width) const {
   return gfx::Size(maximum_width, maximum_width);
 }
 
 gfx::SizeF CloseButtonTexture::GetDrawnSize() const {
   return size_;
 }
 
 bool CloseButtonTexture::HitTest(const gfx::PointF& point) const {
   return (point - gfx::PointF(0.5, 0.5)).LengthSquared() < 0.25;
 }
 
 }  // namespace vr_shell