IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

ui/aura/desktop_host_win.cc

 // Copyright (c) 2011 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/desktop_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
 #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;
 
 namespace aura {
 
 namespace {
 
 const wchar_t* GetCursorId(gfx::NativeCursor native_cursor) {
   switch (native_cursor) {
@@ skipping 83 matching lines @@
 }
 
 // static
 gfx::Size DesktopHost::GetNativeScreenSize() {
   return gfx::Size(GetSystemMetrics(SM_CXSCREEN),
                    GetSystemMetrics(SM_CYSCREEN));
 }
 
 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(hwnd());
 }
 
 DesktopHostWin::~DesktopHostWin() {
   DestroyWindow(hwnd());
 }
 
 bool DesktopHostWin::Dispatch(const MSG& msg) {
   TranslateMessage(&msg);
   DispatchMessage(&msg);
   return true;
@@ skipping 106 matching lines @@
 }
 
 void DesktopHostWin::OnClose() {
   // TODO: this obviously shouldn't be here.
   MessageLoopForUI::current()->Quit();
 }
 
 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));
   return 0;
 }
 
 LRESULT DesktopHostWin::OnMouseRange(UINT message,
                                      WPARAM w_param,
                                      LPARAM l_param) {
   MSG msg = { hwnd(), message, w_param, l_param, 0,
@@ skipping 11 matching lines @@
   ValidateRect(hwnd(), NULL);
 }
 
 void DesktopHostWin::OnSize(UINT param, const CSize& size) {
   // Minimizing resizes the window to 0x0 which causes our layout to go all
   // screwy, so we just ignore it.
   if (param != SIZE_MINIMIZED)
     desktop_->OnHostResized(gfx::Size(size.cx, size.cy));
 }
 
+void DesktopHostWin::SetInputMethod(ui::InputMethod* input_method) {

[sky, 2011/12/01 17:01:09]

Order doesn't match header.

[Yusuke Sato, 2011/12/02 02:18:31]

Done.

+  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();
+}
+
 }  // namespace aura