| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 7e55fe8dae1bdbd089b28b617d81a48c4536711f..c67beb3aa69e9a500fe459271a0377f8db8a388d 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -29,6 +29,7 @@
|
| #include "ash/gpu_support.h"
|
| #include "ash/high_contrast/high_contrast_controller.h"
|
| #include "ash/host/ash_window_tree_host_init_params.h"
|
| +#include "ash/ime/input_method_event_handler.h"
|
| #include "ash/keyboard_uma_event_filter.h"
|
| #include "ash/magnifier/magnification_controller.h"
|
| #include "ash/magnifier/partial_magnification_controller.h"
|
| @@ -673,6 +674,7 @@ Shell::~Shell() {
|
| // Please keep in same order as in Init() because it's easy to miss one.
|
| if (window_modality_controller_)
|
| window_modality_controller_.reset();
|
| + RemovePreTargetHandler(display_controller_->input_method_event_handler());
|
| #if defined(OS_CHROMEOS)
|
| RemovePreTargetHandler(magnifier_key_scroll_handler_.get());
|
| magnifier_key_scroll_handler_.reset();
|
| @@ -918,6 +920,8 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| accelerator_controller_.reset(new AcceleratorController);
|
| maximize_mode_controller_.reset(new MaximizeModeController());
|
|
|
| + AddPreTargetHandler(display_controller_->input_method_event_handler());
|
| +
|
| #if defined(OS_CHROMEOS)
|
| magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler();
|
| AddPreTargetHandler(magnifier_key_scroll_handler_.get());
|
|
|