If the user selects text in the current tab, and types CTRL-F,...

chrome/browser/ui/find_bar/find_bar_controller.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/ui/find_bar/find_bar_controller.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
+#include "base/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "gfx/rect.h"
 
 // The minimum space between the FindInPage window and the search result.
 static const int kMinFindWndDistanceFromSelection = 5;
 
 FindBarController::FindBarController(FindBar* find_bar)
     : find_bar_(find_bar),
       tab_contents_(NULL),
       last_reported_matchcount_(0) {
 }
 
 FindBarController::~FindBarController() {
   DCHECK(!tab_contents_);
 }
 
 void FindBarController::Show() {
   // Only show the animation if we're not already showing a find bar for the
   // selected TabContents.
   if (!tab_contents_->find_ui_active()) {
     MaybeSetPrepopulateText();
 
     tab_contents_->set_find_ui_active(true);
     find_bar_->Show(true);
+  } else {
+    MaybeOverrideText();
   }
   find_bar_->SetFocusAndSelection();
 }
 
 void FindBarController::EndFindSession(SelectionAction action) {
   find_bar_->Hide(true);
 
   // |tab_contents_| can be NULL for a number of reasons, for example when the
   // tab is closing. We must guard against that case. See issue 8030.
   if (tab_contents_) {
@@ skipping 147 matching lines @@
         !find_result.final_update())
       return;  // Don't let interim result override match count.
     last_reported_matchcount_ = find_result.number_of_matches();
   }
 
   find_bar_->UpdateUIForFindResult(find_result, tab_contents_->find_text());
 }
 
 void FindBarController::MaybeSetPrepopulateText() {
 #if !defined(OS_MACOSX)
-  // Find out what we should show in the find text box. Usually, this will be
-  // the last search in this tab, but if no search has been issued in this tab
-  // we use the last search string (from any tab).
-  string16 find_string = tab_contents_->find_text();
+  // Find out what we should show in the find text box. If this tab contains any
+  // selected text, we use that text. Otherwise, we use the last search in this
+  // tab. If no search has been issued in this tab we use the last search string
+  // (from any tab).
+  string16 find_string = GetSelectedText();
+  if (find_string.empty())
+    find_string = tab_contents_->find_text();
   if (find_string.empty())
     find_string = tab_contents_->previous_find_text();
   if (find_string.empty()) {
     find_string =
         FindBarState::GetLastPrepopulateText(tab_contents_->profile());
   }
 
   // Update the find bar with existing results and search text, regardless of
   // whether or not the find bar is visible, so that if it's subsequently
   // shown it is showing the right state for this tab. We update the find text
   // _first_ since the FindBarView checks its emptiness to see if it should
   // clear the result count display when there's nothing in the box.
   find_bar_->SetFindText(find_string);
 #else
   // Having a per-tab find_string is not compatible with OS X's find pasteboard,
   // so we always have the same find text in all find bars. This is done through
   // the find pasteboard mechanism, so don't set the text here.
 #endif
 }
+
+void FindBarController::MaybeOverrideText() {
+#if !defined(OS_MACOSX)
+  string16 selected_text = GetSelectedText();
+  if (!selected_text.empty())
+    find_bar_->SetFindText(selected_text);
+#else
+  // Having a per-tab find_string is not compatible with OS X's find pasteboard,
+  // so we always have the same find text in all find bars. This is done through
+  // the find pasteboard mechanism, so don't set the text here.
+#endif
+}
+
+string16 FindBarController::GetSelectedText() {
+  return UTF8ToUTF16(tab_contents_->render_view_host()->selected_text());
+}