Commit 7a34006a authored by mazda@chromium.org's avatar mazda@chromium.org

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
parent 6809a47c
......@@ -42,6 +42,7 @@ const AcceleratorData kAcceleratorData[] = {
{ true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
{ true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
#if defined(OS_CHROMEOS)
{ true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI },
{ true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN },
{ true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP },
{ true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN },
......
......@@ -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:
......
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment