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

Unified Diff: chrome/browser/gtk/find_bar_gtk.cc

Issue 660137: Allow users to close the find session and activate the current link via ctrl-... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 | « chrome/browser/find_bar_host_browsertest.cc ('k') | chrome/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/find_bar_gtk.cc
===================================================================
--- chrome/browser/gtk/find_bar_gtk.cc (revision 41087)
+++ chrome/browser/gtk/find_bar_gtk.cc (working copy)
@@ -539,7 +539,7 @@
false); // Not case sensitive.
} else {
// The textbox is empty so we reset.
- tab_contents->StopFinding(true); // true = clear selection on page.
+ tab_contents->StopFinding(FindBarController::kClearSelection);
UpdateUIForFindResult(find_bar_controller_->tab_contents()->find_result(),
string16());
}
@@ -695,10 +695,18 @@
if (find_bar->MaybeForwardKeyEventToRenderer(event)) {
return TRUE;
} else if (GDK_Escape == event->keyval) {
- find_bar->find_bar_controller_->EndFindSession();
+ find_bar->find_bar_controller_->EndFindSession(
+ FindBarController::kKeepSelection);
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);
+ return TRUE;
+ }
+
bool forward = (event->state & gtk_accelerator_get_default_mod_mask()) !=
GDK_SHIFT_MASK;
find_bar->FindEntryTextInContents(forward);
@@ -716,7 +724,8 @@
// static
void FindBarGtk::OnClicked(GtkWidget* button, FindBarGtk* find_bar) {
if (button == find_bar->close_button_->widget()) {
- find_bar->find_bar_controller_->EndFindSession();
+ find_bar->find_bar_controller_->EndFindSession(
+ FindBarController::kKeepSelection);
} else if (button == find_bar->find_previous_button_->widget() ||
button == find_bar->find_next_button_->widget()) {
find_bar->FindEntryTextInContents(
« no previous file with comments | « chrome/browser/find_bar_host_browsertest.cc ('k') | chrome/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698