summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 21:38:11 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 21:38:11 +0000
commit69a4b1aad922997400258ad7e403441ee1ea448b (patch)
tree2dc672b8417a4e3807ac5e75637a6f0febee00db /chrome/browser/autocomplete
parentf447bb62ff93799dc10d56649b6b2c194f1918be (diff)
downloadchromium_src-69a4b1aad922997400258ad7e403441ee1ea448b.zip
chromium_src-69a4b1aad922997400258ad7e403441ee1ea448b.tar.gz
chromium_src-69a4b1aad922997400258ad7e403441ee1ea448b.tar.bz2
GTK: respect control key for setting TLD=com.
BUG=13096 Review URL: http://codereview.chromium.org/118086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 272e5ab..16810ae 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -391,6 +391,8 @@ 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.
@@ -398,6 +400,10 @@ 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.
@@ -436,7 +442,10 @@ gboolean AutocompleteEditViewGtk::HandleViewButtonPress(GdkEventButton* event) {
}
gboolean AutocompleteEditViewGtk::HandleViewFocusIn() {
- model_->OnSetFocus(false);
+ GdkModifierType modifiers;
+ gdk_window_get_pointer(text_view_->window, NULL, NULL, &modifiers);
+
+ model_->OnSetFocus(modifiers & GDK_CONTROL_MASK);
// TODO(deanm): Some keyword hit business, etc here.
return FALSE; // Continue propagation.