summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 01:02:46 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 01:02:46 +0000
commitbc2fc85e5f1c0d24e4d597837017c1dfbfe3ab22 (patch)
treed6db81ea004c1995ce12e53e842e7589c7161387 /chrome
parente8c7f632ed1d0e66eb368c04b99800efb2b70282 (diff)
downloadchromium_src-bc2fc85e5f1c0d24e4d597837017c1dfbfe3ab22.zip
chromium_src-bc2fc85e5f1c0d24e4d597837017c1dfbfe3ab22.tar.gz
chromium_src-bc2fc85e5f1c0d24e4d597837017c1dfbfe3ab22.tar.bz2
GTK: Don't let the page widget(s) handle key events that webkit didn't handle.
BUG=21165 Review URL: http://codereview.chromium.org/201047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index c0a6b61..a7e4d44 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -583,17 +583,13 @@ void BrowserWindowGtk::HandleKeyboardEvent(GdkEventKey* event) {
// Handles a key event in following sequence:
// 1. Our special key accelerators, such as ctrl-tab, etc.
// 2. Gtk mnemonics and accelerators.
- // 3. Gtk binding set.
// This sequence matches the default key press handler of GtkWindow.
//
- // It's not necessary to care about the keyboard layout issue, as
- // gtk_window_activate_key() and gtk_bindings_activate_event() take care of it
- // automatically.
+ // It's not necessary to care about the keyboard layout, as
+ // gtk_window_activate_key() takes care of it automatically.
if (!HandleCustomAccelerator(event->keyval, GdkModifierType(event->state),
browser_.get())) {
- if (!gtk_window_activate_key(window_, event)) {
- gtk_bindings_activate_event(GTK_OBJECT(window_), event);
- }
+ gtk_window_activate_key(window_, event);
}
}