Chromium Code Reviews| Index: ash/accelerators/accelerator_controller.cc |
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
| index b18d0a01a1af496ea7a3b0be59fe3279badddfaa..6af09961835451c17ecd003c8a5a8a6f3dffb92d 100644 |
| --- a/ash/accelerators/accelerator_controller.cc |
| +++ b/ash/accelerators/accelerator_controller.cc |
| @@ -647,6 +647,22 @@ void HandleToggleSpokenFeedback() { |
| ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_SHOW); |
| } |
| +#if defined(OS_CHROMEOS) |
| + |
| +void HandleToggleTouchpad() { |
| + base::RecordAction(UserMetricsAction("Accel_Toggle_Touchpad")); |
| + |
| + ash::Shell::GetInstance()->delegate()->ToggleTouchpad(); |
| +} |
| + |
| +void HandleToggleTouchscreen() { |
| + base::RecordAction(UserMetricsAction("Accel_Toggle_Touchscreen")); |
| + |
| + ash::Shell::GetInstance()->delegate()->ToggleTouchscreen(); |
| +} |
| + |
| +#endif // defined(OS_CHROMEOS) |
|
oshima
2015/10/29 23:38:43
move them to debug_commands.cc
afakhry
2015/10/30 05:18:03
Done.
|
| + |
| bool CanHandleToggleTouchViewTesting() { |
| return base::CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kAshEnableTouchViewTesting); |
| @@ -1056,6 +1072,8 @@ bool AcceleratorController::CanPerformAction( |
| case SWAP_PRIMARY_DISPLAY: |
| case TOGGLE_MIRROR_MODE: |
| case TOGGLE_SPOKEN_FEEDBACK: |
| + case TOGGLE_TOUCH_PAD: |
| + case TOGGLE_TOUCH_SCREEN: |
| case TOGGLE_WIFI: |
| case TOUCH_HUD_PROJECTION_TOGGLE: |
| case VOLUME_DOWN: |
| @@ -1312,6 +1330,12 @@ void AcceleratorController::PerformAction(AcceleratorAction action, |
| case TOGGLE_SPOKEN_FEEDBACK: |
| HandleToggleSpokenFeedback(); |
| break; |
| + case TOGGLE_TOUCH_PAD: |
| + HandleToggleTouchpad(); |
| + break; |
| + case TOGGLE_TOUCH_SCREEN: |
| + HandleToggleTouchscreen(); |
| + break; |
| case TOGGLE_TOUCH_VIEW_TESTING: |
| HandleToggleTouchViewTesting(); |
| break; |