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

chrome/browser/views/find_bar_view.cc

 // Copyright (c) 2009 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/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
@@ skipping 388 matching lines @@
       if (event.IsMouseEvent()) {
         // If mouse event, we move the focus back to the text-field, so that the
         // user doesn't have to click on the text field to change the search. We
         // don't want to do this for keyboard clicks on the button, since the
         // user is more likely to press FindNext again than change the search
         // query.
         find_text_->RequestFocus();
       }
       break;
     case CLOSE_TAG:
-      find_bar_host()->GetFindBarController()->EndFindSession();
+      find_bar_host()->GetFindBarController()->EndFindSession(
+          FindBarController::kKeepSelection);
       break;
     default:
       NOTREACHED() << L"Unknown button";
       break;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::Textfield::Controller implementation:
 
 void FindBarView::ContentsChanged(views::Textfield* sender,
                                   const string16& new_contents) {
   FindBarController* controller = find_bar_host()->GetFindBarController();
   DCHECK(controller);
   // We must guard against a NULL tab_contents, which can happen if the text
   // in the Find box is changed right after the tab is destroyed. Otherwise, it
   // can lead to crashes, as exposed by automation testing in issue 8048.
   if (!controller->tab_contents())
     return;
 
   // When the user changes something in the text box we check the contents and
   // if the textbox contains something we set it as the new search string and
   // initiate search (even though old searches might be in progress).
   if (!new_contents.empty()) {
     // 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());
   }
 }
 
 bool FindBarView::HandleKeystroke(views::Textfield* sender,
                                   const views::Textfield::Keystroke& key) {
   // If the dialog is not visible, there is no reason to process keyboard input.
   if (!host()->IsVisible())
     return false;
 
@@ skipping 42 matching lines @@
 
 void FindBarView::ThemeChanged() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT),
         rb.GetBitmapNamed(IDR_CLOSE_BAR),
         rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
   }
 }