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

ash/system/tray/tray_views.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_views.h"
 
 #include "ash/system/tray/tray_constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
@@ skipping 313 matching lines @@
 // TrayPopupHeaderButton
 
 TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
                                              int enabled_resource_id,
                                              int disabled_resource_id,
                                              int enabled_resource_id_hover,
                                              int disabled_resource_id_hover)
     : views::ToggleImageButton(listener) {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   SetImage(views::CustomButton::BS_NORMAL,
-      bundle.GetImageNamed(enabled_resource_id).ToSkBitmap());
+      bundle.GetImageNamed(enabled_resource_id).ToImageSkia());
   SetToggledImage(views::CustomButton::BS_NORMAL,
-      bundle.GetImageNamed(disabled_resource_id).ToSkBitmap());
+      bundle.GetImageNamed(disabled_resource_id).ToImageSkia());
   SetImage(views::CustomButton::BS_HOT,
-      bundle.GetImageNamed(enabled_resource_id_hover).ToSkBitmap());
+      bundle.GetImageNamed(enabled_resource_id_hover).ToImageSkia());
   SetToggledImage(views::CustomButton::BS_HOT,
-      bundle.GetImageNamed(disabled_resource_id_hover).ToSkBitmap());
+      bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia());
   SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                     views::ImageButton::ALIGN_MIDDLE);
   set_focusable(true);
 
   // TODO(sad): Turn animation back on once there are proper assets.
   // http://crbug.com/119832
   set_animate_on_state_change(false);
 }
 
 TrayPopupHeaderButton::~TrayPopupHeaderButton() {}
@@ skipping 113 matching lines @@
 }
 
 void TrayNotificationView::InitView(views::View* contents) {
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
-                         ResourceBundle::GetSharedInstance().GetBitmapNamed(
+                         ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                              IDR_AURA_WINDOW_CLOSE));
 
   int contents_width = kTrayPopupWidth - kNotificationCloseButtonWidth;
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL,
                      0, /* resize percent */
                      views::GridLayout::FIXED,
                      contents_width,
                      contents_width);
   columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
@@ skipping 10 matching lines @@
 TrayNotificationView::~TrayNotificationView() {
 }
 
 void TrayNotificationView::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
   OnClose();
 }
 
 }  // namespace internal
 }  // namespace ash