| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 17f202f4720975d2d070b11cfa47da0833d6083c..6e2f60e19a20919411b8694e96d91e5ddb57e910 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -675,7 +675,7 @@ Shell::~Shell() {
|
|
|
| // Destroy maximize mode controller early on since it has some observers which
|
| // need to be removed.
|
| - maximize_mode_controller_.reset();
|
| + wm_shell_->DeleteMaximizeModeController();
|
|
|
| // Destroy the keyboard before closing the shelf, since it will invoke a shelf
|
| // layout.
|
| @@ -922,7 +922,7 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| display::Screen::GetScreen()->GetPrimaryDisplay());
|
|
|
| accelerator_controller_.reset(new AcceleratorController);
|
| - maximize_mode_controller_.reset(new MaximizeModeController());
|
| + wm_shell_->CreateMaximizeModeController();
|
|
|
| AddPreTargetHandler(window_tree_host_manager_->input_method_event_handler());
|
|
|
|
|