| Index: ash/accelerators/accelerator_table.cc
|
| diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
|
| index 35888ede8d3a993d98176bcfa600d09b68f7788f..f474aed0a6bfc881251ff0410325a191cab005da 100644
|
| --- a/ash/accelerators/accelerator_table.cc
|
| +++ b/ash/accelerators/accelerator_table.cc
|
| @@ -238,6 +238,10 @@ const AcceleratorData kDebugAcceleratorData[] = {
|
| DEBUG_TOGGLE_UNIFIED_DESKTOP},
|
| {true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
|
| TOGGLE_MIRROR_MODE},
|
| + {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
|
| + TOGGLE_TOUCH_PAD},
|
| + {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
|
| + TOGGLE_TOUCH_SCREEN},
|
| {true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI},
|
| // Extra shortcut for display swapping as alt-f4 is taken on linux desktop.
|
| {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| @@ -326,6 +330,8 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
|
| KEYBOARD_BRIGHTNESS_UP,
|
| TOGGLE_CAPS_LOCK,
|
| TOGGLE_SPOKEN_FEEDBACK,
|
| + TOGGLE_TOUCH_PAD,
|
| + TOGGLE_TOUCH_SCREEN,
|
| TOGGLE_TOUCH_VIEW_TESTING,
|
| TOGGLE_MIRROR_MODE,
|
| TOGGLE_WIFI,
|
| @@ -383,6 +389,8 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
|
| TOGGLE_CAPS_LOCK,
|
| TOGGLE_MIRROR_MODE,
|
| TOGGLE_SPOKEN_FEEDBACK,
|
| + TOGGLE_TOUCH_PAD,
|
| + TOGGLE_TOUCH_SCREEN,
|
| TOGGLE_WIFI,
|
| VOLUME_DOWN,
|
| VOLUME_MUTE,
|
| @@ -412,6 +420,8 @@ const AcceleratorAction kNonrepeatableActions[] = {
|
| WINDOW_MINIMIZE,
|
| #if defined(OS_CHROMEOS)
|
| LOCK_SCREEN,
|
| + TOGGLE_TOUCH_PAD,
|
| + TOGGLE_TOUCH_SCREEN,
|
| #endif
|
| };
|
|
|
| @@ -449,6 +459,8 @@ const AcceleratorAction kActionsAllowedInAppMode[] = {
|
| TOGGLE_CAPS_LOCK,
|
| TOGGLE_MIRROR_MODE,
|
| TOGGLE_SPOKEN_FEEDBACK,
|
| + TOGGLE_TOUCH_PAD,
|
| + TOGGLE_TOUCH_SCREEN,
|
| TOGGLE_WIFI,
|
| TOUCH_HUD_CLEAR,
|
| VOLUME_DOWN,
|
| @@ -494,6 +506,8 @@ const AcceleratorAction kActionsKeepingMenuOpen[] = {
|
| SILENCE_SPOKEN_FEEDBACK,
|
| TOGGLE_CAPS_LOCK,
|
| TOGGLE_SPOKEN_FEEDBACK,
|
| + TOGGLE_TOUCH_PAD,
|
| + TOGGLE_TOUCH_SCREEN,
|
| TOGGLE_WIFI,
|
| VOLUME_DOWN,
|
| VOLUME_MUTE,
|
|
|