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

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

Issue 10414064: Handle more browser commands in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/ui/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index b24f07004ba3db70d5397c196abacbefd0d72f5c..e1ea10bc0c62f6c7b53c31b695c93b4f1de29802 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -501,9 +501,18 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
*accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
return true;
#if defined(USE_ASH)
- // When USE_ASH is defined, IDC_NEW_WINDOW and IDC_NEW_INCOGNITO_WINDOW are
- // handled outside Chrome, in ash/accelerators/accelerator_table.cc.
- // crbug.com/120196
+ // When USE_ASH is defined, the commands listed here are handled outside
+ // Chrome, in ash/accelerators/accelerator_table.cc (crbug.com/120196).
+ case IDC_CLEAR_BROWSING_DATA:
+ *accelerator = ui::Accelerator(ui::VKEY_BACK,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+ return true;
+ case IDC_HELP_PAGE:
+ *accelerator = ui::Accelerator(ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN);
+ return true;
+ case IDC_NEW_TAB:
+ *accelerator = ui::Accelerator(ui::VKEY_T, ui::EF_CONTROL_DOWN);
+ return true;
case IDC_NEW_WINDOW:
*accelerator = ui::Accelerator(ui::VKEY_N, ui::EF_CONTROL_DOWN);
return true;
@@ -511,6 +520,19 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
*accelerator = ui::Accelerator(ui::VKEY_N,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
return true;
+ case IDC_SHOW_BOOKMARK_MANAGER:
+ *accelerator = ui::Accelerator(ui::VKEY_O,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+ return true;
+ case IDC_SHOW_DOWNLOADS:
+ *accelerator = ui::Accelerator(ui::VKEY_J, ui::EF_CONTROL_DOWN);
+ return true;
+ case IDC_SHOW_HISTORY:
+ *accelerator = ui::Accelerator(ui::VKEY_H, ui::EF_CONTROL_DOWN);
+ return true;
+ case IDC_TASK_MANAGER:
+ *accelerator = ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN);
+ return true;
#endif
}
// Else, we retrieve the accelerator information from the frame.

Powered by Google App Engine
This is Rietveld 408576698