Listen for key events in SetupXI2ForXWindow()

BUG=368750
R=sadrul
TEST=on device and desktop

Review URL: https://codereview.chromium.org/404423002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287772 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc

@@ -19,6 +19,7 @@
 #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 {
@@ -191,8 +192,16 @@ void X11InputMethodContextImplGtk2::ResetXModifierKeycodesCache() {
 
 GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
     const base::NativeEvent& native_event) {
-  const XKeyEvent& xkey = native_event->xkey;
-  DCHECK(xkey.type == KeyPress || xkey.type == KeyRelease);
+  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;
 
   // Get a GdkDisplay.
   GdkDisplay* display = gdk_x11_lookup_xdisplay(xkey.display);
@@ -207,7 +216,7 @@ GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
   // Get a keysym and group.
   KeySym keysym = NoSymbol;
   guint8 keyboard_group = 0;
-  XLookupString(&native_event->xkey, NULL, 0, &keysym, NULL);
+  XLookupString(&xkey, NULL, 0, &keysym, NULL);
   GdkKeymap* keymap = gdk_keymap_get_for_display(display);
   GdkKeymapKey* keys = NULL;
   guint* keyvals = NULL;

ui/events/x/touch_factory_x11.cc

@@ -210,6 +210,8 @@ void TouchFactory::SetupXI2ForXWindow(Window window) {
   XISetMask(mask, XI_ButtonPress);
   XISetMask(mask, XI_ButtonRelease);
   XISetMask(mask, XI_Motion);
+  XISetMask(mask, XI_KeyPress);
+  XISetMask(mask, XI_KeyRelease);
 
   XIEventMask evmask;
   evmask.deviceid = XIAllDevices;

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

@@ -1765,6 +1765,12 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
           SendEventToProcessor(&scrollev);
           break;
         }
+        case ui::ET_KEY_PRESSED:
+        case ui::ET_KEY_RELEASED: {
+          ui::KeyEvent key_event(xev);
+          SendEventToProcessor(&key_event);
+          break;
+        }
         case ui::ET_UNKNOWN:
           break;
         default: