Fix content_setting_image_view compile on mac_views_browser

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 "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/vector_icons_public.h"
-
-#if !defined(OS_MACOSX)
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
-#endif
+#include "ui/gfx/vector_icons_public.h"
 
 using content::WebContents;
 
 namespace {
 
 bool UseVectorGraphics() {
 #if defined(OS_MACOSX)
   return false;
 #else
   return ui::MaterialDesignController::IsModeMaterial();
@@ skipping 269 matching lines @@
       return;
 
     icon_id = image_details->accessed_icon_id;
     tooltip_id = image_details->accessed_tooltip_id;
     explanation_id = 0;
   }
   set_visible(true);
   if (!UseVectorGraphics()) {
     DCHECK(icon_id);
     SetIconByResourceId(icon_id);
-#if !defined(OS_MACOSX)
   } else {
     gfx::VectorIconId badge_id = gfx::VectorIconId::VECTOR_ICON_NONE;
     if (type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER)
       badge_id = gfx::VectorIconId::WARNING_BADGE;
     else if (content_settings->IsContentBlocked(type))
       badge_id = gfx::VectorIconId::BLOCKED_BADGE;
 
     set_icon_by_vector_id(image_details->vector_icon_id, badge_id);
-#endif
   }
   set_explanatory_string_id(explanation_id);
   DCHECK(tooltip_id);
   set_tooltip(l10n_util::GetStringUTF16(tooltip_id));
 }
 
 // Geolocation -----------------------------------------------------------------
 
 ContentSettingGeolocationImageModel::ContentSettingGeolocationImageModel()
     : ContentSettingSimpleImageModel(CONTENT_SETTINGS_TYPE_GEOLOCATION) {
@@ skipping 15 matching lines @@
   set_visible(true);
 
   // If any embedded site has access the allowed icon takes priority over the
   // blocked icon.
   unsigned int state_flags = 0;
   usages_state.GetDetailedInfo(NULL, &state_flags);
   bool allowed =
       !!(state_flags & ContentSettingsUsagesState::TABSTATE_HAS_ANY_ALLOWED);
   if (!UseVectorGraphics()) {
     SetIconByResourceId(allowed ? IDR_ALLOWED_LOCATION : IDR_BLOCKED_LOCATION);
-#if !defined(OS_MACOSX)
   } else {
     set_icon_by_vector_id(gfx::VectorIconId::MY_LOCATION,
                           allowed ? gfx::VectorIconId::VECTOR_ICON_NONE
                                   : gfx::VectorIconId::BLOCKED_BADGE);
-#endif
   }
   set_tooltip(l10n_util::GetStringUTF16(allowed
                                             ? IDS_GEOLOCATION_ALLOWED_TOOLTIP
                                             : IDS_GEOLOCATION_BLOCKED_TOOLTIP));
 }
 
 // Media -----------------------------------------------------------------------
 
 ContentSettingMediaImageModel::ContentSettingMediaImageModel()
     : ContentSettingImageModel() {
@@ skipping 20 matching lines @@
 
   bool is_mic = (state & TabSpecificContentSettings::MICROPHONE_ACCESSED) != 0;
   bool is_cam = (state & TabSpecificContentSettings::CAMERA_ACCESSED) != 0;
   DCHECK(is_mic || is_cam);
 
   int id = IDS_CAMERA_BLOCKED;
   if (state & (TabSpecificContentSettings::MICROPHONE_BLOCKED |
                TabSpecificContentSettings::CAMERA_BLOCKED)) {
     if (!UseVectorGraphics()) {
       SetIconByResourceId(IDR_BLOCKED_CAMERA);
-#if !defined(OS_MACOSX)
     } else {
       set_icon_by_vector_id(gfx::VectorIconId::VIDEOCAM,
                             gfx::VectorIconId::BLOCKED_BADGE);
-#endif
     }
     if (is_mic)
       id = is_cam ? IDS_MICROPHONE_CAMERA_BLOCKED : IDS_MICROPHONE_BLOCKED;
   } else {
     if (!UseVectorGraphics()) {
       SetIconByResourceId(IDR_ALLOWED_CAMERA);
-#if !defined(OS_MACOSX)
     } else {
       set_icon_by_vector_id(gfx::VectorIconId::VIDEOCAM,
                             gfx::VectorIconId::VECTOR_ICON_NONE);
-#endif
     }
     id = IDS_CAMERA_ACCESSED;
     if (is_mic)
       id = is_cam ? IDS_MICROPHONE_CAMERA_ALLOWED : IDS_MICROPHONE_ACCESSED;
   }
   set_tooltip(l10n_util::GetStringUTF16(id));
   set_visible(true);
 }
 
 ContentSettingBubbleModel* ContentSettingMediaImageModel::CreateBubbleModel(
@@ skipping 36 matching lines @@
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   }
 }
 
 // Protocol handlers -----------------------------------------------------------
 
 ContentSettingRPHImageModel::ContentSettingRPHImageModel()
     : ContentSettingSimpleImageModel(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
   if (!UseVectorGraphics()) {
     SetIconByResourceId(IDR_REGISTER_PROTOCOL_HANDLER);
-#if !defined(OS_MACOSX)
   } else {
     set_icon_by_vector_id(gfx::VectorIconId::PROTOCOL_HANDLER,
                           gfx::VectorIconId::VECTOR_ICON_NONE);
-#endif
   }
   set_tooltip(l10n_util::GetStringUTF16(IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP));
 }
 
 void ContentSettingRPHImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
   if (!web_contents)
     return;
 
