Use EventHandler for IME

ash/display/display_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 28 matching lines @@
 class Insets;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 struct AshWindowTreeHostInitParams;
 class CursorWindowController;
 class DisplayInfo;
 class DisplayManager;
 class FocusActivationStore;
+class InputMethodEventHandler;
 class MirrorWindowController;
 class RootWindowController;
 
 // DisplayController owns and maintains RootWindows for each attached
 // display, keeping them in sync with display configuration changes.
 class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
                                      public aura::WindowTreeHostObserver,
                                      public DisplayManager::Delegate,
                                      public ui::internal::InputMethodDelegate {
  public:
@@ skipping 106 matching lines @@
   // aura::DisplayManager::Delegate overrides:
   void CreateOrUpdateMirroringDisplay(
       const DisplayInfoList& info_list) override;
   void CloseMirroringDisplayIfNotNecessary() override;
   void PreDisplayConfigurationChange(bool clear_focus) override;
   void PostDisplayConfigurationChange() override;
 
   // 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);
   friend class DisplayManager;
   friend class MirrorWindowController;
 
   // Creates a WindowTreeHost for |display| and stores it in the
   // |window_tree_hosts_| map.
   AshWindowTreeHost* AddWindowTreeHostForDisplay(
       const gfx::Display& display,
@@ skipping 36 matching lines @@
   // Store the primary window tree host temporarily while replacing
   // display.
   AshWindowTreeHost* primary_tree_host_for_replace_;
 
   scoped_ptr<FocusActivationStore> focus_activation_store_;
 
   scoped_ptr<CursorWindowController> cursor_window_controller_;
   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
   // location when the display configuration changes and to determine whether
   // the mouse should be moved after a display configuration change.
   gfx::Point cursor_location_in_native_coords_for_restore_;
   gfx::Point cursor_location_in_screen_coords_for_restore_;
 
   // Stores the cursor's display. The id is used to determine whether the mouse
   // should be moved after a display configuration change.
   int64 cursor_display_id_for_restore_;
 
   base::WeakPtrFactory<DisplayController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_