Refactoring the ownership of ui::InputMethod.

ash/shell/keyboard_controller_proxy_stub.cc

Index: ash/shell/keyboard_controller_proxy_stub.cc
diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc
index 220d69e63869e83648371202686c81e770d65290..d14f364109763d4b32694b390a5e36d3d98dd6b4 100644
--- a/ash/shell/keyboard_controller_proxy_stub.cc
+++ b/ash/shell/keyboard_controller_proxy_stub.cc
@@ -7,8 +7,8 @@
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/mock_input_method.h"
-#include "ui/wm/core/input_method_event_filter.h"
 
 using namespace content;
 
@@ -36,7 +36,7 @@ aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() {
 }
 
 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() {
-  return Shell::GetInstance()->input_method_filter()->input_method();
+  return ash::Shell::GetPrimaryRootWindow()->GetHost()->GetInputMethod();

[James Su, 2015/06/02 08:28:21]

GetTargetRootWindow ?

[Shu Chen, 2015/06/02 08:44:06]

Done.

 }
 
 void KeyboardControllerProxyStub::RequestAudioInput(