| Index: ash/accelerators/accelerator_table.cc
|
| diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
|
| index 225ad90b49f256a19176212baa9fbfd8502a9352..037dbcfacac3f47bea7c3ce33c98cfe8d2ea6a53 100644
|
| --- a/ash/accelerators/accelerator_table.cc
|
| +++ b/ash/accelerators/accelerator_table.cc
|
| @@ -38,14 +38,27 @@ const AcceleratorData kAcceleratorData[] = {
|
| { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| TOGGLE_SPOKEN_FEEDBACK },
|
|
|
| - // When you change the shortcut for NEW_INCOGNITO_WINDOW or NEW_WINDOW,
|
| - // you also need to modify ToolbarView::GetAcceleratorForCommandId() in
|
| + // When you change the shortcuts for the commands listed below from NEW_TAB
|
| + // to OPEN_HISTORY, you also need to modify
|
| + // ToolbarView::GetAcceleratorForCommandId() in
|
| // chrome/browser/ui/views/toolbar_view.cc.
|
| + { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
|
| { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| NEW_INCOGNITO_WINDOW },
|
| { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
|
| + { true, ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + OPEN_BOOKMARK_MANAGER },
|
| + { true, ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + OPEN_CLEAR_BROWSING_DATA },
|
| + { true, ui::VKEY_J, ui::EF_CONTROL_DOWN, OPEN_DOWNLOADS },
|
| + { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, OPEN_HELP_PAGE },
|
| + { true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + OPEN_HELP_PAGE },
|
| + { true, ui::VKEY_H, ui::EF_CONTROL_DOWN, OPEN_HISTORY },
|
|
|
| { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR },
|
| + { true, ui::VKEY_HOME, ui::EF_ALT_DOWN, OPEN_HOME },
|
| + { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
|
| { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
|
| { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| TAKE_PARTIAL_SCREENSHOT },
|
| @@ -70,6 +83,7 @@ const AcceleratorData kAcceleratorData[] = {
|
| ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
|
| SHOW_KEYBOARD_OVERLAY },
|
| { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK },
|
| + { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER },
|
| { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 },
|
| { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 },
|
| { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 },
|
|
|