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

chrome/browser/ui/content_settings/content_setting_image_model.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
@@ skipping 35 matching lines @@
   // Whether the animation should be run for the given |web_contents|.
   virtual bool ShouldRunAnimation(content::WebContents* web_contents) = 0;
 
   // Remembers that the animation has already run for the given |web_contents|,
   // so that we do not restart it when the parent view is updated.
   virtual void SetAnimationHasRun(content::WebContents* web_contents) = 0;
 
   bool is_visible() const { return is_visible_; }
 
 #if defined(OS_MACOSX)
-  const gfx::Image& raster_icon() const { return raster_icon_; }
-  int raster_icon_id() const { return raster_icon_id_; }
+  // Calls UpdateFromWebContents() and returns true if the icon has changed.
+  bool UpdateFromWebContentsAndCheckIfIconChanged(
+      content::WebContents* web_contents);
 #endif
 
   gfx::Image GetIcon(SkColor nearby_text_color) const;
 
   // Returns the resource ID of a string to show when the icon appears, or 0 if
   // we don't wish to show anything.
   int explanatory_string_id() const { return explanatory_string_id_; }
   const base::string16& get_tooltip() const { return tooltip_; }
 
  protected:
@@ skipping 47 matching lines @@
  protected:
   ContentSettingsType content_type() { return content_type_; }
 
  private:
   ContentSettingsType content_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingSimpleImageModel);
 };
 
 #endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_