mojo: Fix double character inserts on Windows by removing a Linux hack.

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 "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.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_base.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/focus_controller.h"
 
+#if defined(OS_LINUX)
+#include "mojo/views/input_method_mojo_linux.h"
+#endif
+
 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 MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
                                 public ui::EventHandler {
  public:
   explicit MinimalInputEventFilter(aura::Window* root)
       : root_(root) {
     ui::InitializeInputMethodForTesting();
+#if defined(OS_LINUX)
+    input_method_.reset(new InputMethodMojoLinux(this));
+#else
     input_method_ = ui::CreateInputMethod(this, gfx::kNullAcceleratedWidget);
+#endif
     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 88 matching lines @@
 }
 
 void NativeWidgetViewManager::OnViewInputEvent(View* view,
                                                const EventPtr& event) {
   scoped_ptr<ui::Event> ui_event(event.To<scoped_ptr<ui::Event> >());
   if (ui_event)
     window_tree_host_->SendEventToProcessor(ui_event.get());
 }
 
 }  // namespace mojo