[Material][Mac] Update Security Icon Colors in Omnibox

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 2012 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 161 matching lines @@
       // Make it obvious that there's a problem.
       [[NSColor redColor] set];
       NSRectFill(NSMakeRect(0, 0, kDefaultIconSize, kDefaultIconSize));
       break;
   }
 }
 
 + (void)drawLocationBarIconHTTPForScale:(int)scaleFactor {
   if (scaleFactor > 1) {
     NSRect ovalRect = NSMakeRect(2.25, 1.75, 12, 12);
-    NSBezierPath* circlePath =
-        [NSBezierPath bezierPathWithOvalInRect:ovalRect];
+    NSBezierPath* circlePath = [NSBezierPath bezierPathWithOvalInRect:ovalRect];
     [circlePath setLineWidth:1.5];
     [circlePath stroke];
 
     NSRectFill(NSMakeRect(7.5, 4.5, 1.5, 4));
     NSRectFill(NSMakeRect(7.5, 9.5, 1.5, 1.5));
   } else {
     NSRect ovalRect = NSMakeRect(2, 2, 12, 12);
-    NSBezierPath* circlePath =
-        [NSBezierPath bezierPathWithOvalInRect:ovalRect];
+    NSBezierPath* circlePath = [NSBezierPath bezierPathWithOvalInRect:ovalRect];
     [circlePath setLineWidth:1.5];
     [circlePath stroke];
 
     NSRectFill(NSMakeRect(7, 4, 2, 5));
     NSRectFill(NSMakeRect(7, 10, 2, 2));
   }
 }
 
 + (void)drawLocationBarIconHTTPSInvalidForScale:(int)scaleFactor {
   // The vector icon is upside down relative to the default OS X coordinate
@@ skipping 535 matching lines @@
   Update(nullptr);
 }
 
 void LocationBarViewMac::UpdateLocationIcon() {
   bool in_dark_mode = IsLocationBarDark();
 
   SkColor vector_icon_color = gfx::kPlaceholderColor;
   gfx::VectorIconId vector_icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
   if (ShouldShowEVBubble()) {
     vector_icon_id = gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID;
-    vector_icon_color = in_dark_mode
-                            ? kMaterialDarkVectorIconColor
-                            : gfx::kGoogleGreen700;
+    vector_icon_color =
+        in_dark_mode ? kMaterialDarkVectorIconColor : gfx::kGoogleGreen700;
   } else {
     vector_icon_id = omnibox_view_->GetVectorIcon(in_dark_mode);
     if (in_dark_mode) {
       vector_icon_color = SK_ColorWHITE;
+    } else if (vector_icon_id != gfx::VectorIconId::OMNIBOX_SEARCH) {
+      security_state::SecurityStateModel::SecurityLevel security_level =
+          GetToolbarModel()->GetSecurityLevel(false);
+      if (security_level == security_state::SecurityStateModel::NONE) {
+        vector_icon_color = gfx::kChromeIconGrey;
+      } else if (vector_icon_id != gfx::VectorIconId::OMNIBOX_SEARCH &&
+            (security_level == security_state::SecurityStateModel::EV_SECURE ||
+             security_level == security_state::SecurityStateModel::SECURE)) {
+        vector_icon_color = gfx::kGoogleGreen700;
+      } else if (security_level ==
+                 security_state::SecurityStateModel::SECURITY_ERROR) {
+        vector_icon_color = gfx::kGoogleRed700;
+      } else if (security_level ==
+                 security_state::SecurityStateModel::SECURITY_WARNING){
+        vector_icon_color = gfx::kGoogleYellow700;
+      }
     } else {
       vector_icon_color = OmniboxViewMac::BaseTextColorSkia(in_dark_mode);
     }
   }
 
-  // If the theme is dark, then the color should always be
-  // kMaterialDarkVectorIconColor.
-  if (in_dark_mode)
-    vector_icon_color = kMaterialDarkVectorIconColor;
-
   DCHECK(vector_icon_id != gfx::VectorIconId::VECTOR_ICON_NONE);
   NSImage* image =
       [LocationBarImageRep imageForId:vector_icon_id color:vector_icon_color];
 
   location_icon_decoration_->SetImage(image);
   ev_bubble_decoration_->SetImage(image);
   Layout();
 }
 
 void LocationBarViewMac::UpdateColorsToMatchTheme() {
@@ skipping 217 matching lines @@
 
   return zoom_decoration_->UpdateIfNecessary(
       ui_zoom::ZoomController::FromWebContents(web_contents),
       default_zoom_changed, IsLocationBarDark());
 }
 
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }