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

ash/system/tray_accessibility.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/tray_accessibility.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 14 matching lines @@
   DefaultAccessibilityView() {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           kTrayPopupPaddingHorizontal,
                                           0,
                                           kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     FixedSizedImageView* image =
         new FixedSizedImageView(0, kTrayPopupItemHeight);
     image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).
-                    ToSkBitmap());
+                    ToImageSkia());
 
     AddChildView(image);
     string16 label = bundle.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_DISABLE_SPOKEN_FEEDBACK);
     AddChildView(new views::Label(label));
     SetAccessibleName(label);
   }
 
   virtual ~DefaultAccessibilityView() {}
 
@@ skipping 39 matching lines @@
   CHECK(detailed_ == NULL);
   detailed_ = new views::View;
 
   detailed_->SetLayoutManager(new
       views::BoxLayout(views::BoxLayout::kHorizontal,
       kTrayPopupPaddingHorizontal, 10, kTrayPopupPaddingBetweenItems));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
   image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).
-      ToSkBitmap());
+      ToImageSkia());
 
   detailed_->AddChildView(image);
   detailed_->AddChildView(new views::Label(
         bundle.GetLocalizedString(string_id_)));
 
   return detailed_;
 }
 
 void TrayAccessibility::DestroyDefaultView() {
   default_ = NULL;
@@ skipping 12 matching lines @@
     string_id_ = string_id;
     PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   } else if (detailed_) {
     string_id_ = 0;
     detailed_->GetWidget()->Close();
   }
 }
 
 }  // namespace internal
 }  // namespace ash