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

mojo/services/native_viewport/platform_viewport_x11.cc

 // Copyright 2013 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/services/native_viewport/platform_viewport.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "mojo/services/public/cpp/input_events/lib/mojo_extended_key_event_data.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/rect.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/platform_window/x11/x11_window.h"
 
 namespace mojo {
@@ skipping 53 matching lines @@
   virtual void OnBoundsChanged(const gfx::Rect& new_bounds) OVERRIDE {
     bounds_ = new_bounds;
     delegate_->OnBoundsChanged(new_bounds);
   }
 
   virtual void OnDamageRect(const gfx::Rect& damaged_region) OVERRIDE {
   }
 
   virtual void DispatchEvent(ui::Event* event) OVERRIDE {
     delegate_->OnEvent(event);
+
+    // We want to emulate the WM_CHAR generation behaviour of Windows.
+    //
+    // On Linux, we've previously inserted characters by having
+    // InputMethodAuraLinux take all key down events and send a character event
+    // to the TextInputClient. This causes a mismatch in code that has to be
+    // shared between Windows and Linux, including blink code. Now that we're
+    // trying to have one way of doing things, we need to standardize on and
+    // emulate Windows character events.
+    //
+    // This is equivalent to what we're doing in the current Linux port, but
+    // done once instead of done multiple times in different places.
+    if (event->type() == ui::ET_KEY_PRESSED) {
+      ui::KeyEvent* key_press_event = static_cast<ui::KeyEvent*>(event);
+      ui::KeyEvent char_event(key_press_event->GetCharacter(),
+                              key_press_event->key_code(),
+                              key_press_event->flags());
+
+      DCHECK_EQ(key_press_event->GetCharacter(), char_event.GetCharacter());
+      DCHECK_EQ(key_press_event->key_code(), char_event.key_code());
+      DCHECK_EQ(key_press_event->flags(), char_event.flags());
+
+      char_event.SetExtendedKeyEventData(scoped_ptr<ui::ExtendedKeyEventData>(
+          new MojoExtendedKeyEventData(
+              ui::WindowsKeycodeFromNative(key_press_event->native_event()),
+              ui::TextFromNative(key_press_event->native_event()),
+              ui::UnmodifiedTextFromNative(key_press_event->native_event()))));
+      char_event.set_platform_keycode(key_press_event->platform_keycode());
+
+      delegate_->OnEvent(&char_event);
+    }
   }
 
   virtual void OnCloseRequest() OVERRIDE {
     platform_window_->Close();
   }
 
   virtual void OnClosed() OVERRIDE {
     delegate_->OnDestroyed();
   }
 
@@ skipping 17 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11);
 };
 
 // static
 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) {
   return scoped_ptr<PlatformViewport>(new PlatformViewportX11(delegate)).Pass();
 }
 
 }  // namespace mojo