Revert of Removing X11 native_event uses for key events.

mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc

Index: mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
diff --git a/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc b/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
index 98f6ec4795529472a3c49497179c756790003d5a..a4bd3307d45a9fcc86d3dd8730f59faa848e7ac2 100644
--- a/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
+++ b/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
@@ -128,12 +128,18 @@
   } else if (input.IsKeyEvent()) {
     const ui::KeyEvent* key_event = static_cast<const ui::KeyEvent*>(&input);
     KeyDataPtr key_data(KeyData::New());
-    key_data->key_code = key_event->GetConflatedWindowsKeyCode();
+    key_data->key_code = key_event->key_code();
     key_data->native_key_code = key_event->platform_keycode();
     key_data->is_char = key_event->is_char();
     key_data->character = key_event->GetCharacter();
 
-    if (key_event->extended_key_event_data()) {
+    if (key_event->HasNativeEvent()) {
+      key_data->windows_key_code = static_cast<mojo::KeyboardCode>(
+          ui::WindowsKeycodeFromNative(key_event->native_event()));
+      key_data->text = ui::TextFromNative(key_event->native_event());
+      key_data->unmodified_text =
+          ui::UnmodifiedTextFromNative(key_event->native_event());
+    } else if (key_event->extended_key_event_data()) {
       const MojoExtendedKeyEventData* data =
           static_cast<const MojoExtendedKeyEventData*>(
               key_event->extended_key_event_data());
@@ -142,10 +148,8 @@
       key_data->text = data->text();
       key_data->unmodified_text = data->unmodified_text();
     } else {
-      key_data->windows_key_code = static_cast<mojo::KeyboardCode>(
-          key_event->GetLocatedWindowsKeyboardCode());
-      key_data->text = key_event->GetText();
-      key_data->unmodified_text = key_event->GetUnmodifiedText();
+      NOTREACHED() << "Synthesized event which never contained a native event "
+          "passed to mojo::TypeConverter.";
     }
 
     event->key_data = key_data.Pass();