Revert of Listen for key events in SetupXI2ForXWindow()

chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.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 "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
 #include <gtk/gtk.h>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/composition_text_util_pango.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/events/event.h"
-#include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace libgtk2ui {
 
 X11InputMethodContextImplGtk2::X11InputMethodContextImplGtk2(
     ui::LinuxInputMethodContextDelegate* delegate)
     : delegate_(delegate),
       gtk_context_simple_(NULL),
       gtk_multicontext_(NULL),
       gtk_context_(NULL),
@@ skipping 152 matching lines @@
           break;
       }
     }
   }
   XFree(const_cast<KeySym*>(keysyms));
   XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
 }
 
 GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
     const base::NativeEvent& native_event) {
-  XEvent xkeyevent;
-  if (native_event->type == GenericEvent) {
-    // If this is an XI2 key event, build a matching core X event, to avoid
-    // having two cases for every use.
-    ui::InitXKeyEventFromXIDeviceEvent(*native_event, &xkeyevent);
-  } else {
-    DCHECK(native_event->type == KeyPress || native_event->type == KeyRelease);
-    xkeyevent.xkey = native_event->xkey;
-  }
-  XKeyEvent& xkey = xkeyevent.xkey;
+  const XKeyEvent& xkey = native_event->xkey;
+  DCHECK(xkey.type == KeyPress || xkey.type == KeyRelease);
 
   // Get a GdkDisplay.
   GdkDisplay* display = gdk_x11_lookup_xdisplay(xkey.display);
   if (!display) {
     // Fall back to the default display.
     display = gdk_display_get_default();
   }
   if (!display) {
     LOG(ERROR) << "Cannot get a GdkDisplay for a key event.";
     return NULL;
   }
   // Get a keysym and group.
   KeySym keysym = NoSymbol;
   guint8 keyboard_group = 0;
-  XLookupString(&xkey, NULL, 0, &keysym, NULL);
+  XLookupString(&native_event->xkey, NULL, 0, &keysym, NULL);
   GdkKeymap* keymap = gdk_keymap_get_for_display(display);
   GdkKeymapKey* keys = NULL;
   guint* keyvals = NULL;
   gint n_entries = 0;
   if (keymap &&
       gdk_keymap_get_entries_for_keycode(keymap, xkey.keycode,
                                          &keys, &keyvals, &n_entries)) {
     for (gint i = 0; i < n_entries; ++i) {
       if (keyvals[i] == keysym) {
         keyboard_group = keys[i].group;
@@ skipping 139 matching lines @@
       text.length() == 1 &&
       text[0] == gdk_keyval_to_unicode(gdk_event_key_keyval_)) {
     is_signal_caught_ = true;
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace libgtk2ui