From 70dfa1f43de08da9e6556cf2bfc2c079f06f5f02 Mon Sep 17 00:00:00 2001
From: "yusukes@chromium.org"
<yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 25 Apr 2012 03:17:48 +0000
Subject: Add back accelerator labels for C-n and C-S-n to the wrench menu.
BUG=123856
BUG=120196
TEST=manual
Review URL: http://codereview.chromium.org/10155022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133856 0039d316-1c4b-4281-b951-d872f2087c98
---
ash/accelerators/accelerator_table.cc | 5 +++++
chrome/browser/ui/views/toolbar_view.cc | 11 +++++++++++
2 files changed, 16 insertions(+)
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index eb1c5c3..ba4bc29 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -34,8 +34,13 @@ const AcceleratorData kAcceleratorData[] = {
{ true, ui::VKEY_T, false, true, true, OPEN_CROSH },
#endif
{ true, ui::VKEY_Q, true, true, false, EXIT },
+
+ // When you change the shortcut for NEW_INCOGNITO_WINDOW or NEW_WINDOW,
+ // you also need to modify ToolbarView::GetAcceleratorForCommandId() in
+ // chrome/browser/ui/views/toolbar_view.cc.
{ true, ui::VKEY_N, true, true, false, NEW_INCOGNITO_WINDOW },
{ true, ui::VKEY_N, false, true, false, NEW_WINDOW },
+
{ true, ui::VKEY_F5, true, false, false, CYCLE_BACKWARD_LINEAR },
{ true, ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT },
{ true, ui::VKEY_F5, true, true, false, TAKE_PARTIAL_SCREENSHOT },
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 46a2eda..819e964 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -490,6 +490,17 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
case IDC_PASTE:
*accelerator = ui::Accelerator(ui::VKEY_V, false, true, false);
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
+ case IDC_NEW_WINDOW:
+ *accelerator = ui::Accelerator(ui::VKEY_N, false, true, false);
+ return true;
+ case IDC_NEW_INCOGNITO_WINDOW:
+ *accelerator = ui::Accelerator(ui::VKEY_N, true, true, false);
+ return true;
+#endif
}
// Else, we retrieve the accelerator information from the frame.
return GetWidget()->GetAccelerator(command_id, accelerator);
--
cgit v1.1