Chromium Code Reviews| Index: ash/shell.cc |
| diff --git a/ash/shell.cc b/ash/shell.cc |
| index 201c55f9918ac7cb657a633940d185d31abe21fa..9c211fc9360204fee838b499d6369311d6cd65a8 100644 |
| --- a/ash/shell.cc |
| +++ b/ash/shell.cc |
| @@ -724,7 +724,8 @@ void Shell::Init(const ShellInitParams& init_params) { |
| screen_pinning_controller_.reset( |
| new ScreenPinningController(window_tree_host_manager_.get())); |
| - lock_state_controller_.reset(new LockStateController); |
| + lock_state_controller_ = base::MakeUnique<LockStateController>( |
| + wm_shell_->delegate()->GetShellConnector()); |
|
Elliot Glaysher
2016/11/02 19:13:29
Q: LockStateController can't trivially be moved to
James Cook
2016/11/02 20:20:03
I think this is OK. WmShell's constructor touches
Elliot Glaysher
2016/11/02 21:45:16
Acknowledged.
|
| power_button_controller_.reset( |
| new PowerButtonController(lock_state_controller_.get())); |
| #if defined(OS_CHROMEOS) |