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

chrome/browser/ui/views/notifications/balloon_view.cc

Index: chrome/browser/ui/views/notifications/balloon_view.cc
diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc
index 1b3e8384cbcac478f2ae1c6c4358817c30d5d2f7..9644487857aba5f6067a0ee4601a624d79951f63 100644
--- a/chrome/browser/ui/views/notifications/balloon_view.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view.cc
@@ -380,15 +380,15 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   frame_container_->SetAlwaysOnTop(true);
 
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
-                          rb.GetBitmapNamed(IDR_TAB_CLOSE));
+                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
   close_button_->SetImage(views::CustomButton::BS_HOT,
-                          rb.GetBitmapNamed(IDR_TAB_CLOSE_H));
+                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
-                          rb.GetBitmapNamed(IDR_TAB_CLOSE_P));
+                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
   close_button_->SetBoundsRect(GetCloseButtonBounds());
   close_button_->SetBackground(SK_ColorBLACK,
-                               rb.GetBitmapNamed(IDR_TAB_CLOSE),
-                               rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));
+                               rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
+                               rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
 
   options_menu_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH));
   options_menu_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_H));