Revert 113224 - IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in u...

ui/aura/desktop_host_win.cc

Index: ui/aura/desktop_host_win.cc
===================================================================
--- ui/aura/desktop_host_win.cc	(revision 113258)
+++ ui/aura/desktop_host_win.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "base/message_loop.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
-#include "ui/base/ime/mock_input_method.h"
 
 using std::max;
 using std::min;
@@ -115,15 +114,11 @@
 
 DesktopHostWin::DesktopHostWin(const gfx::Rect& bounds)
     : desktop_(NULL),
-      // TODO(yusukes): implement and use ui::InputMethodWin.
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          input_method_(new ui::MockInputMethod(this))),
       fullscreen_(false),
       saved_window_style_(0),
       saved_window_ex_style_(0) {
   Init(NULL, bounds);
   SetWindowText(hwnd(), L"aura::Desktop!");
-  input_method_->Init(true);
 }
 
 DesktopHostWin::~DesktopHostWin() {
@@ -242,25 +237,6 @@
       hwnd(), native_event.message, native_event.wParam, native_event.lParam);
 }
 
-void DesktopHostWin::SetInputMethod(ui::InputMethod* input_method) {
-  input_method_.reset(input_method);
-}
-
-ui::InputMethod* DesktopHostWin::GetInputMethod() const {
-  return input_method_.get();
-}
-
-void DesktopHostWin::DispatchKeyEventPostIME(const base::NativeEvent& event) {
-  // TODO(yusukes): Support input method.
-  NOTIMPLEMENTED();
-}
-
-void DesktopHostWin::DispatchFabricatedKeyEventPostIME(
-    ui::EventType type, ui::KeyboardCode key_code, int flags) {
-  // TODO(yusukes): Support input method.
-  NOTIMPLEMENTED();
-}
-
 void DesktopHostWin::OnClose() {
   // TODO: this obviously shouldn't be here.
   MessageLoopForUI::current()->Quit();
@@ -269,7 +245,6 @@
 LRESULT DesktopHostWin::OnKeyEvent(UINT message,
                                    WPARAM w_param,
                                    LPARAM l_param) {
-  // TODO(yusukes): Support input method.
   MSG msg = { hwnd(), message, w_param, l_param };
   KeyEvent keyev(msg, message == WM_CHAR);
   SetMsgHandled(desktop_->DispatchKeyEvent(&keyev));