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

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

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge 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
« no previous file with comments | « ash/common/system/overview/overview_button_tray.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5e74c876bde98b4995bc6ac6ac0808a9a3260157..5861a99d0a3703c351cc9ca92530daf7033b2809 100644
--- a/ash/common/system/tiles/tiles_default_view.cc
+++ b/ash/common/system/tiles/tiles_default_view.cc
@@ -90,7 +90,7 @@ void TilesDefaultView::Init() {
lock_button_ =
new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
kSystemMenuLockIcon, IDS_ASH_STATUS_TRAY_LOCK);
- if (disable_buttons || !shell->session_controller()->CanLockScreen())
+ if (disable_buttons || !Shell::Get()->session_controller()->CanLockScreen())
lock_button_->SetEnabled(false);
AddChildView(lock_button_);
@@ -102,7 +102,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 = WmShell::Get()->shutdown_controller()->reboot_on_shutdown();
+ bool reboot = shell->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.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698