Fix text input.

mojo/views/native_widget_view_manager.cc

 // Copyright 2014 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 "mojo/views/native_widget_view_manager.h"
 
 #include "mojo/aura/window_tree_host_mojo.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_factory.h"
-#include "ui/base/ime/mock_input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/focus_controller.h"
 
 namespace mojo {
 namespace {
 
 // TODO: figure out what this should be.
 class FocusRulesImpl : public wm::BaseFocusRules {
  public:
   FocusRulesImpl() {}
   virtual ~FocusRulesImpl() {}
 
   virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FocusRulesImpl);
 };
 
-class InputMethodImpl : public ui::MockInputMethod {
- public:
-  explicit InputMethodImpl(ui::internal::InputMethodDelegate* delegate)
-      : MockInputMethod(delegate),
-        delegate_(delegate) {
-  }
-  virtual ~InputMethodImpl() {
-  }
-
-  // MockInputMethod:
-  virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE {
-    // If no text input client, do nothing.
-    if (!GetTextInputClient())
-      return DispatchKeyEventPostIME(event);
-
-    const bool handled = DispatchKeyEventPostIME(event);
-    if (event.type() == ui::ET_KEY_PRESSED && GetTextInputClient()) {
-      const uint16 ch = event.GetCharacter();
-      if (ch) {
-        GetTextInputClient()->InsertChar(ch, event.flags());
-        return true;
-      }
-    }
-    return handled;
-  }
-
- private:
-  bool DispatchKeyEventPostIME(const ui::KeyEvent& event) const {
-    return delegate_ && delegate_->DispatchKeyEventPostIME(event);
-  }
-
-  ui::internal::InputMethodDelegate* delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(InputMethodImpl);
-};
-
 class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
                                 public ui::EventHandler {
  public:
   explicit MinimalInputEventFilter(aura::Window* root)
-      : root_(root) {
-    ui::SetUpInputMethodFactoryForTesting();
-    input_method_.reset(new InputMethodImpl(this));
-    ui::InitializeInputMethod();
+      : root_(root),
+        input_method_(
+            ui::CreateInputMethod(this, gfx::kNullAcceleratedWidget).Pass()) {
+    ui::InitializeInputMethodForTesting();
     input_method_->Init(true);
     root_->AddPreTargetHandler(this);
     root_->SetProperty(aura::client::kRootWindowInputMethodKey,
                        input_method_.get());
   }
 
   virtual ~MinimalInputEventFilter() {
     root_->RemovePreTargetHandler(this);
     root_->SetProperty(aura::client::kRootWindowInputMethodKey,
                        static_cast<ui::InputMethod*>(NULL));
@@ skipping 67 matching lines @@
 }
 
 void NativeWidgetViewManager::OnViewInputEvent(view_manager::View* view,
                                                const EventPtr& event) {
   scoped_ptr<ui::Event> ui_event(event.To<scoped_ptr<ui::Event> >());
   if (ui_event.get())
     window_tree_host_->SendEventToProcessor(ui_event.get());
 }
 
 }  // namespace mojo