Refactoring the ownership of ui::InputMethod.

ui/aura/remote_window_tree_host_win.cc

 // Copyright (c) 2012 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 "ui/aura/remote_window_tree_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
 #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"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/remote_input_method_win.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/view_prop.h"
 #include "ui/events/event_utils.h"
@@ skipping 239 matching lines @@
   // the SetCursor operation completed.
   ignore_mouse_moves_until_set_cursor_ack_++;
   VLOG(1) << "In MoveCursorTo. Sending IPC";
   host_->Send(new MetroViewerHostMsg_SetCursorPos(location.x(), location.y()));
 }
 
 void RemoteWindowTreeHostWin::OnCursorVisibilityChangedNative(bool show) {
   NOTIMPLEMENTED();
 }
 
-ui::EventProcessor* RemoteWindowTreeHostWin::GetEventProcessor() {
-  return dispatcher();
-}
-
 void RemoteWindowTreeHostWin::CancelComposition() {
   if (!host_)
     return;
   host_->Send(new MetroViewerHostMsg_ImeCancelComposition);
 }
 
 void RemoteWindowTreeHostWin::OnTextInputClientUpdated(
     const std::vector<int32>& input_scopes,
     const std::vector<gfx::Rect>& composition_character_bounds) {
   if (!host_)
@@ skipping 138 matching lines @@
   SendEventToProcessor(&event);
 }
 
 void RemoteWindowTreeHostWin::OnSetCursorPosAck() {
   DCHECK_GT(ignore_mouse_moves_until_set_cursor_ack_, 0);
   ignore_mouse_moves_until_set_cursor_ack_--;
 }
 
 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);
 }
 
 void RemoteWindowTreeHostWin::OnImeCandidatePopupChanged(bool visible) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   remote_input_method_private->OnCandidatePopupChanged(visible);
 }
@@ skipping 64 matching lines @@
 }
 
 void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) {
   if (flags == event_flags_)
     return;
   event_flags_ = flags;
   SetVirtualKeyStates(event_flags_);
 }
 
 }  // namespace aura