Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

Issue 42074: Hookup the escape key on Linux Omnibox to revert to the permanent text (like Windows). (Closed)
Patch Set: merge tro trunk Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index b7d2552bff31e35030691643f373a13d5c264ec7..a22914b354cd193535f88bc95e340bccaf247ff2 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -88,7 +88,7 @@ void AutocompleteEditViewGtk::Init() {
G_CALLBACK(&HandleBeginUserActionThunk), this);
g_signal_connect(text_buffer_, "end-user-action",
G_CALLBACK(&HandleEndUserActionThunk), this);
- // We connect to key press and release for special handling of the enter key.
+ // We connect to key press and release for special handling of a few keys.
g_signal_connect(text_view_, "key-press-event",
G_CALLBACK(&HandleKeyPressThunk), this);
g_signal_connect(text_view_, "key-release-event",
@@ -336,6 +336,10 @@ gboolean AutocompleteEditViewGtk::HandleKeyPress(GtkWidget* widget,
model_->AcceptInput(alt_held ? NEW_FOREGROUND_TAB : CURRENT_TAB, false);
return TRUE; // Don't propagate into GtkTextView.
}
+ if (event->keyval == GDK_Escape && event->state == 0) {
+ model_->OnEscapeKeyPressed();
+ return TRUE; // Don't propagate into GtkTextView.
+ }
return FALSE; // Propagate into GtkTextView.
}
@@ -344,7 +348,8 @@ gboolean AutocompleteEditViewGtk::HandleKeyRelease(GtkWidget* widget,
// We ate the press, might as well eat the release.
if (event->keyval == GDK_Return ||
event->keyval == GDK_ISO_Enter ||
- event->keyval == GDK_KP_Enter) {
+ event->keyval == GDK_KP_Enter ||
+ (event->keyval == GDK_Escape && event->state == 0)) {
return TRUE; // Don't propagate into GtkTextView.
}
return FALSE; // Propagate into GtkTextView.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698