| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 8cdfec9c861977a5c88ca323d51d7546de3f1125..cd83c783234cc3f788ef4e95a66ccccac401baa8 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -620,10 +620,10 @@ Shell::~Shell() {
|
| RemovePreTargetHandler(event_transformation_handler_.get());
|
| RemovePreTargetHandler(toplevel_window_event_handler_.get());
|
| RemovePostTargetHandler(toplevel_window_event_handler_.get());
|
| - if (config != Config::MASH)
|
| + if (config != Config::MASH) {
|
| RemovePreTargetHandler(system_gesture_filter_.get());
|
| - if (config == Config::CLASSIC)
|
| RemovePreTargetHandler(mouse_cursor_filter_.get());
|
| + }
|
| RemovePreTargetHandler(modality_filter_.get());
|
|
|
| // TooltipController is deleted with the Shell so removing its references.
|
| @@ -998,9 +998,9 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| // process mouse events prior to screenshot session.
|
| // See http://crbug.com/459214
|
| screenshot_controller_.reset(new ScreenshotController());
|
| - // TODO: evaluate if MouseCursorEventFilter needs to work for mus/mash.
|
| + // TODO: evaluate if MouseCursorEventFilter needs to work for mash.
|
| // http://crbug.com/706474.
|
| - if (config == Config::CLASSIC) {
|
| + if (config != Config::MASH) {
|
| mouse_cursor_filter_.reset(new MouseCursorEventFilter());
|
| PrependPreTargetHandler(mouse_cursor_filter_.get());
|
| }
|
|
|