summaryrefslogtreecommitdiffstats
path: root/ui/base/keycodes
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-01 23:52:58 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-01 23:52:58 +0000
commit4341fbfc1bdeae9ff10819702fab77e100a38fca (patch)
treece23cce93e90eccd90320f13c51eac1dd836391d /ui/base/keycodes
parent9ac32ff8cdf76aa1bb2e4a27f2def96d8e1ba594 (diff)
downloadchromium_src-4341fbfc1bdeae9ff10819702fab77e100a38fca.zip
chromium_src-4341fbfc1bdeae9ff10819702fab77e100a38fca.tar.gz
chromium_src-4341fbfc1bdeae9ff10819702fab77e100a38fca.tar.bz2
Add missing mappings for Japanese _ and \ keys under Linux.
BUG=222583 Review URL: https://chromiumcodereview.appspot.com/13263004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/keycodes')
-rw-r--r--ui/base/keycodes/usb_keycode_map.h4
-rw-r--r--ui/base/keycodes/usb_keycode_map_unittest.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/keycodes/usb_keycode_map.h b/ui/base/keycodes/usb_keycode_map.h
index 6549bf8..a5fca42 100644
--- a/ui/base/keycodes/usb_keycode_map.h
+++ b/ui/base/keycodes/usb_keycode_map.h
@@ -218,12 +218,12 @@ const usb_keymap usb_keycode_map[] = {
// USB#070086 is used on AS/400 keyboards. Standard Keypad_= is USB#070067.
//USB_KEYMAP(0x070086, 0x0000, 0x0000, 0xffff), // Keypad_=
// USB#070087 is used for Brazilian /? and Japanese _ 'ro'.
- USB_KEYMAP(0x070087, 0x0000, 0x0000, 0x005e), // International1
+ USB_KEYMAP(0x070087, 0x0061, 0x0000, 0x005e), // International1
// USB#070088 is used as Japanese Hiragana/Katakana key.
USB_KEYMAP(0x070088, 0x0065, 0x0000, 0x0068), // International2
// USB#070089 is used as Japanese Yen key.
- USB_KEYMAP(0x070089, 0x0000, 0x007d, 0x005d), // International3
+ USB_KEYMAP(0x070089, 0x0084, 0x007d, 0x005d), // International3
// USB#07008a is used as Japanese Henkan (Convert) key.
USB_KEYMAP(0x07008a, 0x0064, 0x0000, 0xffff), // International4
// USB#07008b is used as Japanese Muhenkan (No-convert) key.
diff --git a/ui/base/keycodes/usb_keycode_map_unittest.cc b/ui/base/keycodes/usb_keycode_map_unittest.cc
index 09e4258..46093bc5 100644
--- a/ui/base/keycodes/usb_keycode_map_unittest.cc
+++ b/ui/base/keycodes/usb_keycode_map_unittest.cc
@@ -13,7 +13,7 @@ namespace {
const size_t kExpectedMappedKeyCount = 138;
#define USB_KEYMAP(usb, xkb, win, mac) {usb, win}
#elif defined(OS_LINUX)
-const size_t kExpectedMappedKeyCount = 143;
+const size_t kExpectedMappedKeyCount = 145;
#define USB_KEYMAP(usb, xkb, win, mac) {usb, xkb}
#elif defined(OS_MACOSX)
const size_t kExpectedMappedKeyCount = 118;