| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index b18d0a01a1af496ea7a3b0be59fe3279badddfaa..f7e1e9e46c4d25a9565a190be80202be6520fb16 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -986,6 +986,8 @@ bool AcceleratorController::CanPerformAction(
|
| return CanHandlePositionCenter();
|
| #if defined(OS_CHROMEOS)
|
| case DEBUG_ADD_REMOVE_DISPLAY:
|
| + case DEBUG_TOGGLE_TOUCH_PAD:
|
| + case DEBUG_TOGGLE_TOUCH_SCREEN:
|
| case DEBUG_TOGGLE_UNIFIED_DESKTOP:
|
| return debug::DebugAcceleratorsEnabled();
|
| case DISABLE_CAPS_LOCK:
|
| @@ -1242,8 +1244,8 @@ void AcceleratorController::PerformAction(AcceleratorAction action,
|
| HandleBrightnessUp(brightness_control_delegate_.get(), accelerator);
|
| break;
|
| case DEBUG_ADD_REMOVE_DISPLAY:
|
| - debug::PerformDebugActionIfEnabled(action);
|
| - break;
|
| + case DEBUG_TOGGLE_TOUCH_PAD:
|
| + case DEBUG_TOGGLE_TOUCH_SCREEN:
|
| case DEBUG_TOGGLE_UNIFIED_DESKTOP:
|
| debug::PerformDebugActionIfEnabled(action);
|
| break;
|
|
|