Use desktop toolbar icons in VR.

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"
+#include "components/toolbar/vector_icons.h"
 #include "components/url_formatter/url_formatter.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.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 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.0375;
 static constexpr float kBackIconOffset = 0.005;
 static constexpr float kSecurityFieldWidth = 0.06;
 static constexpr float kSecurityIconHeight = 0.03;
 static constexpr float kUrlRightMargin = 0.02;
 static constexpr float kSeparatorWidth = 0.002;
 
 using security_state::SecurityLevel;
 
+// See ToolbarModelImpl::GetVectorIcon().
 const struct gfx::VectorIcon& getSecurityIcon(SecurityLevel level) {
   switch (level) {
-    case SecurityLevel::NONE:
-    case SecurityLevel::HTTP_SHOW_WARNING:
-    case SecurityLevel::SECURITY_WARNING:
-      return ui::kInfoOutlineIcon;
-    case SecurityLevel::SECURE:
-    case SecurityLevel::EV_SECURE:
-      return ui::kLockIcon;
-    case SecurityLevel::DANGEROUS:
-      return ui::kWarningIcon;
-    case SecurityLevel::SECURE_WITH_POLICY_INSTALLED_CERT:  // ChromeOS only.
+    case security_state::NONE:
+    case security_state::HTTP_SHOW_WARNING:
+      return toolbar::kHttpIcon;
+    case security_state::EV_SECURE:
+    case security_state::SECURE:
+      return toolbar::kHttpsValidIcon;
+    case security_state::SECURITY_WARNING:
+      // Surface Dubious as Neutral.
+      return toolbar::kHttpIcon;
+    case security_state::SECURE_WITH_POLICY_INSTALLED_CERT:  // ChromeOS only.
+      return ui::kBusinessIcon;
+    case security_state::DANGEROUS:
+      return toolbar::kHttpsInvalidIcon;
     default:
       NOTREACHED();
-      return ui::kWarningIcon;
+      return toolbar::kHttpsInvalidIcon;
   }
 }
 
 // See LocationBarView::GetSecureTextColor().
 SkColor getSchemeColor(SecurityLevel level, const ColorScheme& color_scheme) {
   switch (level) {
     case SecurityLevel::NONE:
     case SecurityLevel::HTTP_SHOW_WARNING:
+      return color_scheme.deemphasized;
+    case SecurityLevel::EV_SECURE:
+    case SecurityLevel::SECURE:
+      return color_scheme.secure;
     case SecurityLevel::SECURITY_WARNING:
       return color_scheme.deemphasized;
-    case SecurityLevel::SECURE:
-    case SecurityLevel::EV_SECURE:
-      return color_scheme.secure;
+    case SecurityLevel::SECURE_WITH_POLICY_INSTALLED_CERT:  // ChromeOS only.
+      return color_scheme.insecure;
     case SecurityLevel::DANGEROUS:
       return color_scheme.insecure;
-    case SecurityLevel::SECURE_WITH_POLICY_INSTALLED_CERT:  // ChromeOS only.
     default:
       NOTREACHED();
-      return color_scheme.warning;
+      return color_scheme.insecure;
   }
 }
 
 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;
   if (range.IsValid()) {
@@ skipping 276 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