| Index: ash/system/tray/tray_item_more.cc
|
| diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc
|
| index 9f07da8cea8075007cca5b5227606f2fc7bbd6f4..27a143b0d20295ae6c39322a83971c371b650f38 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();
|
| }
|
|
|
|
|