summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 04:52:35 +0000
committersuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 04:52:35 +0000
commitd8475de9a2c88acdaac3a70a3b26537d0bcc62cf (patch)
tree41549efb4f17807b12330ebfa5f81d84171f6700
parent9f8abe1579063dc70ecfa66473b63761f6ca1070 (diff)
downloadchromium_src-d8475de9a2c88acdaac3a70a3b26537d0bcc62cf.zip
chromium_src-d8475de9a2c88acdaac3a70a3b26537d0bcc62cf.tar.gz
chromium_src-d8475de9a2c88acdaac3a70a3b26537d0bcc62cf.tar.bz2
[Linux] Handles Entery key correctly in find bar.
BUG=35219 TEST=See bug report. Review URL: http://codereview.chromium.org/600066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38875 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/find_bar_gtk.cc5
-rw-r--r--chrome/browser/gtk/find_bar_gtk.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index ee8d715..1ffa900 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -193,6 +193,7 @@ FindBarGtk::FindBarGtk(Browser* browser)
g_signal_connect(text_entry_, "button-press-event",
G_CALLBACK(OnButtonPress), this);
g_signal_connect(text_entry_, "move-cursor", G_CALLBACK(OnMoveCursor), this);
+ g_signal_connect(text_entry_, "activate", G_CALLBACK(OnActivate), this);
g_signal_connect(container_, "expose-event",
G_CALLBACK(OnExpose), this);
}
@@ -841,3 +842,7 @@ void FindBarGtk::OnMoveCursor(GtkEntry* entry, GtkMovementStep step, gint count,
gdk_event_free(event);
}
}
+
+void FindBarGtk::OnActivate(GtkEntry* entry, FindBarGtk* bar) {
+ bar->FindEntryTextInContents(true);
+}
diff --git a/chrome/browser/gtk/find_bar_gtk.h b/chrome/browser/gtk/find_bar_gtk.h
index 74df13b..abb7675 100644
--- a/chrome/browser/gtk/find_bar_gtk.h
+++ b/chrome/browser/gtk/find_bar_gtk.h
@@ -139,6 +139,9 @@ class FindBarGtk : public FindBar,
static void OnMoveCursor(GtkEntry* entry, GtkMovementStep step, gint count,
gboolean selection, FindBarGtk* bar);
+ // Handles Enter key.
+ static void OnActivate(GtkEntry* entry, FindBarGtk* bar);
+
Browser* browser_;
BrowserWindowGtk* window_;