Fix content_setting_image_view compile on mac_views_browser

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/basictypes.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
@@ skipping 31 matching lines @@
       Profile* profile) = 0;
 
   // 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)

[Evan Stade, 2015/12/07 20:01:28]

can we leave this one? I don't want people using it by mistake (you can get rid
of the #else)

[tapted, 2015/12/08 01:50:10]

Ah good idea :). Done.

-  const gfx::Image& icon() const { return icon_; }
-  int icon_id() const { return icon_id_; }
-#else
+
+  const gfx::Image& raster_icon() const { return raster_icon_; }
+  int raster_icon_id() const { return raster_icon_id_; }
+
   gfx::Image GetIcon(SkColor nearby_text_color) const;
-#endif
+
   // 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 SetIconByResourceId(int id);
-#if !defined(OS_MACOSX)
+
   void set_icon_by_vector_id(gfx::VectorIconId id, gfx::VectorIconId badge_id) {
     vector_icon_id_ = id;
     vector_icon_badge_id_ = badge_id;
   }
-#endif
+
   void set_visible(bool visible) { is_visible_ = visible; }
-  void set_icon(const gfx::Image& image) { icon_ = image; }
   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_;
-  // |icon_id_| and |icon_| are only used for pre-MD.
-  int icon_id_;
-  gfx::Image icon_;
+
+  // |raster_icon_id_| and |raster_icon_| are only used for pre-MD.
+  int raster_icon_id_;
+  gfx::Image raster_icon_;
+
   // Vector icons are used for MD.
   gfx::VectorIconId vector_icon_id_;
   gfx::VectorIconId vector_icon_badge_id_;
   int explanatory_string_id_;
   base::string16 tooltip_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModel);
 };
 
 // A subclass for an image model tied to a single content type.
@@ skipping 16 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_