Refactoring the ownership of ui::InputMethod.

ash/shell/keyboard_controller_proxy_stub.cc

 // Copyright 2013 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.
 
 #include "ash/shell/keyboard_controller_proxy_stub.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
+#include "ash/wm/window_util.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;
 
 namespace ash {
 
 KeyboardControllerProxyStub::KeyboardControllerProxyStub()
     : keyboard::KeyboardControllerProxy(Shell::GetInstance()
                                             ->delegate()
                                             ->GetActiveBrowserContext()) {
 }
 
 KeyboardControllerProxyStub::~KeyboardControllerProxyStub() {
 }
 
 bool KeyboardControllerProxyStub::HasKeyboardWindow() const {
   return keyboard_;
 }
 
 aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() {
   if (!keyboard_) {
     keyboard_.reset(new aura::Window(&delegate_));
     keyboard_->Init(ui::LAYER_NOT_DRAWN);
   }
   return keyboard_.get();
 }
 
 ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() {
-  return Shell::GetInstance()->input_method_filter()->input_method();
+  aura::Window* root_window = wm::GetActiveWindow();
+  if (root_window)
+    root_window = root_window->GetRootWindow();
+  if (!root_window)
+    root_window = Shell::GetTargetRootWindow();

[James Cook, 2015/06/03 16:34:27]

same nit, GetPrimaryRootWindow()?

[Shu Chen, 2015/06/04 01:59:44]

Done.

+  return root_window->GetHost()->GetInputMethod();
 }
 
 void KeyboardControllerProxyStub::RequestAudioInput(
     WebContents* web_contents,
     const MediaStreamRequest& request,
     const MediaResponseCallback& callback) {
 }
 
 void KeyboardControllerProxyStub::LoadSystemKeyboard() {
 }
 
 void KeyboardControllerProxyStub::ReloadKeyboardIfNeeded() {
 }
 
 }  // namespace ash