ash/shell/keyboard_controller_proxy_stub.cc - Issue 1155013005: Refactoring the ownership of ui::InputMethod.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shell/keyboard_controller_proxy_stub.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: let DisplayController be centrial InputMethodDelegate and call DispatchKeyEventPostIME on the activ… Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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..fb3d398586673389170c7cea1c5d0c31361a959b 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::GetTargetRootWindow()->GetHost()->GetInputMethod();

James Cook 2015/06/02 16:29:12 Again, are you sure about GetTargetRootWindow?

Shu Chen 2015/06/03 03:31:54 Done.

}

void KeyboardControllerProxyStub::RequestAudioInput(