diff options
author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 09:20:13 +0000 |
---|---|---|
committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 09:20:13 +0000 |
commit | 75964f7f56a4c7f6553ed5b78e86c95725643e26 (patch) | |
tree | 64342cab9972090385df95ecc1008168d9b2c7d7 /chrome/browser/autocomplete | |
parent | c250d0224a2ff6befb6a1692f2ed596b09f17447 (diff) | |
download | chromium_src-75964f7f56a4c7f6553ed5b78e86c95725643e26.zip chromium_src-75964f7f56a4c7f6553ed5b78e86c95725643e26.tar.gz chromium_src-75964f7f56a4c7f6553ed5b78e86c95725643e26.tar.bz2 |
Initial work on Linux tab to search.
Still are a bunch of more complicated behavior that doesn't work, like hitting
backspace to remove the keyword. The keyword hint and keyword display more or
less work, although things have gotten pretty complicated.
BUG=10965
TEST=Tab to search with a keyword.
Review URL: http://codereview.chromium.org/151209
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 1ee5a15..1baabef 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -459,6 +459,7 @@ gboolean AutocompleteEditViewGtk::HandleKeyPress(GtkWidget* widget, if (event->keyval == GDK_Return || event->keyval == GDK_ISO_Enter || event->keyval == GDK_KP_Enter || + event->keyval == GDK_Tab || (event->keyval == GDK_Escape && event->state == 0)) { // Handle IME. This is basically taken from GtkTextView and reworked a bit. GtkTextIter iter; @@ -475,7 +476,13 @@ gboolean AutocompleteEditViewGtk::HandleKeyPress(GtkWidget* widget, } } else { // Ok, not handled by the IME, we can handle it. - if (event->keyval == GDK_Escape) { + if (event->keyval == GDK_Tab) { + if (model_->is_keyword_hint() && !model_->keyword().empty()) { + model_->AcceptKeyword(); + } else { + return FALSE; // Let GtkTextView handle the tab focus change. + } + } else if (event->keyval == GDK_Escape) { model_->OnEscapeKeyPressed(); } else { bool alt_held = (event->state & GDK_MOD1_MASK); |