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

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

Issue 2761063002: Move 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/status_area_widget_delegate.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 f403e283a61a8a0be60de59c0405662d30fa6769..5e74c876bde98b4995bc6ac6ac0808a9a3260157 100644
--- a/ash/common/system/tiles/tiles_default_view.cc
+++ b/ash/common/system/tiles/tiles_default_view.cc
@@ -66,7 +66,8 @@ void TilesDefaultView::Init() {
settings_button_ = new SystemMenuButton(
this, TrayPopupInkDropStyle::HOST_CENTERED, kSystemMenuSettingsIcon,
IDS_ASH_STATUS_TRAY_SETTINGS);
- if (disable_buttons || !shell->system_tray_delegate()->ShouldShowSettings())
+ if (disable_buttons ||
+ !Shell::Get()->system_tray_delegate()->ShouldShowSettings())
settings_button_->SetEnabled(false);
AddChildView(settings_button_);
AddChildView(TrayPopupUtils::CreateVerticalSeparator());
@@ -112,10 +113,10 @@ void TilesDefaultView::ButtonPressed(views::Button* sender,
WmShell* shell = WmShell::Get();
if (sender == settings_button_) {
shell->RecordUserMetricsAction(UMA_TRAY_SETTINGS);
- shell->system_tray_controller()->ShowSettings();
+ Shell::Get()->system_tray_controller()->ShowSettings();
} else if (sender == help_button_) {
shell->RecordUserMetricsAction(UMA_TRAY_HELP);
- shell->system_tray_controller()->ShowHelp();
+ Shell::Get()->system_tray_controller()->ShowHelp();
} else if (sender == lock_button_) {
shell->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN);
chromeos::DBusThreadManager::Get()
« no previous file with comments | « ash/common/system/status_area_widget_delegate.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698