summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-13 02:33:38 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-13 02:33:38 +0000
commit3dfe42bc2a843a830245b008c84f71ab648dfa3e (patch)
tree974c700113f8fb6e1188cb6f5902a25ad332e856 /chrome
parent59e74fe3c5312b7f168a80c74ef09df808af746e (diff)
downloadchromium_src-3dfe42bc2a843a830245b008c84f71ab648dfa3e.zip
chromium_src-3dfe42bc2a843a830245b008c84f71ab648dfa3e.tar.gz
chromium_src-3dfe42bc2a843a830245b008c84f71ab648dfa3e.tar.bz2
Makes ctrl-shift-o show the bookmark manager on linux and windows.
BUG=48749 TEST=open chrome and make sure ctrl-shift-o shows the bookmark manager. R=sky@chromium.org,pkasting@chromium.org,evan@chromium.org Review URL: http://codereview.chromium.org/7344014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/chrome_dll.rc1
-rw-r--r--chrome/browser/ui/gtk/accelerators_gtk.cc2
-rw-r--r--chrome/browser/ui/views/accelerator_table_gtk.cc1
3 files changed, 4 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 67b4e04..a19366b 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -104,6 +104,7 @@ BEGIN
"8", IDC_SELECT_TAB_7, VIRTKEY, CONTROL
VK_NUMPAD8, IDC_SELECT_TAB_7, VIRTKEY, CONTROL
"B", IDC_SHOW_BOOKMARK_BAR, VIRTKEY, CONTROL, SHIFT
+ "O", IDC_SHOW_BOOKMARK_MANAGER, VIRTKEY, CONTROL, SHIFT
"J", IDC_SHOW_DOWNLOADS, VIRTKEY, CONTROL
"H", IDC_SHOW_HISTORY, VIRTKEY, CONTROL
"F", IDC_SHOW_APP_MENU, VIRTKEY, ALT
diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc
index f80b994..546870e 100644
--- a/chrome/browser/ui/gtk/accelerators_gtk.cc
+++ b/chrome/browser/ui/gtk/accelerators_gtk.cc
@@ -160,6 +160,8 @@ const struct AcceleratorMapping {
{ GDK_p, IDC_PRINT, GDK_CONTROL_MASK },
{ GDK_b, IDC_SHOW_BOOKMARK_BAR,
GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
+ { GDK_o, IDC_SHOW_BOOKMARK_MANAGER,
+ GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
{ GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) },
{ GDK_Delete, IDC_CLEAR_BROWSING_DATA,
GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
diff --git a/chrome/browser/ui/views/accelerator_table_gtk.cc b/chrome/browser/ui/views/accelerator_table_gtk.cc
index a2ac711..984d48f 100644
--- a/chrome/browser/ui/views/accelerator_table_gtk.cc
+++ b/chrome/browser/ui/views/accelerator_table_gtk.cc
@@ -137,6 +137,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_8, false, true, false, IDC_SELECT_TAB_7 },
{ ui::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 },
{ ui::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR },
+ { ui::VKEY_O, true, true, false, IDC_SHOW_BOOKMARK_MANAGER },
{ ui::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS },
{ ui::VKEY_H, false, true, false, IDC_SHOW_HISTORY },
{ ui::VKEY_F, false, false, true, IDC_SHOW_APP_MENU},