[cros] Fix accelerator keys when using non-US/Latin keyboard layouts.

ui/base/keycodes/keyboard_code_conversion_gtk.cc

Index: ui/base/keycodes/keyboard_code_conversion_gtk.cc
diff --git a/ui/base/keycodes/keyboard_code_conversion_gtk.cc b/ui/base/keycodes/keyboard_code_conversion_gtk.cc
index 6545d7ea0c3a07756bf120bd4c783599e7d4db53..4425b883b02118c51ec682d99a88a11ece4962fa 100644
--- a/ui/base/keycodes/keyboard_code_conversion_gtk.cc
+++ b/ui/base/keycodes/keyboard_code_conversion_gtk.cc
@@ -35,10 +35,16 @@
 
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "build/build_config.h"
 #include "ui/base/keycodes/keyboard_codes_posix.h"
 
+#ifdef USE_X11
+#include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#endif
+
 namespace ui {
 
 KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
@@ -615,4 +621,17 @@ int GdkKeyCodeForWindowsKeyCode(KeyboardCode keycode, bool shift) {
     }
 }
 
+KeyboardCode KeyboardCodeFromGdkEventKey(GdkEventKey* event) {
+  KeyboardCode keycode = WindowsKeyCodeForGdkKeyCode(event->keyval);
+#ifdef USE_X11
+  // Gtk's key values are same as X11's keysyms.
+  if (keycode == VKEY_UNKNOWN) {
+    unsigned int keyval =
+        DefaultXKeysymFromHardwareKeycode(event->hardware_keycode);
+    keycode = WindowsKeyCodeForGdkKeyCode(keyval);
+  }
+#endif
+  return keycode;
+}
+
 }  // namespace ui