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

ui/views/examples/button_example.cc

Index: ui/views/examples/button_example.cc
diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index a86ee665e276c4187034321f6de18223093370df..21dfc20d39655377c8db945d9da201701a164b97 100644
--- a/ui/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -45,11 +45,11 @@ void ButtonExample::CreateExampleView(View* container) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   image_button_ = new ImageButton(this);
   image_button_->SetImage(ImageButton::BS_NORMAL,
-                          rb.GetImageNamed(IDR_CLOSE).ToSkBitmap());
+                          rb.GetImageNamed(IDR_CLOSE).ToImageSkia());
   image_button_->SetImage(ImageButton::BS_HOT,
-                          rb.GetImageNamed(IDR_CLOSE_H).ToSkBitmap());
+                          rb.GetImageNamed(IDR_CLOSE_H).ToImageSkia());
   image_button_->SetImage(ImageButton::BS_PUSHED,
-                          rb.GetImageNamed(IDR_CLOSE_P).ToSkBitmap());
+                          rb.GetImageNamed(IDR_CLOSE_P).ToImageSkia());
   image_button_->SetOverlayImage(rb.GetImageNamed(IDR_MENU_CHECK).ToSkBitmap());
   container->AddChildView(image_button_);
 }