Refactoring the ownership of ui::InputMethod.

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>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_manager.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host_observer.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace aura {
 class Display;
 class WindowTreeHost;
 }
 
 namespace base {
 class Value;
@@ skipping 179 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_;
+
   // 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_