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

Unified Diff: ash/common/system/date/date_default_view.cc

Issue 2491403003: chromeos: Move SystemTrayDelegate::RequestShutdown to WmShell (Closed)
Patch Set: Created 4 years, 1 month 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/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 0f8a011ba093e7b9165bdbf7a05fb3f35f2143c6..8eedc082f0d7a95f217810b2e8b70985bfd0b1a1 100644
--- a/ash/common/system/date/date_default_view.cc
+++ b/ash/common/system/date/date_default_view.cc
@@ -135,13 +135,12 @@ const tray::DateView* DateDefaultView::GetDateView() const {
void DateDefaultView::ButtonPressed(views::Button* sender,
const ui::Event& event) {
WmShell* shell = WmShell::Get();
- SystemTrayDelegate* tray_delegate = shell->system_tray_delegate();
if (sender == help_button_) {
shell->RecordUserMetricsAction(UMA_TRAY_HELP);
shell->system_tray_controller()->ShowHelp();
} else if (sender == shutdown_button_) {
shell->RecordUserMetricsAction(UMA_TRAY_SHUT_DOWN);
- tray_delegate->RequestShutdown();
+ shell->RequestShutdown();
} else if (sender == lock_button_) {
shell->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN);
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698