ash/shell.cc - Issue 2652093002: mash: Make the power button shut the system down.

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/shell.cc

Issue 2652093002: mash: Make the power button shut the system down. (Closed)

Patch Set: add comment about CursorManager Created 3 years, 11 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/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index aa5144eefe79458725933aa6c6c001440fb3c5b2..e765b345d6886de43658dbfb009901544e7b9c11 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -679,9 +679,10 @@ void Shell::Init(const ShellInitParams& init_params) {

new ResolutionNotificationController);

}

- if (cursor_manager_)

+ if (cursor_manager_) {

cursor_manager_->SetDisplay(

display::Screen::GetScreen()->GetPrimaryDisplay());

+ }

if (!is_mash) {

// TODO(sky): move this to WmShell. http://crbug.com/671246.

« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/wm/lock_state_controller.cc » ('j') | no next file with comments »