Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: ui/base/keycodes/keyboard_code_conversion_gtk.cc

Issue 7777006: Chrome Linux DRT nativeKeyCode helper #2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch for trys and landing. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/keycodes/keyboard_code_conversion_gtk.cc
diff --git ui/base/keycodes/keyboard_code_conversion_gtk.cc ui/base/keycodes/keyboard_code_conversion_gtk.cc
index c55476a..0eff5aa 100644
--- ui/base/keycodes/keyboard_code_conversion_gtk.cc
+++ ui/base/keycodes/keyboard_code_conversion_gtk.cc
@@ -625,9 +625,14 @@ int GdkNativeKeyCodeForWindowsKeyCode(KeyboardCode keycode, bool shift) {
int keyval = GdkKeyCodeForWindowsKeyCode(keycode, shift);
GdkKeymapKey* keys;
gint n_keys;
- if (keyval && gdk_keymap_get_entries_for_keyval(0, keyval, &keys, &n_keys))
- return keys[0].keycode;
- return 0;
+
+ int native_keycode = 0;
+ if (keyval && gdk_keymap_get_entries_for_keyval(0, keyval, &keys, &n_keys)) {
+ native_keycode = keys[0].keycode;
+ g_free(keys);
+ }
+
+ return native_keycode;
}
KeyboardCode KeyboardCodeFromGdkEventKey(GdkEventKey* event) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698