| Index: ash/common/system/tiles/tiles_default_view.cc
|
| diff --git a/ash/common/system/tiles/tiles_default_view.cc b/ash/common/system/tiles/tiles_default_view.cc
|
| index 5861a99d0a3703c351cc9ca92530daf7033b2809..1e3ebedbb6ab63a3eae6e0cb85d2ea5c45679059 100644
|
| --- a/ash/common/system/tiles/tiles_default_view.cc
|
| +++ b/ash/common/system/tiles/tiles_default_view.cc
|
| @@ -49,7 +49,6 @@ TilesDefaultView::TilesDefaultView(SystemTrayItem* owner, LoginStatus login)
|
| TilesDefaultView::~TilesDefaultView() {}
|
|
|
| void TilesDefaultView::Init() {
|
| - WmShell* shell = WmShell::Get();
|
| views::BoxLayout* box_layout =
|
| new views::BoxLayout(views::BoxLayout::kHorizontal, 4, 0, 0);
|
| box_layout->set_main_axis_alignment(
|
| @@ -102,7 +101,7 @@ void TilesDefaultView::Init() {
|
| AddChildView(power_button_);
|
| // This object is recreated every time the menu opens. Don't bother updating
|
| // the tooltip if the shutdown policy changes while the menu is open.
|
| - bool reboot = shell->shutdown_controller()->reboot_on_shutdown();
|
| + bool reboot = Shell::Get()->shutdown_controller()->reboot_on_shutdown();
|
| power_button_->SetTooltipText(l10n_util::GetStringUTF16(
|
| reboot ? IDS_ASH_STATUS_TRAY_REBOOT : IDS_ASH_STATUS_TRAY_SHUTDOWN));
|
| }
|
|
|