| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index cfcf29252b7a1b6e99b2124509443929a0d5d4c7..12e0012a1c74ddd9ad18c47b3b9a106b0dce969f 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -978,10 +978,8 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| }
|
|
|
| sticky_keys_controller_.reset(new StickyKeysController);
|
| - if (!is_mash) {
|
| - screen_pinning_controller_.reset(
|
| - new ScreenPinningController(window_tree_host_manager_.get()));
|
| - }
|
| + if (!is_mash)
|
| + screen_pinning_controller_ = base::MakeUnique<ScreenPinningController>();
|
|
|
| lock_state_controller_ =
|
| base::MakeUnique<LockStateController>(shutdown_controller_.get());
|
|
|