| Index: ash/accelerators/accelerator_table.cc
|
| diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
|
| index 1807bcd85206bf971894fa177509a639ea365e1b..3c7f2d89c698d003dd219b8d78f596f367c3f3f6 100644
|
| --- a/ash/accelerators/accelerator_table.cc
|
| +++ b/ash/accelerators/accelerator_table.cc
|
| @@ -37,8 +37,7 @@ const AcceleratorData kAcceleratorData[] = {
|
| // Shortcut for Koren IME.
|
| { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME },
|
|
|
| - { true, ui::VKEY_TAB,
|
| - ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
|
| + { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
|
| { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
|
| CYCLE_BACKWARD_MRU },
|
| { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
|
| @@ -122,6 +121,13 @@ const AcceleratorData kAcceleratorData[] = {
|
| { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE },
|
| { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE },
|
|
|
| + // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, and
|
| + // VKEY_MEDIA_LAUNCH_MAIL.
|
| +};
|
| +
|
| +const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
|
| +
|
| +const AcceleratorData kDebugAcceleratorData[] = {
|
| { true, ui::VKEY_F3,
|
| ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| ROTATE_WINDOWS },
|
| @@ -144,12 +150,9 @@ const AcceleratorData kAcceleratorData[] = {
|
| { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| PRINT_WINDOW_HIERARCHY },
|
| #endif
|
| -
|
| - // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, and
|
| - // VKEY_MEDIA_LAUNCH_MAIL.
|
| };
|
|
|
| -const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
|
| +const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
|
|
|
| const AcceleratorAction kReservedActions[] = {
|
| // Window cycling accelerators.
|
|
|