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

ash/system/network/tray_sms.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 "ash/system/network/tray_sms.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 124 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SmsObserver);
 };
 
 #endif  // OS_CHROMEOS
 
 class TraySms::SmsDefaultView : public TrayItemMore {
  public:
   explicit SmsDefaultView(TraySms* tray)
       : TrayItemMore(tray),
         tray_(tray) {
-    SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_SMS));
     Update();
   }
 
   virtual ~SmsDefaultView() {}
 
   void Update() {
     int message_count =
         static_cast<int>(tray_->sms_observer()->messages().GetSize());
     string16 label = l10n_util::GetStringFUTF16(
@@ skipping 49 matching lines @@
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE {
     tray_->sms_observer()->RemoveMessage(index_);
     tray_->Update(false);
   }
 
  private:
   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;
 
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
 
     // Message
@@ skipping 17 matching lines @@
     layout->StartRow(0, 0);
     layout->AddView(message_label_);
 
     layout->AddPaddingRow(0, kPaddingVertical);
 
     return msg_width;
   }
 
   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 -
         kTrayPopupPaddingHorizontal - kSmsIconWidth;
 
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
 
@@ skipping 208 matching lines @@
     }
     if (detailed_)
       detailed_->Update();
     else if (notify)
       ShowNotificationView();
   }
 }
 
 }  // namespace internal
 }  // namespace ash