Fix some surprising reverse key mappings.

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 377 matching lines @@
   rewritten_key_event->set_key_code(state.key_code);
   rewritten_key_event->set_character(
       ui::GetCharacterFromKeyCode(state.key_code, state.flags));
   rewritten_key_event->NormalizeFlags();
 #if defined(USE_X11)
   XEvent* xev = rewritten_key_event->native_event();
   if (xev) {
     CHECK(xev->type == KeyPress || xev->type == KeyRelease);
     XKeyEvent* xkey = &(xev->xkey);
     UpdateX11EventMask(rewritten_key_event->flags(), &xkey->state);
-    xkey->keycode =
-        XKeysymToKeycode(gfx::GetXDisplay(),
-                         ui::XKeysymForWindowsKeyCode(
-                             state.key_code, state.flags & ui::EF_SHIFT_DOWN));
+    // 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() != state.key_code) {
+      xkey->keycode = XKeysymForWindowsKeyCode(

[Daniel Erat, 2014/07/08 14:49:31]

s/XKeysym/XKeyCode/

[kpschoedel, 2014/07/08 16:44:50]

Drat. Nothing broke because it was an unambiguous overload.

+          state.key_code, state.flags, gfx::GetXDisplay());
+    }
   }
 #endif
   return status;
 }
 
 ui::EventRewriteStatus EventRewriter::RewriteMouseButtonEvent(
     const ui::MouseEvent& mouse_event,
     scoped_ptr<ui::Event>* rewritten_event) {
   int flags = mouse_event.flags();
   RewriteLocatedEvent(mouse_event, &flags);
@@ skipping 521 matching lines @@
 
   XIFreeDeviceInfo(device_info);
 }
 
 void EventRewriter::DeviceRemoved(int device_id) {
   device_id_to_type_.erase(device_id);
 }
 #endif
 
 }  // namespace chromeos