| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 6233651044b559803d365717433535ad79c6bd5e..0eaea8d9283ab8a0239ef6f2392af4157e88aaa3 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -32,6 +32,7 @@
|
| #include "ui/aura/root_window.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
| #include "ui/base/accelerators/accelerator_manager.h"
|
| +#include "ui/base/keycodes/keyboard_codes.h"
|
| #include "ui/compositor/debug_utils.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/layer_animation_sequence.h"
|
| @@ -359,6 +360,12 @@ 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
|
| + DCHECK_EQ(ui::VKEY_LWIN, accelerator.key_code());
|
| + if (Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled())
|
| + return false;
|
| ash::Shell::GetInstance()->ToggleAppList();
|
| return true;
|
| case TOGGLE_CAPS_LOCK:
|
|
|