VR: Apply color to URL bar security icons.

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 "components/security_state/core/security_state.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/vector_icon_types.h"
 #include "ui/vector_icons/vector_icons.h"
 
 namespace vr_shell {
 
 namespace {
 
 static constexpr SkColor kBackground = 0xCCAAAAAA;
 static constexpr SkColor kBackgroundHover = 0xCCDDDDDD;
 static constexpr SkColor kForeground = 0xCC444444;
-static constexpr SkColor kSeparatorColor =
-    SkColorSetARGBMacro(256 * 0.2, 0, 0, 0);
+static constexpr SkColor kSeparatorColor = 0x51000000;
+
+static constexpr SkColor kInfoOutlineIconColor = 0xFF5A5A5A;
+static constexpr SkColor kLockIconColor = 0xFF0B8043;
+static constexpr SkColor kWarningIconColor = 0xFFC73821;
 
 static constexpr float kWidth = 0.672;
 static constexpr float kHeight = 0.088;
 static constexpr float kFontHeight = 0.027;
 static constexpr float kBackButtonWidth = kHeight;
 static constexpr float kBackIconHeight = 0.05;
 static constexpr float kBackIconOffset = 0.005;
 static constexpr float kSecurityFieldWidth = 0.06;
 static constexpr float kSecurityIconHeight = 0.03;
 static constexpr float kUrlRightMargin = 0.02;
@@ skipping 10 matching lines @@
     case SecurityLevel::SECURE:
     case SecurityLevel::EV_SECURE:
       return ui::kLockIcon;
     case SecurityLevel::SECURE_WITH_POLICY_INSTALLED_CERT:
     case SecurityLevel::DANGEROUS:
     default:
       return ui::kWarningIcon;
   }
 }
 
+SkColor getSecurityIconColor(int level) {

[cjgrant, 2017/05/15 21:53:17]

This seems cleaner than the above function return a tuple, or populating
pointers to return values...

+  switch (level) {
+    case SecurityLevel::NONE:
+    case SecurityLevel::HTTP_SHOW_WARNING:
+    case SecurityLevel::SECURITY_WARNING:
+      return kInfoOutlineIconColor;
+    case SecurityLevel::SECURE:
+    case SecurityLevel::EV_SECURE:
+      return kLockIconColor;
+    case SecurityLevel::SECURE_WITH_POLICY_INSTALLED_CERT:
+    case SecurityLevel::DANGEROUS:
+    default:
+      return kWarningIconColor;
+  }
+}
+
 }  // namespace
 
 UrlBarTexture::UrlBarTexture() : security_level_(SecurityLevel::DANGEROUS) {}
 
 UrlBarTexture::~UrlBarTexture() = default;
 
 void UrlBarTexture::SetURL(const GURL& gurl) {
   if (gurl_ != gurl)
     set_dirty();
   gurl_ = gurl;
@@ skipping 51 matching lines @@
   PaintVectorIcon(&gfx_canvas, ui::kBackArrowIcon, kForeground);
   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& security_icon = getSecurityIcon(security_level_);
-    icon_default_height = GetDefaultSizeOfVectorIcon(security_icon);
+    const gfx::VectorIcon& icon = getSecurityIcon(security_level_);
+    icon_default_height = GetDefaultSizeOfVectorIcon(icon);
     icon_scale = kSecurityIconHeight / icon_default_height;
+    SkColor icon_color = getSecurityIconColor(security_level_);
     canvas->scale(icon_scale, icon_scale);
-    PaintVectorIcon(&gfx_canvas, security_icon, kForeground);
+    PaintVectorIcon(&gfx_canvas, icon, icon_color);
     canvas->restore();
   }
 
   canvas->restore();
 
   if (!gurl_.is_empty()) {
     if (last_drawn_gurl_ != gurl_) {
       // Draw text based on pixel sizes rather than meters, for correct font
       // sizing.
       int pixel_font_height = texture_size.height() * kFontHeight / kHeight;
@@ skipping 20 matching lines @@
   return size_;
 }
 
 bool UrlBarTexture::SetDrawFlags(int draw_flags) {
   if (draw_flags != GetDrawFlags())
     set_dirty();
   return UiTexture::SetDrawFlags(draw_flags);
 }
 
 }  // namespace vr_shell