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

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

Index: chrome/browser/android/vr_shell/textures/url_bar_texture.cc
diff --git a/chrome/browser/android/vr_shell/textures/url_bar_texture.cc b/chrome/browser/android/vr_shell/textures/url_bar_texture.cc
index b47429b79ab32d76b9ebe5b23018fd3a1be5ca9f..df508739105fdbde6b01a75c717e6f1e0bab55f8 100644
--- a/chrome/browser/android/vr_shell/textures/url_bar_texture.cc
+++ b/chrome/browser/android/vr_shell/textures/url_bar_texture.cc
@@ -61,7 +61,7 @@ SkColor getSchemeColor(SecurityLevel level, const ColorScheme& color_scheme) {
     case SecurityLevel::NONE:
     case SecurityLevel::HTTP_SHOW_WARNING:
     case SecurityLevel::SECURITY_WARNING:
-      return color_scheme.deemphasized;
+      return color_scheme.text_deemphasized;
     case SecurityLevel::SECURE:
     case SecurityLevel::EV_SECURE:
       return color_scheme.secure;
@@ -79,7 +79,7 @@ void setEmphasis(vr_shell::RenderTextWrapper* render_text,
                  const gfx::Range& range,
                  const ColorScheme& color_scheme) {
   SkColor color =
-      emphasis ? color_scheme.emphasized : color_scheme.deemphasized;
+      emphasis ? color_scheme.text_emphasized : color_scheme.text_deemphasized;

[cjgrant, 2017/06/05 17:57:08]

Could these be url_emphasized, etc, to call out that they are URL-specific (ie.
security concerns)?

[amp, 2017/06/05 21:40:58]

Done.  sgtm since they aren't used anywhere else.

   if (range.IsValid()) {
     render_text->ApplyColor(color, range);
   } else {
@@ -162,10 +162,6 @@ void UrlBarTexture::OnSetMode() {
   set_dirty();
 }
 
-const ColorScheme& UrlBarTexture::color_scheme() const {
-  return ColorScheme::GetColorScheme(mode());
-}
-
 void UrlBarTexture::Draw(SkCanvas* canvas, const gfx::Size& texture_size) {
   size_.set_height(texture_size.height());
   size_.set_width(texture_size.width());
@@ -182,19 +178,19 @@ void UrlBarTexture::Draw(SkCanvas* canvas, const gfx::Size& texture_size) {
   SkVector rounded_corner = {kHeight / 2, kHeight / 2};
   SkVector left_corners[4] = {rounded_corner, {0, 0}, {0, 0}, rounded_corner};
   round_rect.setRectRadii({0, 0, kHeight, kHeight}, left_corners);
-  SkColor color = color_scheme().background;
+  SkColor color = color_scheme().element_background;
   if (can_go_back_) {
     if (pressed_)
-      color = color_scheme().background_down;
+      color = color_scheme().element_background_down;
     else if (hovered_)
-      color = color_scheme().background_hover;
+      color = color_scheme().element_background_hover;
   }
   SkPaint paint;
   paint.setColor(color);
   canvas->drawRRect(round_rect, paint);
 
   // URL area.
-  paint.setColor(color_scheme().background);
+  paint.setColor(color_scheme().element_background);
   SkVector right_corners[4] = {{0, 0}, rounded_corner, rounded_corner, {0, 0}};
   round_rect.setRectRadii({kHeight, 0, kWidth, kHeight}, right_corners);
   canvas->drawRRect(round_rect, paint);
@@ -211,9 +207,9 @@ void UrlBarTexture::Draw(SkCanvas* canvas, const gfx::Size& texture_size) {
   int icon_default_height = GetDefaultSizeOfVectorIcon(ui::kBackArrowIcon);
   float icon_scale = kBackIconHeight / icon_default_height;
   canvas->scale(icon_scale, icon_scale);
-  PaintVectorIcon(
-      &gfx_canvas, ui::kBackArrowIcon,
-      can_go_back_ ? color_scheme().foreground : color_scheme().disabled);
+  PaintVectorIcon(&gfx_canvas, ui::kBackArrowIcon,
+                  can_go_back_ ? color_scheme().element_foreground
+                               : color_scheme().disabled);
   canvas->restore();
 
   // Site security state icon.