Chromium Code Reviews| Index: ash/accelerators/accelerator_controller.cc |
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
| index 6233651044b559803d365717433535ad79c6bd5e..99496ac28113855854c2fc5746d6c712dc1b62db 100644 |
| --- a/ash/accelerators/accelerator_controller.cc |
| +++ b/ash/accelerators/accelerator_controller.cc |
| @@ -359,6 +359,11 @@ bool AcceleratorController::PerformAction(int action, |
| // this key combination is reserved for partial screenshot. |
| return true; |
| case TOGGLE_APP_LIST: |
| + // When spoken feedback is enabled, we should neither toggle the list nor |
| + // consume the key since Search+Shift is one of the shortcuts the a11y |
| + // feature uses. crbug.com/132296 |
| + if (Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled()) |
|
Zachary Kuznia
2012/06/14 10:02:22
Perhaps we should DCHECK that the accelerator bein
Yusuke Sato
2012/06/14 11:41:40
Done.
|
| + return false; |
| ash::Shell::GetInstance()->ToggleAppList(); |
| return true; |
| case TOGGLE_CAPS_LOCK: |