| Index: ui/aura/remote_window_tree_host_win.cc
|
| diff --git a/ui/aura/remote_window_tree_host_win.cc b/ui/aura/remote_window_tree_host_win.cc
|
| index 8ffa617ee21214b31b18ca7c6c4124e17ad3a673..842598c823ffdafd851c9ebed9b692d8be36e67d 100644
|
| --- a/ui/aura/remote_window_tree_host_win.cc
|
| +++ b/ui/aura/remote_window_tree_host_win.cc
|
| @@ -11,7 +11,6 @@
|
| #include "base/message_loop/message_loop.h"
|
| #include "ipc/ipc_message.h"
|
| #include "ipc/ipc_sender.h"
|
| -#include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/client/cursor_client.h"
|
| #include "ui/aura/window_event_dispatcher.h"
|
| #include "ui/aura/window_property.h"
|
| @@ -271,10 +270,6 @@ void RemoteWindowTreeHostWin::OnCursorVisibilityChangedNative(bool show) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -ui::EventProcessor* RemoteWindowTreeHostWin::GetEventProcessor() {
|
| - return dispatcher();
|
| -}
|
| -
|
| void RemoteWindowTreeHostWin::CancelComposition() {
|
| if (!host_)
|
| return;
|
| @@ -433,9 +428,7 @@ void RemoteWindowTreeHostWin::OnSetCursorPosAck() {
|
|
|
| ui::RemoteInputMethodPrivateWin*
|
| RemoteWindowTreeHostWin::GetRemoteInputMethodPrivate() {
|
| - ui::InputMethod* input_method = GetAshWindow()->GetProperty(
|
| - aura::client::kRootWindowInputMethodKey);
|
| - return ui::RemoteInputMethodPrivateWin::Get(input_method);
|
| + return ui::RemoteInputMethodPrivateWin::Get(GetInputMethod());
|
| }
|
|
|
| void RemoteWindowTreeHostWin::OnImeCandidatePopupChanged(bool visible) {
|
|
|