| Index: ash/mus/bridge/wm_shell_mus.cc
|
| diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
|
| index 9b7aecd237877dfd3a6656626afcbc38486df501..195250df2644716dc4aec814cbbce0e2c7711a89 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.cc
|
| +++ b/ash/mus/bridge/wm_shell_mus.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <utility>
|
|
|
| +#include "ash/common/accelerators/accelerator_controller.h"
|
| #include "ash/common/display/display_info.h"
|
| #include "ash/common/keyboard/keyboard_ui.h"
|
| #include "ash/common/session/session_state_delegate.h"
|
| @@ -19,6 +20,7 @@
|
| #include "ash/common/wm/window_cycle_event_filter.h"
|
| #include "ash/common/wm/window_resizer.h"
|
| #include "ash/common/wm_activation_observer.h"
|
| +#include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
|
| #include "ash/mus/bridge/wm_root_window_controller_mus.h"
|
| #include "ash/mus/bridge/wm_window_mus.h"
|
| #include "ash/mus/container_ids.h"
|
| @@ -104,6 +106,10 @@ WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
|
| client_->AddObserver(this);
|
| WmShell::Set(this);
|
|
|
| + accelerator_controller_delegate_.reset(new AcceleratorControllerDelegateMus);
|
| + SetAcceleratorController(base::MakeUnique<AcceleratorController>(
|
| + accelerator_controller_delegate_.get()));
|
| +
|
| CreateMaximizeModeController();
|
|
|
| CreateMruWindowTracker();
|
|
|