summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/find_bar_gtk.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 09:02:28 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 09:02:28 +0000
commite8dd34d01fdb366d9b72c4f9a43fd8152bcf4fe0 (patch)
tree9cc2a3748e5ab40e0633dd5d2af1dc8840140f58 /chrome/browser/ui/gtk/find_bar_gtk.cc
parent4315edf26260ee4b05d0170e890ef017615f3b71 (diff)
downloadchromium_src-e8dd34d01fdb366d9b72c4f9a43fd8152bcf4fe0.zip
chromium_src-e8dd34d01fdb366d9b72c4f9a43fd8152bcf4fe0.tar.gz
chromium_src-e8dd34d01fdb366d9b72c4f9a43fd8152bcf4fe0.tar.bz2
Change the EndSession param from bool to an enum to improve readability.
BUG=126468 TEST=None, should be no functional change and relying on already active automated tests. Review URL: https://chromiumcodereview.appspot.com/10356072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/find_bar_gtk.cc')
-rw-r--r--chrome/browser/ui/gtk/find_bar_gtk.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 1608ef0..08f2734 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -598,7 +598,7 @@ void FindBarGtk::FindEntryTextInContents(bool forward_search) {
false); // Not case sensitive.
} else {
// The textbox is empty so we reset.
- find_tab_helper->StopFinding(FindBarController::kClearSelection);
+ find_tab_helper->StopFinding(FindBarController::kClearSelectionOnPage);
UpdateUIForFindResult(find_tab_helper->find_result(), string16());
// Clearing the text box should also clear the prepopulate state so that
@@ -782,14 +782,16 @@ gboolean FindBarGtk::OnKeyPressEvent(GtkWidget* widget, GdkEventKey* event,
return TRUE;
} else if (GDK_Escape == event->keyval) {
find_bar->find_bar_controller_->EndFindSession(
- FindBarController::kKeepSelection, false);
+ FindBarController::kKeepSelectionOnPage,
+ FindBarController::kKeepResultsInFindBox);
return TRUE;
} else if (GDK_Return == event->keyval ||
GDK_KP_Enter == event->keyval) {
if ((event->state & gtk_accelerator_get_default_mod_mask()) ==
GDK_CONTROL_MASK) {
find_bar->find_bar_controller_->EndFindSession(
- FindBarController::kActivateSelection, false);
+ FindBarController::kActivateSelectionOnPage,
+ FindBarController::kClearResultsInFindBox);
return TRUE;
}
@@ -809,8 +811,9 @@ gboolean FindBarGtk::OnKeyReleaseEvent(GtkWidget* widget, GdkEventKey* event,
void FindBarGtk::OnClicked(GtkWidget* button) {
if (button == close_button_->widget()) {
- find_bar_controller_->EndFindSession(FindBarController::kKeepSelection,
- false);
+ find_bar_controller_->EndFindSession(
+ FindBarController::kKeepSelectionOnPage,
+ FindBarController::kKeepResultsInFindBox);
} else if (button == find_previous_button_->widget() ||
button == find_next_button_->widget()) {
FindEntryTextInContents(button == find_next_button_->widget());