Remove special key rewrite code for x11

chrome/browser/chromeos/events/event_rewriter.cc

 // Copyright 2014 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/chromeos/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/wm/window_state.h"
@@ skipping 231 matching lines @@
   }
   NOTREACHED();
   return ui::EVENT_REWRITE_CONTINUE;
 }
 
 void EventRewriter::BuildRewrittenKeyEvent(
     const ui::KeyEvent& key_event,
     ui::KeyboardCode key_code,
     int flags,
     scoped_ptr<ui::Event>* rewritten_event) {
-  ui::KeyEvent* rewritten_key_event = NULL;
-#if defined(USE_X11)
-  XEvent* xev = key_event.native_event();
-  if (xev) {
-    XEvent xkeyevent;
-    // Convert all XI2-based key events into X11 core-based key events,
-    // until consumers no longer depend on receiving X11 core events.
-    if (xev->type == GenericEvent)
-      ui::InitXKeyEventFromXIDeviceEvent(*xev, &xkeyevent);
-    else
-      xkeyevent.xkey = xev->xkey;
-
-    unsigned int original_x11_keycode = xkeyevent.xkey.keycode;
-    // Update native event to match rewritten |ui::Event|.
-    // The X11 keycode represents a physical key position, so it shouldn't
-    // change unless we have actually changed keys, not just modifiers.
-    // This is one guard against problems like crbug.com/390263.
-    if (key_event.key_code() != key_code) {
-      xkeyevent.xkey.keycode =
-          XKeyCodeForWindowsKeyCode(key_code, flags, gfx::GetXDisplay());
-    }
-    ui::KeyEvent x11_key_event(&xkeyevent);
-    rewritten_key_event = new ui::KeyEvent(x11_key_event);
-
-    // For numpad keys, the key char should always NOT be changed because
-    // XKeyCodeForWindowsKeyCode method cannot handle non-US keyboard layout.
-    // The correct key char can be got from original X11 keycode but not for the
-    // rewritten X11 keycode.
-    // For Shift+NumpadKey cases, use the rewritten X11 keycode (US layout).
-    // Please see crbug.com/335644.
-    if (key_code >= ui::VKEY_NUMPAD0 && key_code <= ui::VKEY_DIVIDE) {
-      XEvent numpad_xevent;
-      numpad_xevent.xkey = xkeyevent.xkey;
-      // Remove the shift state before getting key char.
-      // Because X11/XKB sometimes returns unexpected key char for
-      // Shift+NumpadKey. e.g. Shift+Numpad_4 returns 'D', etc.
-      numpad_xevent.xkey.state &= ~ShiftMask;
-      numpad_xevent.xkey.state |= Mod2Mask;  // Always set NumLock mask.
-      if (!(flags & ui::EF_SHIFT_DOWN))
-        numpad_xevent.xkey.keycode = original_x11_keycode;
-      rewritten_key_event->set_character(
-          ui::GetCharacterFromXEvent(&numpad_xevent));
-    }
-  }
-#endif
-  if (!rewritten_key_event)
-    rewritten_key_event = new ui::KeyEvent(key_event);
+  ui::KeyEvent* rewritten_key_event = new ui::KeyEvent(key_event);
   rewritten_key_event->set_flags(flags);
   rewritten_key_event->set_key_code(key_code);
 #if defined(USE_X11)
   ui::UpdateX11EventForFlags(rewritten_key_event);
   rewritten_key_event->NormalizeFlags();
 #endif
   rewritten_event->reset(rewritten_key_event);
 }
 
 void EventRewriter::DeviceKeyPressedOrReleased(int device_id) {
@@ skipping 690 matching lines @@
   // TODO(spang): Figure out where we can get keyboard vendor/product id from in
   // Ozone/Freon version.
   return KeyboardDeviceAddedInternal(device_id,
                                      "keyboard",
                                      kUnknownVendorId,
                                      kUnknownProductId);
 #endif
 }
 
 }  // namespace chromeos