@@ skipping 30 matching lines @@
 
   // If any embedded site has access the allowed icon takes priority over the
   // blocked icon.
   unsigned int state_flags = 0;
   usages_state.GetDetailedInfo(NULL, &state_flags);
   bool allowed =
       !!(state_flags & ContentSettingsUsagesState::TABSTATE_HAS_ANY_ALLOWED);
   if (!UseVectorGraphics()) {
     SetIconByResourceId(allowed ? IDR_ALLOWED_MIDI_SYSEX
                                 : IDR_BLOCKED_MIDI_SYSEX);
-#if !defined(OS_MACOSX)
   } else {
     set_icon_by_vector_id(gfx::VectorIconId::MIDI,
                           allowed ? gfx::VectorIconId::VECTOR_ICON_NONE
                                   : gfx::VectorIconId::BLOCKED_BADGE);
-#endif
   }
   set_tooltip(l10n_util::GetStringUTF16(allowed
                                             ? IDS_MIDI_SYSEX_ALLOWED_TOOLTIP
                                             : IDS_MIDI_SYSEX_BLOCKED_TOOLTIP));
 }
 
 // Base class ------------------------------------------------------------------
 
-#if !defined(OS_MACOSX)
 gfx::Image ContentSettingImageModel::GetIcon(SkColor nearby_text_color) const {
   return UseVectorGraphics()
              ? gfx::Image(gfx::CreateVectorIconWithBadge(
                    vector_icon_id_, 16,
                    color_utils::DeriveDefaultIconColor(nearby_text_color),
                    vector_icon_badge_id_))
-             : icon_;
+             : raster_icon_;
 }
-#endif
 
 ContentSettingImageModel::ContentSettingImageModel()
     : is_visible_(false),
-      icon_id_(0),
+      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) {}
 
 // static
 ScopedVector<ContentSettingImageModel>
     ContentSettingImageModel::GenerateContentSettingImageModels() {
   ScopedVector<ContentSettingImageModel> result;
 
   // The ordering of the models here influences the order in which icons are
@@ skipping 17 matching lines @@
   result.push_back(new ContentSettingMediaImageModel());
   result.push_back(
       new ContentSettingBlockedImageModel(
           CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS));
   result.push_back(new ContentSettingMIDISysExImageModel());
 
   return result.Pass();
 }
 
 void ContentSettingImageModel::SetIconByResourceId(int id) {
-  icon_id_ = id;
-  icon_ = ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
+  raster_icon_id_ = id;
+  raster_icon_ =
+      ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
 }