Index: ash/common/system/date/date_default_view.cc |
diff --git a/ash/common/system/date/date_default_view.cc b/ash/common/system/date/date_default_view.cc |
index 74d94a0bbb012d3265409dfe676c001ce5ebb9f2..9fe00bdce68a78fb3daa82eaa4511b87c511dde1 100644 |
--- a/ash/common/system/date/date_default_view.cc |
+++ b/ash/common/system/date/date_default_view.cc |
@@ -90,10 +90,17 @@ DateDefaultView::DateDefaultView(LoginStatus login) |
#if !defined(OS_WIN) |
if (login != LoginStatus::LOCKED) { |
- shutdown_button_ = new TrayPopupHeaderButton( |
- this, IDR_AURA_UBER_TRAY_SHUTDOWN, IDR_AURA_UBER_TRAY_SHUTDOWN, |
- IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, |
- IDS_ASH_STATUS_TRAY_SHUTDOWN); |
+ if (MaterialDesignController::IsSystemTrayMenuMaterial()) { |
+ gfx::ImageSkia power_icon = |
+ gfx::CreateVectorIcon(kSystemMenuPowerIcon, kMenuIconColor); |
+ shutdown_button_ = new TrayPopupHeaderButton( |
+ this, power_icon, IDS_ASH_STATUS_TRAY_SHUTDOWN); |
+ } else { |
+ shutdown_button_ = new TrayPopupHeaderButton( |
+ this, IDR_AURA_UBER_TRAY_SHUTDOWN, IDR_AURA_UBER_TRAY_SHUTDOWN, |
+ IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, |
+ IDS_ASH_STATUS_TRAY_SHUTDOWN); |
+ } |
shutdown_button_->SetTooltipText( |
l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SHUTDOWN)); |
view->AddButton(shutdown_button_); |