[Material Design] Update Website Setting Icons in Omnibox on OSX

chrome/browser/ui/content_settings/content_setting_image_model.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 10 matching lines @@
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 
 using content::WebContents;
 
 namespace {
 
 bool UseVectorGraphics() {
-#if defined(OS_MACOSX)
-  return false;
-#else
   return ui::MaterialDesignController::IsModeMaterial();
-#endif
 }
 
 }  // namespace
 
 // The image models hierarchy:
 //
 // ContentSettingImageModel                  - base class
 //   ContentSettingSimpleImageModel            - single content setting
 //     ContentSettingBlockedImageModel           - generic blocked setting
 //     ContentSettingGeolocationImageModel       - geolocation
@@ skipping 472 matching lines @@
                                   : gfx::VectorIconId::BLOCKED_BADGE);
   }
   set_tooltip(l10n_util::GetStringUTF16(allowed
                                             ? IDS_MIDI_SYSEX_ALLOWED_TOOLTIP
                                             : IDS_MIDI_SYSEX_BLOCKED_TOOLTIP));
 }
 
 // Base class ------------------------------------------------------------------
 
 gfx::Image ContentSettingImageModel::GetIcon(SkColor nearby_text_color) const {
+  SkColor icon_color = nearby_text_color;
+#if !defined(OS_MACOSX)
+  icon_color = color_utils::DeriveDefaultIconColor(nearby_text_color);
+#endif
+
   return UseVectorGraphics()
              ? gfx::Image(gfx::CreateVectorIconWithBadge(
-                   vector_icon_id_, 16,
-                   color_utils::DeriveDefaultIconColor(nearby_text_color),
-                   vector_icon_badge_id_))
+                   vector_icon_id_, 16, icon_color, vector_icon_badge_id_))
              : raster_icon_;
 }
 
 ContentSettingImageModel::ContentSettingImageModel()
     : is_visible_(false),
       raster_icon_id_(0),
       vector_icon_id_(gfx::VectorIconId::VECTOR_ICON_NONE),
       vector_icon_badge_id_(gfx::VectorIconId::VECTOR_ICON_NONE),
       explanatory_string_id_(0) {}
 
@@ skipping 27 matching lines @@
   result.push_back(new ContentSettingMIDISysExImageModel());
 
   return result;
 }
 
 void ContentSettingImageModel::SetIconByResourceId(int id) {
   raster_icon_id_ = id;
   raster_icon_ =
       ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
 }
+
+#if defined(OS_MACOSX)
+bool ContentSettingImageModel::UpdateFromWebContentsAndCheckIfIconChanged(
+    content::WebContents* web_contents) {
+  if (UseVectorGraphics()) {
+    gfx::VectorIconId old_vector_icon = vector_icon_id_;
+    gfx::VectorIconId old_badge_icon = vector_icon_badge_id_;
+    UpdateFromWebContents(web_contents);
+    return old_vector_icon != vector_icon_id_ &&
+           old_badge_icon != vector_icon_badge_id_;
+  } else {
+    int old_icon = raster_icon_id_;
+    UpdateFromWebContents(web_contents);
+    return old_icon != raster_icon_id_;
+  }
+}
+#endif