| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 10f49c9f736d386badec8dc51fdea3b8867dc649..20f4a8965fcc98f79c44f9d537a09c2972b84853 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -957,7 +957,9 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| toplevel_window_event_handler_ =
|
| base::MakeUnique<ToplevelWindowEventHandler>();
|
|
|
| - if (config != Config::MASH) {
|
| + // TODO: get working in Config::MUS. This uses InputDeviceManager, which is
|
| + // not created in mus. http://crbug.com/712290.
|
| + if (config == Config::CLASSIC) {
|
| system_gesture_filter_.reset(new SystemGestureEventFilter);
|
| AddPreTargetHandler(system_gesture_filter_.get());
|
| }
|
| @@ -1051,7 +1053,9 @@ void Shell::Init(const ShellInitParams& init_params) {
|
|
|
| // Needs to be created after InitDisplays() since it may cause the virtual
|
| // keyboard to be deployed.
|
| - if (config != Config::MASH)
|
| + // TODO: get working in Config::MUS. This uses InputDeviceManager, which is
|
| + // not created in mus. http://crbug.com/712290.
|
| + if (config == Config::CLASSIC)
|
| virtual_keyboard_controller_.reset(new VirtualKeyboardController);
|
|
|
| audio_a11y_controller_.reset(new chromeos::AudioA11yController);
|
|
|