summaryrefslogtreecommitdiffstats
path: root/ui/base/keycodes
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 19:02:04 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 19:02:04 +0000
commit7a34006a7c4b49732e90961ed5b120e7f2f63cc2 (patch)
tree3aab13bf5ca48ea4db99b02d7b525440521abc32 /ui/base/keycodes
parent6809a47c25a3da81a3d44b9360dfcec3cc9e5fa3 (diff)
downloadchromium_src-7a34006a7c4b49732e90961ed5b120e7f2f63cc2.zip
chromium_src-7a34006a7c4b49732e90961ed5b120e7f2f63cc2.tar.gz
chromium_src-7a34006a7c4b49732e90961ed5b120e7f2f63cc2.tar.bz2
Make KEY_WLAN toggle Wi-Fi enable/disable.
BUG=139039 TEST=Check KEY_WLAN (Fn+F11) toggles Wi-Fi on Parrot. Review URL: https://chromiumcodereview.appspot.com/10830346 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/keycodes')
-rw-r--r--ui/base/keycodes/keyboard_code_conversion_x.cc4
-rw-r--r--ui/base/keycodes/keyboard_codes_posix.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index 82df83f..2bfedb8 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/base/keycodes/keyboard_code_conversion_x.cc
@@ -386,6 +386,8 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
case XF86XK_LaunchB: // F4 on an Apple keyboard.
case XF86XK_Calculator:
return VKEY_MEDIA_LAUNCH_APP2;
+ case XF86XK_WLAN:
+ return VKEY_WLAN;
case XF86XK_MonBrightnessDown:
return VKEY_BRIGHTNESS_DOWN;
case XF86XK_MonBrightnessUp:
@@ -740,6 +742,8 @@ int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift) {
return XF86XK_LaunchA;
case VKEY_MEDIA_LAUNCH_APP2:
return XF86XK_LaunchB;
+ case VKEY_WLAN:
+ return XF86XK_WLAN;
case VKEY_BRIGHTNESS_DOWN:
return XF86XK_MonBrightnessDown;
case VKEY_BRIGHTNESS_UP:
diff --git a/ui/base/keycodes/keyboard_codes_posix.h b/ui/base/keycodes/keyboard_codes_posix.h
index bfbbacb..697a9f3 100644
--- a/ui/base/keycodes/keyboard_codes_posix.h
+++ b/ui/base/keycodes/keyboard_codes_posix.h
@@ -206,8 +206,9 @@ enum KeyboardCode {
VKEY_OEM_CLEAR = 0xFE,
VKEY_UNKNOWN = 0,
- // POSIX specific VKEYs. Note that as of Windows SDK 7.1, 0xD8-DA and 0xE8 are
- // unassigned.
+ // POSIX specific VKEYs. Note that as of Windows SDK 7.1, 0x97-9F, 0xD8-DA,
+ // and 0xE8 are unassigned.
+ VKEY_WLAN = 0x97,
VKEY_BRIGHTNESS_DOWN = 0xD8,
VKEY_BRIGHTNESS_UP = 0xD9,
VKEY_KBD_BRIGHTNESS_DOWN = 0xDA,