diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 19:37:55 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 19:37:55 +0000 |
| commit | bc9e271112139a38fb81c38f00809a8a6d496542 (patch) | |
| tree | 0eb67d503958b2cd91107fc4435189b3df656841 /chrome/browser/autocomplete | |
| parent | b475c0507c663dfbd8d711f11f8394a3c6910f75 (diff) | |
| download | chromium_src-bc9e271112139a38fb81c38f00809a8a6d496542.zip chromium_src-bc9e271112139a38fb81c38f00809a8a6d496542.tar.gz chromium_src-bc9e271112139a38fb81c38f00809a8a6d496542.tar.bz2 | |
GTK: Handle some accelerators after the focused widget has had a chance to handle the keypress.
Also, don't try to give the browser commands that are disabled.
----
(this description may need to be re-written)
BUG=11526
Review URL: http://codereview.chromium.org/113050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 566c8d2..b1d0791 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -13,6 +13,7 @@ #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h" +#include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/location_bar_view_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/toolbar_model.h" @@ -352,6 +353,24 @@ void AutocompleteEditViewGtk::HandleEndUserAction() { gboolean AutocompleteEditViewGtk::HandleKeyPress(GtkWidget* widget, GdkEventKey* event) { + GdkModifierType modifier = GdkModifierType( + event->state & gtk_accelerator_get_default_mod_mask()); + + // We want to let the browser handle ctrl-pgup and ctrl-pgdn. + if ((event->keyval == GDK_Page_Up || event->keyval == GDK_Page_Down) && + modifier == GDK_CONTROL_MASK) { + GtkWidget* window = gtk_widget_get_toplevel(widget); + if (!window) { + NOTREACHED(); + } else { + BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>( + g_object_get_data(G_OBJECT(window), "browser_window_gtk")); + browser_window->HandleAccelerator(event->keyval, + static_cast<GdkModifierType>(event->state)); + return TRUE; + } + } + // This is very similar to the special casing of the return key in the // GtkTextView key_press default handler. TODO(deanm): We do however omit // some IME related code, this might become a problem if an IME wants to |