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

ui/views/controls/button/image_button.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/controls/button/image_button.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skbitmap_operations.h"
@@ skipping 13 matching lines @@
       preferred_size_(kDefaultWidth, kDefaultHeight) {
   // By default, we request that the gfx::Canvas passed to our View::OnPaint()
   // implementation is flipped horizontally so that the button's bitmaps are
   // mirrored when the UI directionality is right-to-left.
   EnableCanvasFlippingForRTLUI(true);
 }
 
 ImageButton::~ImageButton() {
 }
 
-void ImageButton::SetImage(ButtonState state, const SkBitmap* image) {
-  images_[state] = image ? *image : SkBitmap();
+void ImageButton::SetImage(ButtonState state, const gfx::ImageSkia* image) {
+  images_[state] = image ? *image : gfx::ImageSkia();
   PreferredSizeChanged();
 }
 
 void ImageButton::SetBackground(SkColor color,
-                                const SkBitmap* image,
-                                const SkBitmap* mask) {
+                                const gfx::ImageSkia* image,
+                                const gfx::ImageSkia* mask) {
   if (!image || !mask) {
     background_image_.reset();
     return;
   }
 
   background_image_ =
       SkBitmapOperations::CreateButtonBackground(color, *image, *mask);
 }
 
 void ImageButton::SetOverlayImage(const SkBitmap* image) {
@@ skipping 84 matching lines @@
   for (int i = 0; i < BS_COUNT; ++i) {
     SkBitmap temp = images_[i];
     images_[i] = alternate_images_[i];
     alternate_images_[i] = temp;
   }
   toggled_ = toggled;
   SchedulePaint();
 }
 
 void ToggleImageButton::SetToggledImage(ButtonState state,
-                                        const SkBitmap* image) {
+                                        const gfx::ImageSkia* image) {
   if (toggled_) {
-    images_[state] = image ? *image : SkBitmap();
+    images_[state] = image ? *image : gfx::ImageSkia();
     if (state_ == state)
       SchedulePaint();
   } else {
-    alternate_images_[state] = image ? *image : SkBitmap();
+    alternate_images_[state] = image ? *image : gfx::ImageSkia();
   }
 }
 
 void ToggleImageButton::SetToggledTooltipText(const string16& tooltip) {
   toggled_tooltip_text_ = tooltip;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, ImageButton overrides:
 
-void ToggleImageButton::SetImage(ButtonState state, const SkBitmap* image) {
+void ToggleImageButton::SetImage(ButtonState state,
+                                 const gfx::ImageSkia* image) {
   if (toggled_) {
-    alternate_images_[state] = image ? *image : SkBitmap();
+    alternate_images_[state] = image ? *image : gfx::ImageSkia();
   } else {
-    images_[state] = image ? *image : SkBitmap();
+    images_[state] = image ? *image : gfx::ImageSkia();
     if (state_ == state)
       SchedulePaint();
   }
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, View overrides:
 
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
                                        string16* tooltip) const {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
 }  // namespace views