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

ash/system/tray/tray_item_more.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/tray_item_more.h"
 
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "grit/ui_resources.h"
@@ skipping 14 matching lines @@
 
   icon_ = new FixedSizedImageView(0, kTrayPopupItemHeight);
   AddChildView(icon_);
 
   label_ = new views::Label;
   AddChildView(label_);
 
   more_ = new views::ImageView;
   more_->EnableCanvasFlippingForRTLUI(true);
   more_->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_AURA_UBER_TRAY_MORE).ToSkBitmap());
+      IDR_AURA_UBER_TRAY_MORE).ToImageSkia());
   AddChildView(more_);
 }
 
 TrayItemMore::~TrayItemMore() {
 }
 
 void TrayItemMore::SetLabel(const string16& label) {
   label_->SetText(label);
   Layout();
   SchedulePaint();
 }
 
-void TrayItemMore::SetImage(const SkBitmap* bitmap) {
-  icon_->SetImage(bitmap);
+void TrayItemMore::SetImage(const gfx::ImageSkia* image_skia) {
+  icon_->SetImage(image_skia);
   SchedulePaint();
 }
 
 void TrayItemMore::SetAccessibleName(const string16& name) {
   accessible_name_ = name;
 }
 
 void TrayItemMore::ReplaceIcon(views::View* view) {
   delete icon_;
   icon_ = NULL;
@@ skipping 25 matching lines @@
   }
 }
 
 void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = accessible_name_;
 }
 
 }  // namespace internal
 }  // namespace ash