diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 03:16:57 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 03:16:57 +0000 |
| commit | 343dc066bfe7fdef978142bd47753ba28536219c (patch) | |
| tree | b918d2b7d52a91f1546e4cefcee9b38b24620676 /ash/accelerators/accelerator_table.cc | |
| parent | 5f6259d5aa9bb29f15db051a3c6be3d78b82e1db (diff) | |
| download | chromium_src-343dc066bfe7fdef978142bd47753ba28536219c.zip chromium_src-343dc066bfe7fdef978142bd47753ba28536219c.tar.gz chromium_src-343dc066bfe7fdef978142bd47753ba28536219c.tar.bz2 | |
Handle more browser commands in ash.
This CL modifies the shell accelerator controller to handle the shortcuts for
the following browser commands so that they work with no browser window shown.
- IDC_NEW_TAB
- IDC_RESTORE_TAB
- IDC_SHOW_BOOKMARK_MANAGER
BUG=124232,120642
TEST=Checked all the shortcuts worked properly with no browser window shown. aura_shell_unittests
Review URL: https://chromiumcodereview.appspot.com/10414064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_table.cc')
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index 0800a90..b053241 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -38,14 +38,17 @@ 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 NEW_INCOGNITO_WINDOW, NEW_WINDOW, or + // NEW_TAB, you also need to modify + // ToolbarView::GetAcceleratorForCommandId() in // chrome/browser/ui/views/toolbar_view.cc. { 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_T, ui::EF_CONTROL_DOWN, NEW_TAB }, { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR }, + { 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 +73,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 }, |