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

ui/views/widget/native_widget_aura.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/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/window_types.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/ime/input_method_bridge.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/widget/tooltip_manager_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
-#if defined(HAVE_IBUS)
-#include "ui/views/ime/input_method_ibus.h"
-#else
-#include "ui/views/ime/mock_input_method.h"
-#endif
-
 namespace views {
 
 namespace {
 
 aura::client::WindowType GetAuraWindowTypeForWidgetType(
     Widget::InitParams::Type type) {
   switch (type) {
     case Widget::InitParams::TYPE_WINDOW:
       return aura::client::WINDOW_TYPE_NORMAL;
     case Widget::InitParams::TYPE_WINDOW_FRAMELESS:
@@ skipping 254 matching lines @@
 
 void NativeWidgetAura::ReleaseMouseCapture() {
   window_->ReleaseCapture();
 }
 
 bool NativeWidgetAura::HasMouseCapture() const {
   return window_->HasCapture();
 }
 
 InputMethod* NativeWidgetAura::CreateInputMethod() {
-#if defined(HAVE_IBUS)
-  InputMethod* input_method = new InputMethodIBus(this);
-#else
-  InputMethod* input_method = new MockInputMethod(this);
-#endif
+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
+  ui::InputMethod* host = reinterpret_cast<ui::InputMethod*>(
+      root_window->GetProperty(aura::client::kRootWindowInputMethod));
+  InputMethod* input_method = new InputMethodBridge(this, host);
   input_method->Init(GetWidget());
   return input_method;
 }
 
 void NativeWidgetAura::CenterWindow(const gfx::Size& size) {
   const gfx::Rect parent_bounds = window_->parent()->bounds();
   window_->SetBounds(gfx::Rect((parent_bounds.width() - size.width())/2,
                                (parent_bounds.height() - size.height())/2,
                                size.width(),
                                size.height()));
@@ skipping 301 matching lines @@
 void NativeWidgetAura::OnBlur() {
   Widget* widget = GetWidget();
   if (widget->is_top_level()) {
     InputMethod* input_method = widget->GetInputMethod();
     input_method->OnBlur();
   }
   delegate_->OnNativeBlur(NULL);
 }
 
 bool NativeWidgetAura::OnKeyEvent(aura::KeyEvent* event) {
-  // TODO(beng): Need an InputMethodAura to properly handle character events.
-  //             Right now, we just skip these.
-  if (event->is_char())
+  if (event->is_char()) {
+    // If a ui::InputMethod object is attched to the root window, character
+    // events are handled inside the object and are not passed to this function.
+    // If such object is not attached, character events might be sent (e.g. on
+    // Windows). In this case, we just skip these.
     return false;
+  }
 
   DCHECK(window_->IsVisible());
   InputMethod* input_method = GetWidget()->GetInputMethod();
   DCHECK(input_method);
-  // TODO(oshima): DispatchKeyEvent should return bool?
   KeyEvent views_event(event);
   input_method->DispatchKeyEvent(views_event);
   return true;
 }
 
 gfx::NativeCursor NativeWidgetAura::GetCursor(const gfx::Point& point) {
   return cursor_;
 }
 
 int NativeWidgetAura::GetNonClientComponent(const gfx::Point& point) const {
@@ skipping 205 matching lines @@
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::RootWindow::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views