Update content settings to new vector icon format.

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/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "ui/gfx/image/image.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 // This model provides data (icon ids and tooltip) for the content setting icons
 // that are displayed in the location bar.
 class ContentSettingImageModel {
  public:
   virtual ~ContentSettingImageModel() {}
 
   // Generates a vector of all image models to be used within one window.
   static std::vector<std::unique_ptr<ContentSettingImageModel>>
@@ skipping 33 matching lines @@
   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:
   ContentSettingImageModel();
 
-  void set_icon_by_vector_id(gfx::VectorIconId id, gfx::VectorIconId badge_id) {
-    icon_id_ = id;
-    icon_badge_id_ = badge_id;
+  void set_icon(const gfx::VectorIcon& icon, const gfx::VectorIcon& badge) {
+    icon_ = &icon;
+    icon_badge_ = &badge;
   }
 
   void set_visible(bool visible) { is_visible_ = visible; }
   void set_explanatory_string_id(int text_id) {
     explanatory_string_id_ = text_id;
   }
   void set_tooltip(const base::string16& tooltip) { tooltip_ = tooltip; }
 
  private:
   bool is_visible_;
 
-  gfx::VectorIconId icon_id_;
-  gfx::VectorIconId icon_badge_id_;
+  const gfx::VectorIcon* icon_;
+  const gfx::VectorIcon* icon_badge_;
   int explanatory_string_id_;
   base::string16 tooltip_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModel);
 };
 
 // A subclass for an image model tied to a single content type.
 class ContentSettingSimpleImageModel : public ContentSettingImageModel {
  public:
   explicit ContentSettingSimpleImageModel(ContentSettingsType content_type);
@@ skipping 33 matching lines @@
       Profile* profile) override;
 
   bool ShouldRunAnimation(content::WebContents* web_contents) override;
   void SetAnimationHasRun(content::WebContents* web_contents) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentSettingSubresourceFilterImageModel);
 };
 
 #endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_