| Index: ash/system/tray/tray_image_item.cc
|
| diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc
|
| index ca45de2fc8685bfe1dd0e0186dcfa627bee11b28..8d4b4e9dfa2c1b8842ecc53adfe7ecea5569f0db 100644
|
| --- a/ash/system/tray/tray_image_item.cc
|
| +++ b/ash/system/tray/tray_image_item.cc
|
| @@ -34,7 +34,7 @@ views::View* TrayImageItem::CreateTrayView(LoginStatus status) {
|
| CHECK(!tray_view_);
|
| tray_view_ = new TrayItemView(this);
|
| tray_view_->CreateImageView();
|
| - UpdateImageOnImageView();
|
| + SetImageIcon(icon_);
|
| tray_view_->SetVisible(GetInitialVisibility());
|
| return tray_view_;
|
| }
|
| @@ -45,15 +45,15 @@ void TrayImageItem::DestroyTrayView() {
|
|
|
| void TrayImageItem::SetIconColor(SkColor color) {
|
| icon_color_ = color;
|
| - UpdateImageOnImageView();
|
| + SetImageIcon(icon_);
|
| }
|
|
|
| -void TrayImageItem::UpdateImageOnImageView() {
|
| +void TrayImageItem::SetImageIcon(const gfx::VectorIcon& icon) {
|
| if (!tray_view_)
|
| return;
|
|
|
| tray_view_->image_view()->SetImage(
|
| - gfx::CreateVectorIcon(icon_, kTrayIconSize, icon_color_));
|
| + gfx::CreateVectorIcon(icon, kTrayIconSize, icon_color_));
|
| }
|
|
|
| } // namespace ash
|
|
|