5 files changed, 12 insertions, 13 deletions
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index e4fa9f3..3b9284f 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -16,8 +16,7 @@
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-
-class SkBitmap;
+#include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 
@@ -27,7 +26,7 @@ struct ASH_EXPORT NetworkIconInfo {
 
   bool highlight;
   bool tray_icon_visible;
-  SkBitmap image;
+  gfx::ImageSkia image;
   string16 name;
   string16 description;
   std::string service_path;
diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc
index a92f2ad..449cbd7 100644
--- a/ash/system/tray/tray_image_item.cc
+++ b/ash/system/tray/tray_image_item.cc
@@ -29,7 +29,7 @@ views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
   tray_view_ = new TrayItemView;
   tray_view_->CreateImageView();
   tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance().
-      GetImageNamed(resource_id_).ToSkBitmap());
+      GetImageNamed(resource_id_).ToImageSkia());
   tray_view_->SetVisible(GetInitialVisibility());
   return tray_view_;
 }
diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc
index 29f1ab4..8e71830 100644
--- a/ash/system/tray/tray_item_more.cc
+++ b/ash/system/tray/tray_item_more.cc
@@ -32,7 +32,7 @@ TrayItemMore::TrayItemMore(SystemTrayItem* owner)
   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_);
 }
 
@@ -45,8 +45,8 @@ void TrayItemMore::SetLabel(const string16& label) {
   SchedulePaint();
 }
 
-void TrayItemMore::SetImage(const SkBitmap* bitmap) {
-  icon_->SetImage(bitmap);
+void TrayItemMore::SetImage(const gfx::ImageSkia* image_skia) {
+  icon_->SetImage(image_skia);
   SchedulePaint();
 }
 
diff --git a/ash/system/tray/tray_item_more.h b/ash/system/tray/tray_item_more.h
index 6c4a9f5..8731dde 100644
--- a/ash/system/tray/tray_item_more.h
+++ b/ash/system/tray/tray_item_more.h
@@ -29,7 +29,7 @@ class TrayItemMore : public ActionableView {
   virtual ~TrayItemMore();
 
   void SetLabel(const string16& label);
-  void SetImage(const SkBitmap* bitmap);
+  void SetImage(const gfx::ImageSkia* image_skia);
   void SetAccessibleName(const string16& name);
 
  protected:
diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
index 62c7cda..89a80eb 100644
--- a/ash/system/tray/tray_views.cc
+++ b/ash/system/tray/tray_views.cc
@@ -331,13 +331,13 @@ TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
     : 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);
@@ -471,7 +471,7 @@ void TrayNotificationView::InitView(views::View* contents) {
 
   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;