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

ash/system/tray_update.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_update.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 27 matching lines @@
   UpdateView() {
     SetLayoutManager(new
         views::BoxLayout(views::BoxLayout::kHorizontal,
         ash::kTrayPopupPaddingHorizontal, 0,
         ash::kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     views::ImageView* image =
         new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
     image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_UPDATE_DARK).
-        ToSkBitmap());
+        ToImageSkia());
 
     AddChildView(image);
     AddChildView(new views::Label(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE)));
     SetAccessibleName(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE));
   }
 
   virtual ~UpdateView() {}
 
  private:
@@ skipping 96 matching lines @@
 void TrayUpdate::OnUpdateRecommended() {
   tray_view()->SetVisible(true);
   if (!Shell::GetInstance()->shelf()->IsVisible() && !nagger_.get()) {
     // The shelf is not visible, and there is no nagger scheduled.
     nagger_.reset(new tray::UpdateNagger(this));
   }
 }
 
 }  // namespace internal
 }  // namespace ash