[Material][Mac] Update Omnibox bubble decorations

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 67 matching lines @@
 
 using content::WebContents;
 
 namespace {
 
 // Vertical space between the bottom edge of the location_bar and the first run
 // bubble arrow point.
 const static int kFirstRunBubbleYOffset = 1;
 
 const int kDefaultIconSize = 16;
-const int kMaterialSmallIconSize = 12;
+
+// Color of the vector graphic icons when the location bar is dark.
+// SkColorSetARGB(0xCC, 0xFF, 0xFF 0xFF);
+const SkColor kMaterialDarkVectorIconColor = 0xCCFFFFFF;
 
 }  // namespace
 
 // TODO(shess): This code is mostly copied from the gtk
 // implementation.  Make sure it's all appropriate and flesh it out.
 
 LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
                                        CommandUpdater* command_updater,
                                        Profile* profile,
                                        Browser* browser)
@@ skipping 461 matching lines @@
 }
 
 void LocationBarViewMac::UpdateLocationIcon() {
   bool in_dark_mode = IsLocationBarDark();
 
   SkColor vector_icon_color = gfx::kPlaceholderColor;
   gfx::VectorIconId vector_icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
   int icon_size = kDefaultIconSize;
   if (ShouldShowEVBubble()) {
     vector_icon_id = gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_IN_CHIP;
-    vector_icon_color = gfx::kGoogleGreen700;
-    icon_size = kMaterialSmallIconSize;
+    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 {
       vector_icon_color = OmniboxViewMac::BaseTextColorSkia(in_dark_mode);
     }
   }
 
   DCHECK(vector_icon_id != gfx::VectorIconId::VECTOR_ICON_NONE);
@@ skipping 77 matching lines @@
 
 NSImage* LocationBarViewMac::GetKeywordImage(const base::string16& keyword) {
   const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(
       profile())->GetTemplateURLForKeyword(keyword);
   if (template_url &&
       (template_url->GetType() == TemplateURL::OMNIBOX_API_EXTENSION)) {
     return extensions::OmniboxAPI::Get(profile())->
         GetOmniboxIcon(template_url->GetExtensionId()).AsNSImage();
   }
 
-  return ui::MaterialDesignController::IsModeMaterial()
-      ? NSImageFromImageSkiaWithColorSpace(
-            gfx::CreateVectorIcon(
-                gfx::VectorIconId::OMNIBOX_SEARCH,
-                kDefaultIconSize,
-                gfx::kGoogleBlue700),
-            base::mac::GetSRGBColorSpace())
-      : OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    SkColor icon_color = IsLocationBarDark() ? kMaterialDarkVectorIconColor
+                                             : gfx::kGoogleBlue700;
+    return NSImageFromImageSkiaWithColorSpace(
+        gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH,
+                              kDefaultIconSize, icon_color),
+        base::mac::GetSRGBColorSpace());
+  }
+
+  return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
 }
 
 void LocationBarViewMac::PostNotification(NSString* notification) {
   [[NSNotificationCenter defaultCenter] postNotificationName:notification
                                         object:[NSValue valueWithPointer:this]];
 }
 
 PageActionDecoration* LocationBarViewMac::GetPageActionDecoration(
     ExtensionAction* page_action) {
   DCHECK(page_action);
@@ skipping 120 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();
 }