Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: ui/aura/remote_window_tree_host_win.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased. 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:
View side-by-side diff with in-line comments
Download patch
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 c44234ce86e6215e5de4b035e618683e36270641..0d7dae745ca273f89d74330c97c3676a3ce8b134 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,8 +428,7 @@ void RemoteWindowTreeHostWin::OnSetCursorPosAck() {
ui::RemoteInputMethodPrivateWin*
RemoteWindowTreeHostWin::GetRemoteInputMethodPrivate() {
- ui::InputMethod* input_method = GetAshWindow()->GetProperty(
- aura::client::kRootWindowInputMethodKey);
+ ui::InputMethod* input_method = GetAshWindow()->GetHost()->GetInputMethod();
James Su 2015/06/02 07:05:26 shouldn't GetAshWindow()->GetHost() == this ?
Shu Chen 2015/06/02 07:20:21 Yes. Done.
return ui::RemoteInputMethodPrivateWin::Get(input_method);
}

Powered by Google App Engine
This is Rietveld 408576698