Fix some surprising reverse key mappings.

ui/events/keycodes/keyboard_code_conversion_x.h

Index: ui/events/keycodes/keyboard_code_conversion_x.h
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.h b/ui/events/keycodes/keyboard_code_conversion_x.h
index f9186ca0c885701107feb19f746d54bcc88a3993..7378b5a36e5a0b7864d9e0df58b3268cac52ffc1 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.h
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h
@@ -10,6 +10,7 @@
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 
 typedef union _XEvent XEvent;
+typedef struct _XDisplay XDisplay;
 
 namespace ui {
 
@@ -26,6 +27,14 @@ EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev);
 EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode,
                                                 bool shift);
 
+// Returns a XKeyEvent keycode (scancode) for a KeyboardCode. Keyboard layouts
+// are usually not injective, so inverse mapping should be avoided when
+// practical. A round-trip keycode -> KeyboardCode -> keycode will not
+// necessarily return the original keycode.
+unsigned int XKeyEventKeyCode(ui::KeyboardCode key_code,

[Daniel Erat, 2014/07/07 21:07:01]

does this need to be exported like all the other functions in this file?

how about renaming it to XKeyCodeForWindowsKeyCode() and s/key_code/keycode/ so
it matches up with the XKeysymForWindowsKeyCode() function above it? (although
it'd probably be cleaner if "WindowsKeyCode" were replaced with "UiKeyboardCode"
or just "KeyboardCode" in both functions)

also, you don't need ui:: here; this is already in the ui namespace.

[kpschoedel, 2014/07/08 14:40:21]

Done.

I have work in progress under crbug.com/380349 to identify the two different
interpretations of ui::KeyboardCode (sometimes it's a physical location,
sometimes a Latin-mapped interpretation, a la Windows) and consistently name
functions accordingly.

+                              int flags,
+                              XDisplay* display);
+
 // Converts an X keycode into ui::KeyboardCode.
 EVENTS_BASE_EXPORT KeyboardCode
     DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code);