summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-13 01:13:34 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-13 01:13:34 +0000
commit19e69fe0cea5aee05b3aa68dd28110f01d33a3f5 (patch)
treec235469a143a259436aff6d1f0824639709ddd55 /chrome
parent575cb91efd5d33847656c72bb7ce6c3af45f71ff (diff)
downloadchromium_src-19e69fe0cea5aee05b3aa68dd28110f01d33a3f5.zip
chromium_src-19e69fe0cea5aee05b3aa68dd28110f01d33a3f5.tar.gz
chromium_src-19e69fe0cea5aee05b3aa68dd28110f01d33a3f5.tar.bz2
GTK: Fix refresh accelerators.
by Jacob Mandelson <jacob@mandelson.org> original review: http://codereview.chromium.org/127001 Review URL: http://codereview.chromium.org/125093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/browser_toolbar_gtk.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 13c9dbc..761bc66 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -124,12 +124,9 @@ void BrowserToolbarGtk::Init(Profile* profile,
reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD)));
- AddAcceleratorToButton(reload_->widget(),
- GDK_r, GDK_CONTROL_MASK);
- // Any modifier except alt can be combined with f5 (this matches windows
- // chromium).
- AddAcceleratorToButton(reload_->widget(),
- GDK_F5, GDK_MODIFIER_MASK & ~GDK_MOD1_MASK);
+ AddAcceleratorToButton(reload_->widget(), GDK_r, GDK_CONTROL_MASK);
+ AddAcceleratorToButton(reload_->widget(), GDK_F5, GdkModifierType(0));
+ AddAcceleratorToButton(reload_->widget(), GDK_F5, GDK_CONTROL_MASK);
home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME)));