Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

chrome/browser/ui/views/location_bar/content_setting_image_view.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/views/location_bar/content_setting_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 55 matching lines @@
     bubble_widget_ = NULL;
   }
 }
 
 void ContentSettingImageView::UpdateFromWebContents(WebContents* web_contents) {
   content_setting_image_model_->UpdateFromWebContents(web_contents);
   if (!content_setting_image_model_->is_visible()) {
     SetVisible(false);
     return;
   }
-  SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       content_setting_image_model_->get_icon()));
   SetTooltipText(UTF8ToUTF16(content_setting_image_model_->get_tooltip()));
   SetVisible(true);
 
   TabSpecificContentSettings* content_settings = NULL;
   if (web_contents) {
     content_settings = TabContentsWrapper::GetCurrentWrapperForContents(
         web_contents)->content_settings();
   }
   if (!content_settings || content_settings->IsBlockageIndicated(
@@ skipping 169 matching lines @@
     bubble_widget_->RemoveObserver(this);
     bubble_widget_ = NULL;
   }
   if (pause_animation_) {
     slide_animator_->Reset(
         1.0 - (visible_text_size_ * kAnimatingFraction) / text_size_);
     pause_animation_ = false;
     slide_animator_->Show();
   }
 }