Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3442)

Unified Diff: ash/common/system/tiles/tiles_default_view.cc

Issue 2775973002: Promotes more accessors from WmShell to Shell (Closed)
Patch Set: feedback Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));
}
« no previous file with comments | « ash/common/system/overview/overview_button_tray.cc ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698