| Index: ash/accelerators/accelerator_table.cc
|
| diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
|
| index 86c11273fec10b8a3912fe2bdde3edd69443cdb3..80051a5bb81219a17515ba73ce988fa2d06af9e2 100644
|
| --- a/ash/accelerators/accelerator_table.cc
|
| +++ b/ash/accelerators/accelerator_table.cc
|
| @@ -75,8 +75,6 @@ const AcceleratorData kAcceleratorData[] = {
|
| #if !defined(OS_WIN)
|
| { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
|
| #endif
|
| - { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| - TOGGLE_SPOKEN_FEEDBACK },
|
| { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| TOUCH_HUD_MODE_CHANGE },
|
| { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
|
| @@ -159,6 +157,17 @@ const AcceleratorData kAcceleratorData[] = {
|
| { true, ui::VKEY_U, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
|
| PRINT_UI_HIERARCHIES },
|
|
|
| + // Accessibility: Spoken feedback shortcuts. The first one is to toggle
|
| + // spoken feedback on or off. The others are only valid when
|
| + // spoken feedback is enabled.
|
| + { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| + TOGGLE_SPOKEN_FEEDBACK },
|
| + { true, ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK},
|
| + { false, ui::VKEY_HOME, ui::EF_SHIFT_DOWN, ACCESSIBLE_PREVIOUS},
|
| + { false, ui::VKEY_PRIOR, ui::EF_SHIFT_DOWN, ACCESSIBLE_PREVIOUS},
|
| + { false, ui::VKEY_END, ui::EF_SHIFT_DOWN, ACCESSIBLE_NEXT},
|
| + { false, ui::VKEY_NEXT, ui::EF_SHIFT_DOWN, ACCESSIBLE_NEXT},
|
| +
|
| // TODO(yusukes): Handle VKEY_MEDIA_STOP, and
|
| // VKEY_MEDIA_LAUNCH_MAIL.
|
| };
|
|
|