diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 10:25:45 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 10:25:45 +0000 |
| commit | cb29a9abf8e0ec962126eff175c5c965e7609e17 (patch) | |
| tree | a00b7717ff75016653fec1d4674b385265edfa1e /chrome/browser/autocomplete | |
| parent | 1c9ebc10871e12f5b48e15e9a07bf91e8b6ee12e (diff) | |
| download | chromium_src-cb29a9abf8e0ec962126eff175c5c965e7609e17.zip chromium_src-cb29a9abf8e0ec962126eff175c5c965e7609e17.tar.gz chromium_src-cb29a9abf8e0ec962126eff175c5c965e7609e17.tar.bz2 | |
Revert a ctrl-enter change for Omnibox, it made inline autocomplete totally crazy.
For example, pressing ctrl while you have an inline autocomplete toggles the autocomplete
on and off, etc.
commit 51b37c5ce628836b22f68aa94ad871ce8cb1f66b
Author: estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon Jun 1 21:38:11 2009 +0000
GTK: respect control key for setting TLD=com.
BUG=13096
Review URL: http://codereview.chromium.org/118086
git-svn-id: svn://chrome-svn/chrome/trunk/src@17356 0039d316-1c4b-4281-b951-d872f2087c98
Review URL: http://codereview.chromium.org/119169
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 16810ae..272e5ab 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -391,8 +391,6 @@ gboolean AutocompleteEditViewGtk::HandleKeyPress(GtkWidget* widget, } } return TRUE; // Don't propagate into GtkTextView. - } else if (event->keyval == GDK_Control_L || event->keyval == GDK_Control_R) { - model_->OnControlKeyChanged(true); } return FALSE; // Propagate into GtkTextView. @@ -400,10 +398,6 @@ gboolean AutocompleteEditViewGtk::HandleKeyPress(GtkWidget* widget, gboolean AutocompleteEditViewGtk::HandleKeyRelease(GtkWidget* widget, GdkEventKey* event) { - if (event->keyval == GDK_Control_L || event->keyval == GDK_Control_R) { - model_->OnControlKeyChanged(false); - } - // Even though we handled the press ourselves, let GtkTextView handle the // release. It shouldn't do anything particularly interesting, but it will // handle the IME work for us. @@ -442,10 +436,7 @@ gboolean AutocompleteEditViewGtk::HandleViewButtonPress(GdkEventButton* event) { } gboolean AutocompleteEditViewGtk::HandleViewFocusIn() { - GdkModifierType modifiers; - gdk_window_get_pointer(text_view_->window, NULL, NULL, &modifiers); - - model_->OnSetFocus(modifiers & GDK_CONTROL_MASK); + model_->OnSetFocus(false); // TODO(deanm): Some keyword hit business, etc here. return FALSE; // Continue propagation. |