| Index: ash/display/display_controller.h
|
| diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
|
| index c79e665167bf826b37f720e77e233fb320beb11f..9ae9944b7d4b3e96ff0fe34015d5e4b75ab2cfa6 100644
|
| --- a/ash/display/display_controller.h
|
| +++ b/ash/display/display_controller.h
|
| @@ -46,6 +46,7 @@ class CursorWindowController;
|
| class DisplayInfo;
|
| class DisplayManager;
|
| class FocusActivationStore;
|
| +class InputMethodEventHandler;
|
| class MirrorWindowController;
|
| class RootWindowController;
|
|
|
| @@ -172,6 +173,10 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
|
| // ui::internal::InputMethodDelegate overrides:
|
| bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override;
|
|
|
| + InputMethodEventHandler* input_method_event_handler() {
|
| + return input_method_event_handler_.get();
|
| + }
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated);
|
| FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, SecondaryDisplayLayout);
|
| @@ -228,6 +233,7 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
|
| scoped_ptr<MirrorWindowController> mirror_window_controller_;
|
|
|
| scoped_ptr<ui::InputMethod> input_method_;
|
| + scoped_ptr<InputMethodEventHandler> input_method_event_handler_;
|
|
|
| // Stores the current cursor location (in native coordinates and screen
|
| // coordinates respectively). The locations are used to restore the cursor
|
|
|