ash/common/system/date/date_default_view.cc - Issue 2761063002: Move more from WmShell to Shell

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/system/date/date_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:

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 664dc7847e70b49dd1d677121f953d7205d7c588..ddfd326b9dc6c5931b44c9b3047c0ecb923bb395 100644

--- a/ash/common/system/date/date_default_view.cc

+++ b/ash/common/system/date/date_default_view.cc

@@ -128,7 +128,7 @@ void DateDefaultView::ButtonPressed(views::Button* sender,

WmShell* shell = WmShell::Get();

if (sender == help_button_) {

shell->RecordUserMetricsAction(UMA_TRAY_HELP);

- shell->system_tray_controller()->ShowHelp();

+ Shell::Get()->system_tray_controller()->ShowHelp();

} else if (sender == shutdown_button_) {

shell->RecordUserMetricsAction(UMA_TRAY_SHUT_DOWN);

Shell::GetInstance()->lock_state_controller()->RequestShutdown();