diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 20:52:39 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 20:52:39 +0000 |
| commit | 41d59a808a1ca4084a8c5e0ce8ea2098ce110c57 (patch) | |
| tree | a5e5894d04ac1b28014ca4b45d4624f19b1e0325 /chrome/browser | |
| parent | b81c1f8dc1a6f4a3aeeb6c952ad98791b3ffaed8 (diff) | |
| download | chromium_src-41d59a808a1ca4084a8c5e0ce8ea2098ce110c57.zip chromium_src-41d59a808a1ca4084a8c5e0ce8ea2098ce110c57.tar.gz chromium_src-41d59a808a1ca4084a8c5e0ce8ea2098ce110c57.tar.bz2 | |
GTK: handle Escape in omnibox when numlock/scrolllock/caps lock is on.
BUG=18643
TEST=turn on num lock. Escape in omnibox resets the address.
Review URL: http://codereview.chromium.org/165079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index f356b74..5c82e05 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -535,7 +535,8 @@ gboolean AutocompleteEditViewGtk::HandleKeyPress(GtkWidget* widget, event->keyval == GDK_ISO_Enter || event->keyval == GDK_KP_Enter || event->keyval == GDK_Tab || - (event->keyval == GDK_Escape && event->state == 0)) { + (event->keyval == GDK_Escape && + (event->state & gtk_accelerator_get_default_mod_mask()) == 0)) { // Handle IME. This is basically taken from GtkTextView and reworked a bit. GtkTextIter iter; GtkTextView* text_view = GTK_TEXT_VIEW(text_view_); |