Prepopulate the Find box with whatever was searched for last

chrome/browser/find_bar_controller.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/find_bar_controller.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/notification_service.h"
@@ skipping 58 matching lines @@
   }
 
   if (web_contents_) {
     NotificationService::current()->AddObserver(
         this, NotificationType::FIND_RESULT_AVAILABLE,
         Source<TabContents>(web_contents_));
     NotificationService::current()->AddObserver(
         this, NotificationType::NAV_ENTRY_COMMITTED,
         Source<NavigationController>(web_contents_->controller()));
 
+    // 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 = web_contents_->find_text();
+    if (find_string.empty())
+        find_string = web_contents_->find_prepopulate_text();

[Ben Goodger (Google), 2009/04/13 20:48:25]

nit: indentation

+
     // 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(web_contents_->find_text());
+    find_bar_->SetFindText(find_string);
 
     if (web_contents_->find_ui_active()) {
       // A tab with a visible find bar just got selected and we need to show the
       // find bar but without animation since it was already animated into its
       // visible state. We also want to reset the window location so that
       // we don't surprise the user by popping up to the left for no apparent
       // reason.
       gfx::Rect new_pos = find_bar_->GetDialogPosition(gfx::Rect());
       find_bar_->SetDialogPosition(new_pos, false);
 
@@ skipping 36 matching lines @@
           EndFindSession();
         } else {
           // On Reload we want to make sure FindNext is converted to a full Find
           // to make sure highlights for inactive matches are repainted.
           web_contents_->set_find_op_aborted(true);
         }
       }
     }
   }
 }