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

ash/system/drive/tray_drive.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/drive/tray_drive.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 52 matching lines @@
 namespace tray {
 
 
 class DriveDefaultView : public TrayItemMore {
  public:
   DriveDefaultView(SystemTrayItem* owner,
                    const DriveOperationStatusList* list)
       : TrayItemMore(owner) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
-    SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DRIVE).ToSkBitmap());
+    SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DRIVE).ToImageSkia());
     Update(list);
   }
 
   virtual ~DriveDefaultView() {}
 
   void Update(const DriveOperationStatusList* list) {
     DCHECK(list);
     string16 label = GetTrayLabel(*list);
     SetLabel(label);
     SetAccessibleName(label);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriveDefaultView);
 };
 
 class DriveDetailedView : public TrayDetailsView,
                           public ViewClickListener {
  public:
   DriveDetailedView(SystemTrayItem* owner,
                     const DriveOperationStatusList* list)
       : settings_(NULL),
         in_progress_img_(NULL),
         done_img_(NULL),
         failed_img_(NULL) {
-    in_progress_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    in_progress_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_DRIVE);
-    done_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    done_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_DRIVE_DONE);
-    failed_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    failed_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_DRIVE_FAILED);
 
     Update(list);
   }
 
   virtual ~DriveDetailedView() {
     STLDeleteValues(&update_map_);
   }
 
   void Update(const DriveOperationStatusList* list) {
@@ skipping 52 matching lines @@
       label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       label_container_->AddChildView(label);
       // Add progress bar.
       progress_bar_ = new OperationProgressBar();
       label_container_->AddChildView(progress_bar_);
 
       AddChildView(label_container_);
 
       cancel_button_ = new views::ImageButton(this);
       cancel_button_->SetImage(views::ImageButton::BS_NORMAL,
-          ResourceBundle::GetSharedInstance().GetBitmapNamed(
+          ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_AURA_UBER_TRAY_DRIVE_CANCEL));
       cancel_button_->SetImage(views::ImageButton::BS_HOT,
-          ResourceBundle::GetSharedInstance().GetBitmapNamed(
+          ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER));
 
       UpdateStatus(state, progress);
       AddChildView(cancel_button_);
     }
 
     void UpdateStatus(ash::DriveOperationStatus::OperationState state,
                       double progress) {
       status_img_->SetImage(container_->GetImageForState(state));
       progress_bar_->SetValue(progress);
@@ skipping 69 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(RowView);
   };
 
   void AppendHeaderEntry(const DriveOperationStatusList* list) {
     if (footer())
       return;
     CreateSpecialRow(IDS_ASH_STATUS_TRAY_DRIVE, this);
   }
 
-  SkBitmap* GetImageForState(ash::DriveOperationStatus::OperationState state) {
+  gfx::ImageSkia* GetImageForState(
+      ash::DriveOperationStatus::OperationState state) {
     switch (state) {
       case ash::DriveOperationStatus::OPERATION_NOT_STARTED:
       case ash::DriveOperationStatus::OPERATION_STARTED:
       case ash::DriveOperationStatus::OPERATION_IN_PROGRESS:
       case ash::DriveOperationStatus::OPERATION_SUSPENDED:
         return in_progress_img_;
       case ash::DriveOperationStatus::OPERATION_COMPLETED:
         return done_img_;
       case ash::DriveOperationStatus::OPERATION_FAILED:
         return failed_img_;
@@ skipping 75 matching lines @@
     if (sender == footer()->content()) {
       Shell::GetInstance()->tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == settings_) {
       delegate->ShowDriveSettings();
     }
   }
 
   // Maps operation entries to their file paths.
   std::map<FilePath, RowView*> update_map_;
   views::View* settings_;
-  SkBitmap* in_progress_img_;
-  SkBitmap* done_img_;
-  SkBitmap* failed_img_;
+  gfx::ImageSkia* in_progress_img_;
+  gfx::ImageSkia* done_img_;
+  gfx::ImageSkia* failed_img_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveDetailedView);
 };
 
 }  // namespace tray
 
 TrayDrive::TrayDrive() :
     TrayImageItem(IDR_AURA_UBER_TRAY_DRIVE_LIGHT),
     default_(NULL),
     detailed_(NULL) {
@@ skipping 58 matching lines @@
 
   if (default_)
     default_->Update(&list);
 
   if (detailed_)
     detailed_->Update(&list);
 }
 
 }  // namespace internal
 }  // namespace ash