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

chrome/browser/ui/views/download/download_shelf_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/download/download_shelf_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 290 matching lines @@
                                              View* parent,
                                              View* child) {
   View::ViewHierarchyChanged(is_add, parent, child);
 
   if (is_add && (child == this)) {
     set_background(views::Background::CreateSolidBackground(
         GetThemeProvider()->GetColor(ThemeService::COLOR_TOOLBAR)));
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     arrow_image_ = new views::ImageView();
-    arrow_image_->SetImage(rb.GetBitmapNamed(IDR_DOWNLOADS_FAVICON));
+    arrow_image_->SetImage(rb.GetImageSkiaNamed(IDR_DOWNLOADS_FAVICON));
     AddChildView(arrow_image_);
 
     show_all_view_ = new views::Link(
         l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS));
     show_all_view_->set_listener(this);
     show_all_view_->SetBackgroundColor(background()->get_color());
     show_all_view_->SetEnabledColor(
         GetThemeProvider()->GetColor(ThemeService::COLOR_BOOKMARK_TEXT));
     AddChildView(show_all_view_);
 
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::BS_NORMAL,
-                            rb.GetBitmapNamed(IDR_CLOSE_BAR));
+                            rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
     close_button_->SetImage(views::CustomButton::BS_HOT,
-                            rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
+                            rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
     close_button_->SetImage(views::CustomButton::BS_PUSHED,
-                            rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
+                            rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     UpdateButtonColors();
     AddChildView(close_button_);
 
     new_item_animation_.reset(new ui::SlideAnimation(this));
     new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
 
     shelf_animation_.reset(new ui::SlideAnimation(this));
     shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs);
@@ skipping 19 matching lines @@
 
   gfx::Size item_size = (*download_views_.rbegin())->GetPreferredSize();
   return item_size.width() < available_width;
 }
 
 void DownloadShelfView::UpdateButtonColors() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
-        rb.GetBitmapNamed(IDR_CLOSE_BAR),
-        rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
+        rb.GetImageSkiaNamed(IDR_CLOSE_BAR),
+        rb.GetImageSkiaNamed(IDR_CLOSE_BAR_MASK));
   }
 }
 
 void DownloadShelfView::OnThemeChanged() {
   UpdateButtonColors();
 }
 
 void DownloadShelfView::LinkClicked(views::Link* source, int event_flags) {
   browser_->ShowDownloadsTab();
 }
@@ skipping 89 matching lines @@
     const DownloadItemView* download_item_view) {
   gfx::Rect bounds = download_item_view->bounds();
 
 #if defined(TOOLKIT_VIEWS)
   bounds.set_height(bounds.height() - 1);
   bounds.Offset(0, 3);
 #endif
 
   return bounds;
 }