summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 21:42:55 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 21:42:55 +0000
commit7867dfea46fbb8a030b02290d779ad58ce7632d7 (patch)
tree829b57d9e774cf2b5213376f10987fbb8dff808e /chrome/browser/gtk
parenta84b9cbcda361e8c262f8de5588e133ba214cee9 (diff)
downloadchromium_src-7867dfea46fbb8a030b02290d779ad58ce7632d7.zip
chromium_src-7867dfea46fbb8a030b02290d779ad58ce7632d7.tar.gz
chromium_src-7867dfea46fbb8a030b02290d779ad58ce7632d7.tar.bz2
Unbreak accelerators, and add ctrl+_ for zoom out.
Review URL: http://codereview.chromium.org/87041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index cf86cf0..4e0618c 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -112,9 +112,13 @@ const struct AcceleratorMapping {
{ GDK_Page_Down, IDC_SELECT_NEXT_TAB, GDK_CONTROL_MASK },
{ GDK_Page_Up, IDC_SELECT_PREVIOUS_TAB, GDK_CONTROL_MASK },
{ GDK_w, IDC_CLOSE_TAB, GDK_CONTROL_MASK },
- { GDK_plus, IDC_ZOOM_PLUS, GDK_CONTROL_MASK },
+ { GDK_plus, IDC_ZOOM_PLUS,
+ GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
+ { GDK_equal, IDC_ZOOM_PLUS, GDK_CONTROL_MASK },
{ GDK_0, IDC_ZOOM_NORMAL, GDK_CONTROL_MASK },
{ GDK_minus, IDC_ZOOM_MINUS, GDK_CONTROL_MASK },
+ { GDK_underscore, IDC_ZOOM_MINUS,
+ GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
};
int GetCommandFromKeyval(guint accel_key) {