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

ash/system/settings/tray_settings.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/settings/tray_settings.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 16 matching lines @@
 class SettingsView : public ash::internal::ActionableView {
  public:
   SettingsView() {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
         ash::kTrayPopupPaddingHorizontal, 0,
         ash::kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     views::ImageView* icon =
         new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
-    icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToSkBitmap());
+    icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());
     AddChildView(icon);
 
     string16 text = rb.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_SETTINGS_AND_HELP);
     label_ = new views::Label(text);
     AddChildView(label_);
 
     SetAccessibleName(text);
   }
 
@@ skipping 43 matching lines @@
 }
 
 void TraySettings::DestroyDetailedView() {
 }
 
 void TraySettings::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 }  // namespace internal
 }  // namespace ash