Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(828)

Unified Diff: chrome/browser/ui/views/accelerator_table.cc

Issue 10414064: Handle more browser commands in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build of ShellDelegateImpl Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/tab_restore_service.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/accelerator_table.cc
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index 0b85d27501e1d2b89a11e712f9976772c203f42c..2f27ce08026d996bcc9573780104348d75793304 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -39,7 +39,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#if !defined(OS_CHROMEOS)
{ ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW },
#endif
-#if !defined(USE_AURA)
+#if !defined(USE_ASH)
{ ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT },
#endif
{ ui::VKEY_F, ui::EF_CONTROL_DOWN, IDC_FIND },
@@ -98,9 +98,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#if !defined(USE_ASH)
{ ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
IDC_NEW_INCOGNITO_WINDOW },
-#endif
{ ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB },
-#if !defined(USE_ASH)
{ ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW },
#endif
{ ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE },
@@ -119,7 +117,9 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE },
#endif
{ ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME },
+#if !defined(USE_ASH)
{ ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB },
+#endif
{ ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
{ ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
{ ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
@@ -156,7 +156,9 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SHOW_AVATAR_MENU},
#endif
{ ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP },
+#if !defined(USE_ASH)
{ ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER },
+#endif
{ ui::VKEY_OEM_PERIOD, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
IDC_TOGGLE_SPEECH_INPUT },
{ ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE },
« no previous file with comments | « chrome/browser/sessions/tab_restore_service.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698