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

ash/system/network/tray_sms.cc

Index: ash/system/network/tray_sms.cc
diff --git a/ash/system/network/tray_sms.cc b/ash/system/network/tray_sms.cc
index 99038b13968403415905996ddd81a3b7d42880a2..34cdd25ab8fab31a2219ebbbcfeb49d2111b4a0b 100644
--- a/ash/system/network/tray_sms.cc
+++ b/ash/system/network/tray_sms.cc
@@ -142,7 +142,7 @@ class TraySms::SmsDefaultView : public TrayItemMore {
   explicit SmsDefaultView(TraySms* tray)
       : TrayItemMore(tray),
         tray_(tray) {
-    SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_SMS));
     Update();
   }
@@ -212,8 +212,8 @@ class TraySms::SmsMessageView : public views::View,
   int LayoutDetailedView() {
     views::ImageButton* close_button = new views::ImageButton(this);
     close_button->SetImage(views::CustomButton::BS_NORMAL,
-                           ResourceBundle::GetSharedInstance().GetBitmapNamed(
-                               IDR_AURA_WINDOW_CLOSE));
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_AURA_WINDOW_CLOSE));
 
     int msg_width = kTrayPopupWidth - kNotificationCloseButtonWidth -
         kTrayPopupPaddingHorizontal * 2;
@@ -251,7 +251,7 @@ class TraySms::SmsMessageView : public views::View,
 
   int LayoutNotificationView() {
     icon_ = new views::ImageView;
-    icon_->SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    icon_->SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_SMS));
 
     int msg_width = kTrayPopupWidth - kNotificationCloseButtonWidth -