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

content/browser/renderer_host/native_web_keyboard_event_aura.cc

Index: content/browser/renderer_host/native_web_keyboard_event_aura.cc
diff --git a/content/browser/renderer_host/native_web_keyboard_event_aura.cc b/content/browser/renderer_host/native_web_keyboard_event_aura.cc
index 03bc2fb2bf4656e2e870ea722e11bc6cba82713f..db3765c7d5b0416e08936df7de7e031d48c6b351 100644
--- a/content/browser/renderer_host/native_web_keyboard_event_aura.cc
+++ b/content/browser/renderer_host/native_web_keyboard_event_aura.cc
@@ -4,6 +4,7 @@
 
 #include "content/public/browser/native_web_keyboard_event.h"
 
+#include "base/logging.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "ui/aura/event.h"
 
@@ -17,8 +18,16 @@ aura::Event* CopyEvent(aura::Event* event) {
   return event ? static_cast<aura::KeyEvent*>(event)->Copy() : NULL;
 }
 
+int EventFlagsToWebInputEventModifiers(int flags) {
+  return
+      (flags & ui::EF_SHIFT_DOWN ? WebKit::WebInputEvent::ShiftKey : 0) |
+      (flags & ui::EF_CONTROL_DOWN ? WebKit::WebInputEvent::ControlKey : 0) |
+      (flags & ui::EF_CAPS_LOCK_DOWN ? WebKit::WebInputEvent::CapsLockOn : 0) |
+      (flags & ui::EF_ALT_DOWN ? WebKit::WebInputEvent::AltKey : 0);
 }
 
+}  // namespace
+
 using WebKit::WebKeyboardEvent;
 
 NativeWebKeyboardEvent::NativeWebKeyboardEvent()
@@ -40,6 +49,35 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent(
       skip_in_browser(other.skip_in_browser) {
 }
 
+NativeWebKeyboardEvent::NativeWebKeyboardEvent(
+    ui::EventType key_event_type,
+    bool is_char,
+    wchar_t character,
+    int state,
+    double time_stamp_seconds)
+    : os_event(NULL),
+      skip_in_browser(true /* already handled by the input method */) {
+  switch (key_event_type) {
+    case ui::ET_KEY_PRESSED:
+      type = is_char ? WebKit::WebInputEvent::Char :
+          WebKit::WebInputEvent::RawKeyDown;
+      break;
+    case ui::ET_KEY_RELEASED:
+      type = WebKit::WebInputEvent::KeyUp;
+      break;
+    default:
+      NOTREACHED();
+  }
+
+  modifiers = EventFlagsToWebInputEventModifiers(state);
+  timeStampSeconds = time_stamp_seconds;
+  windowsKeyCode = character;
+  nativeKeyCode = character;
+  text[0] = character;
+  unmodifiedText[0] = character;
+  isSystemKey = (state & ui::EF_ALT_DOWN) != 0;
+}
+
 NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=(
     const NativeWebKeyboardEvent& other) {
   WebKeyboardEvent::operator=(other);