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

chrome/browser/android/vr_shell/textures/url_bar_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/url_bar_texture.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "cc/paint/skia_paint_canvas.h"
 #include "chrome/browser/android/vr_shell/color_scheme.h"
 #include "chrome/browser/android/vr_shell/textures/render_text_wrapper.h"
@@ skipping 43 matching lines @@
       return ui::kWarningIcon;
   }
 }
 
 // See LocationBarView::GetSecureTextColor().
 SkColor getSchemeColor(SecurityLevel level, const ColorScheme& color_scheme) {
   switch (level) {
     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;
     case SecurityLevel::DANGEROUS:
       return color_scheme.insecure;
     case SecurityLevel::SECURE_WITH_POLICY_INSTALLED_CERT:  // ChromeOS only.
     default:
       NOTREACHED();
       return color_scheme.warning;
   }
 }
 
 void setEmphasis(vr_shell::RenderTextWrapper* render_text,
                  bool emphasis,
                  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 {
     render_text->SetColor(color);
   }
 }
 
 gfx::PointF percentToMeters(const gfx::PointF& percent) {
   return gfx::PointF(percent.x() * kWidth, percent.y() * kHeight);
 }
@@ skipping 62 matching lines @@
 void UrlBarTexture::SetPressed(bool pressed) {
   if (pressed_ != pressed)
     set_dirty();
   pressed_ = pressed;
 }
 
 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());
 
   canvas->save();
   canvas->scale(size_.width() / kWidth, size_.width() / kWidth);
 
   // Make a gfx canvas to support utility drawing methods.
   cc::SkiaPaintCanvas paint_canvas(canvas);
   gfx::Canvas gfx_canvas(&paint_canvas, 1.0f);
 
   // Back button area.
   SkRRect round_rect;
   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);
 
   // Back button / URL separator vertical line.
   paint.setColor(color_scheme().separator);
   canvas->drawRect(SkRect::MakeXYWH(kHeight, 0, kSeparatorWidth, kHeight),
                    paint);
 
   // Back button icon.
   canvas->save();
   canvas->translate(kHeight / 2 + kBackIconOffset, kHeight / 2);
   canvas->translate(-kBackIconHeight / 2, -kBackIconHeight / 2);
   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.
   if (!gurl_.is_empty()) {
     canvas->save();
     canvas->translate(
         kBackButtonWidth + kSeparatorWidth + kSecurityFieldWidth / 2,
         kHeight / 2);
     canvas->translate(-kSecurityIconHeight / 2, -kSecurityIconHeight / 2);
     const gfx::VectorIcon& icon = getSecurityIcon(security_level_);
@@ skipping 133 matching lines @@
 
 gfx::Size UrlBarTexture::GetPreferredTextureSize(int maximum_width) const {
   return gfx::Size(maximum_width, maximum_width * kHeight / kWidth);
 }
 
 gfx::SizeF UrlBarTexture::GetDrawnSize() const {
   return size_;
 }
 
 }  // namespace vr_shell