[VrShell] Make close button use defined close button colors.

Specific colors had been implemented for the normal scheme, but the
button itself was still using the default element colors.

Bug: 
Change-Id: I2c0896e5b67bd2e0c387daf60758895c33486b9e
Reviewed-on: https://chromium-review.googlesource.com/527832Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Adam Parker <amp@google.com>
Cr-Commit-Position: refs/heads/master@{#478378}

chrome/browser/android/vr_shell/color_scheme.cc

@@ -74,6 +74,14 @@ void InitializeColorSchemes() {
   fullscreen_scheme.element_background = 0xCC2B3E48;
   fullscreen_scheme.element_background_hover = 0xCC536B77;
   fullscreen_scheme.element_background_down = 0xCC96AFBB;
+  fullscreen_scheme.close_button_foreground =
+      fullscreen_scheme.element_foreground;
+  fullscreen_scheme.close_button_background =
+      fullscreen_scheme.element_background;
+  fullscreen_scheme.close_button_background_hover =
+      fullscreen_scheme.element_background_hover;
+  fullscreen_scheme.close_button_background_down =
+      fullscreen_scheme.element_background_down;
 
   ColorScheme& incognito_scheme = kColorSchemes[ColorScheme::kModeIncognito];
   incognito_scheme.world_background = 0xFF2E2E2E;
@@ -84,6 +92,14 @@ void InitializeColorSchemes() {
   incognito_scheme.element_background = 0xCC454545;
   incognito_scheme.element_background_hover = 0xCC505050;
   incognito_scheme.element_background_down = 0xCC888888;
+  incognito_scheme.close_button_foreground =
+      fullscreen_scheme.element_foreground;
+  incognito_scheme.close_button_background =
+      fullscreen_scheme.element_background;
+  incognito_scheme.close_button_background_hover =
+      fullscreen_scheme.element_background_hover;
+  incognito_scheme.close_button_background_down =
+      fullscreen_scheme.element_background_down;
   incognito_scheme.loading_indicator_foreground = 0xFF8A8A8A;
   incognito_scheme.loading_indicator_background = 0xFF454545;
   incognito_scheme.separator = 0xFF474747;

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

@@ -38,9 +38,9 @@ void CloseButtonTexture::Draw(SkCanvas* sk_canvas,
   size_.set_width(texture_size.width());
 
   cc::PaintFlags flags;
-  SkColor color = hovered() ? color_scheme().element_background_hover
-                            : color_scheme().element_background;
-  color = pressed() ? color_scheme().element_background_down : color;
+  SkColor color = hovered() ? color_scheme().close_button_background_hover
+                            : color_scheme().close_button_background;
+  color = pressed() ? color_scheme().close_button_background_down : color;
   flags.setColor(color);
   canvas->DrawCircle(gfx::PointF(size_.width() / 2, size_.height() / 2),
                      size_.width() / 2, flags);
@@ -49,7 +49,7 @@ void CloseButtonTexture::Draw(SkCanvas* sk_canvas,
   canvas->Translate(gfx::Vector2d(size_.height() * (1 - kIconScaleFactor) / 2,
                                   size_.height() * (1 - kIconScaleFactor) / 2));
   PaintVectorIcon(canvas, ui::kCloseIcon, size_.height() * kIconScaleFactor,
-                  color_scheme().element_foreground);
+                  color_scheme().close_button_foreground);
   canvas->Restore();
 }