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

ui/views/window/custom_frame_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 "ui/views/window/custom_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 472 matching lines @@
     minimize_button_->SetVisible(false);
 
     normal_part = IDR_CLOSE_SA;
     hot_part = IDR_CLOSE_SA_H;
     pushed_part = IDR_CLOSE_SA_P;
   }
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   close_button_->SetImage(CustomButton::BS_NORMAL,
-                          rb.GetImageNamed(normal_part).ToSkBitmap());
+                          rb.GetImageNamed(normal_part).ToImageSkia());
   close_button_->SetImage(CustomButton::BS_HOT,
-                          rb.GetImageNamed(hot_part).ToSkBitmap());
+                          rb.GetImageNamed(hot_part).ToImageSkia());
   close_button_->SetImage(CustomButton::BS_PUSHED,
-                          rb.GetImageNamed(pushed_part).ToSkBitmap());
+                          rb.GetImageNamed(pushed_part).ToImageSkia());
 }
 
 void CustomFrameView::LayoutTitleBar() {
   // The window title position is calculated based on the icon position, even
   // when there is no icon.
   gfx::Rect icon_bounds(IconBounds());
   bool show_window_icon = window_icon_ != NULL;
   if (show_window_icon)
     window_icon_->SetBoundsRect(icon_bounds);
 
@@ skipping 23 matching lines @@
 
 ImageButton* CustomFrameView::InitWindowCaptionButton(
     int accessibility_string_id,
     int normal_image_id,
     int hot_image_id,
     int pushed_image_id) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   ImageButton* button = new ImageButton(this);
   button->SetAccessibleName(l10n_util::GetStringUTF16(accessibility_string_id));
   button->SetImage(CustomButton::BS_NORMAL,
-                   rb.GetImageNamed(normal_image_id).ToSkBitmap());
+                   rb.GetImageNamed(normal_image_id).ToImageSkia());
   button->SetImage(CustomButton::BS_HOT,
-                   rb.GetImageNamed(hot_image_id).ToSkBitmap());
+                   rb.GetImageNamed(hot_image_id).ToImageSkia());
   button->SetImage(CustomButton::BS_PUSHED,
-                   rb.GetImageNamed(pushed_image_id).ToSkBitmap());
+                   rb.GetImageNamed(pushed_image_id).ToImageSkia());
   AddChildView(button);
   return button;
 }
 
 }  // namespace views