Revert of Remove InputMethodEventHandler.

ash/display/window_tree_host_manager.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_WINDOW_TREE_HOST_MANAGER_H_
 #define ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 21 matching lines @@
 
 namespace gfx {
 class Insets;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 struct AshWindowTreeHostInitParams;
 class CursorWindowController;
 class FocusActivationStore;
+class InputMethodEventHandler;
 class MirrorWindowController;
 class RootWindowController;
 
 // WindowTreeHostManager owns and maintains RootWindows for each attached
 // display, keeping them in sync with display configuration changes.
 class ASH_EXPORT WindowTreeHostManager
     : public display::DisplayObserver,
       public aura::WindowTreeHostObserver,
       public display::DisplayManager::Delegate,
       public ui::internal::InputMethodDelegate {
@@ skipping 100 matching lines @@
       const display::DisplayInfoList& info_list) override;
   void CloseMirroringDisplayIfNotNecessary() override;
   void PreDisplayConfigurationChange(bool clear_focus) override;
   void PostDisplayConfigurationChange(bool must_clear_window) override;
   display::DisplayConfigurator* display_configurator() override;
 
   // ui::internal::InputMethodDelegate overrides:
   ui::EventDispatchDetails DispatchKeyEventPostIME(
       ui::KeyEvent* event) override;
 
+  InputMethodEventHandler* input_method_event_handler() {
+    return input_method_event_handler_.get();
+  }
+
  private:
   FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, BoundsUpdated);
   FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, SecondaryDisplayLayout);
   friend class MirrorWindowController;
 
   // Creates a WindowTreeHost for |display| and stores it in the
   // |window_tree_hosts_| map.
   AshWindowTreeHost* AddWindowTreeHostForDisplay(
       const display::Display& display,
       const AshWindowTreeHostInitParams& params);
@@ skipping 11 matching lines @@
   // Store the primary window tree host temporarily while replacing
   // display.
   AshWindowTreeHost* primary_tree_host_for_replace_;
 
   std::unique_ptr<FocusActivationStore> focus_activation_store_;
 
   std::unique_ptr<CursorWindowController> cursor_window_controller_;
   std::unique_ptr<MirrorWindowController> mirror_window_controller_;
 
   std::unique_ptr<ui::InputMethod> input_method_;
+  std::unique_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_t cursor_display_id_for_restore_;
 
   base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_