ash/shell.cc - Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash

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 2497123002: chromeos: Move device shutdown handling out of chrome into ash (Closed)

Patch Set: rebase 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:

Index: ash/shell.cc

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

index 9c211fc9360204fee838b499d6369311d6cd65a8..a539468c0ab2943eb1531efa247ec3966d96e870 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -724,8 +724,8 @@ void Shell::Init(const ShellInitParams& init_params) {

screen_pinning_controller_.reset(

new ScreenPinningController(window_tree_host_manager_.get()));

- lock_state_controller_ = base::MakeUnique<LockStateController>(

- wm_shell_->delegate()->GetShellConnector());

+ lock_state_controller_ =

+ base::MakeUnique<LockStateController>(wm_shell_->shutdown_controller());

power_button_controller_.reset(

new PowerButtonController(lock_state_controller_.get()));

#if defined(OS_CHROMEOS)

« no previous file with comments | « ash/public/interfaces/shutdown.mojom ('k') | ash/test/BUILD.gn » ('j') | no next file with comments »