Allow users to close the find session and activate the current link via ctrl-...

chrome/browser/gtk/find_bar_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/find_bar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
@@ skipping 521 matching lines @@
   if (!tab_contents)
     return;
 
   std::string new_contents(gtk_entry_get_text(GTK_ENTRY(text_entry_)));
 
   if (new_contents.length() > 0) {
     tab_contents->StartFinding(UTF8ToUTF16(new_contents), forward_search,
                                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());
   }
 }
 
 void FindBarGtk::UpdateMatchLabelAppearance(bool failure) {
   match_label_failure_ = failure;
   bool use_gtk = theme_provider_->UseGtkTheme();
 
   if (use_gtk) {
@@ skipping 135 matching lines @@
 
   return FALSE;
 }
 
 // static
 gboolean FindBarGtk::OnKeyPressEvent(GtkWidget* widget, GdkEventKey* event,
                                      FindBarGtk* find_bar) {
   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);
     return TRUE;
   }
   return FALSE;
 }
 
 // static
 gboolean FindBarGtk::OnKeyReleaseEvent(GtkWidget* widget, GdkEventKey* event,
                                        FindBarGtk* find_bar) {
   return find_bar->MaybeForwardKeyEventToRenderer(event);
 }
 
 // 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(
         button == find_bar->find_next_button_->widget());
   } else {
     NOTREACHED();
   }
 }
 
 // static
@@ skipping 171 matching lines @@
 
 // static
 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event,
                                 FindBarGtk* find_bar) {
   g_signal_handlers_disconnect_by_func(
       gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
       reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar);
 
   return FALSE;  // Continue propagation.
 }