diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 23:19:48 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 23:19:48 +0000 |
| commit | 1f7a2d10e98bcb84e9d74f6c0f38b0f4dbfbd4fc (patch) | |
| tree | cd992bfb62389ee609592c30dbae9b645df34ff2 /chrome/browser/gtk/browser_window_gtk.cc | |
| parent | 0a73f2fd5b1392283e07682ebf938a14c6fe0e07 (diff) | |
| download | chromium_src-1f7a2d10e98bcb84e9d74f6c0f38b0f4dbfbd4fc.zip chromium_src-1f7a2d10e98bcb84e9d74f6c0f38b0f4dbfbd4fc.tar.gz chromium_src-1f7a2d10e98bcb84e9d74f6c0f38b0f4dbfbd4fc.tar.bz2 | |
Move toolbar hotkeys to BrowserWindowGtk.
BUG=14113
TEST=the navigation hotkeys now work in fullscreen mode. Make sure the follownig all work:
{ GDK_Left, IDC_BACK, GDK_MOD1_MASK },
{ GDK_BackSpace, IDC_BACK, GdkModifierType(0) },
{ XF86XK_Back, IDC_BACK, GdkModifierType(0) },
{ GDK_Right, IDC_FORWARD, GDK_MOD1_MASK },
{ GDK_BackSpace, IDC_FORWARD, GDK_SHIFT_MASK },
{ XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) },
{ GDK_r, IDC_RELOAD, GDK_CONTROL_MASK },
{ GDK_F5, IDC_RELOAD, GdkModifierType(0) },
{ GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK },
{ XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) },
{ XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) },
key: { button, action, modifier }, where MOD1 = alt
Review URL: http://codereview.chromium.org/145020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_window_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index fa3cbd7..372599b 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -171,11 +171,22 @@ const struct AcceleratorMapping { GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, { GDK_F3, IDC_FIND_PREVIOUS, GDK_SHIFT_MASK }, - // Navigation. + // Navigation / toolbar buttons. { GDK_Home, IDC_HOME, GDK_MOD1_MASK }, { XF86XK_HomePage, IDC_HOME, GdkModifierType(0) }, { GDK_Escape, IDC_STOP, GdkModifierType(0) }, { XF86XK_Stop, IDC_STOP, GdkModifierType(0) }, + { GDK_Left, IDC_BACK, GDK_MOD1_MASK }, + { GDK_BackSpace, IDC_BACK, GdkModifierType(0) }, + { XF86XK_Back, IDC_BACK, GdkModifierType(0) }, + { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK }, + { GDK_BackSpace, IDC_FORWARD, GDK_SHIFT_MASK }, + { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, + { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, + { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, + { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, + { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, + { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, // Miscellany. { GDK_d, IDC_STAR, GDK_CONTROL_MASK }, |