summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/find_bar_view.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 18:19:00 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 18:19:00 +0000
commit5bc8fe91607f20f2d43dc461ca188dd07b55d435 (patch)
treeca6551f9d816757942485ee7d3542c5aeb4d2fed /chrome/browser/views/find_bar_view.cc
parent3148c0ae4462e01f4b830b8d2150dcd7fee2cb3b (diff)
downloadchromium_src-5bc8fe91607f20f2d43dc461ca188dd07b55d435.zip
chromium_src-5bc8fe91607f20f2d43dc461ca188dd07b55d435.tar.gz
chromium_src-5bc8fe91607f20f2d43dc461ca188dd07b55d435.tar.bz2
Allow users to close the find session and activate the current link via ctrl-enter.
this only hooks up ctrl-enter on gtk for now, but adding it on windows/mac should be trivial webkit side, which needs to land first, is here: https://bugs.webkit.org/show_bug.cgi?id=35407 This also enables the FindInPageControllerTest tests on linux/gtk. BUG=29500 TEST=FindInPageControllerTest.ActivateLinkNavigatesPage Review URL: http://codereview.chromium.org/660137 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/find_bar_view.cc')
-rw-r--r--chrome/browser/views/find_bar_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index 8eb432d..a8cb944 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -406,7 +406,8 @@ void FindBarView::ButtonPressed(
}
break;
case CLOSE_TAG:
- find_bar_host()->GetFindBarController()->EndFindSession();
+ find_bar_host()->GetFindBarController()->EndFindSession(
+ FindBarController::kKeepSelection);
break;
default:
NOTREACHED() << L"Unknown button";
@@ -434,8 +435,7 @@ void FindBarView::ContentsChanged(views::Textfield* sender,
// The last two params here are forward (true) and case sensitive (false).
controller->tab_contents()->StartFinding(new_contents, true, false);
} else {
- // The textbox is empty so we reset. true = clear selection on page.
- controller->tab_contents()->StopFinding(true);
+ controller->tab_contents()->StopFinding(FindBarController::kClearSelection);
UpdateForResult(controller->tab_contents()->find_result(), string16());
}
}