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

ui/views/examples/button_example.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/examples/button_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 27 matching lines @@
 void ButtonExample::CreateExampleView(View* container) {
   container->SetLayoutManager(
       new BoxLayout(BoxLayout::kVertical, 0, 0, kLayoutSpacing));
 
   text_button_ = new TextButton(this, ASCIIToUTF16("Text Button"));
   container->AddChildView(text_button_);
 
   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_);
 }
 
 void ButtonExample::ButtonPressed(Button* sender, const Event& event) {
   PrintStatus("Pressed! count: %d", ++count_);
 
   if (event.IsControlDown()) {
     if (event.IsShiftDown()) {
       if (event.IsAltDown()) {
@@ skipping 54 matching lines @@
         text_button_->set_border(new TextButtonBorder());
     }
   } else if (event.IsAltDown()) {
     text_button_->SetIsDefault(!text_button_->is_default());
   }
   example_view()->GetLayoutManager()->Layout(example_view());
 }
 
 }  // namespace examples
 }  // namespace views