Support the OS X find pasteboard on OS X.

chrome/browser/browser.cc

 // Copyright (c) 2006-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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/idle_timer.h"
@@ skipping 73 matching lines @@
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/browser/views/theme_install_bubble_view.h"
 #include "chrome/common/child_process_host.h"
 #endif  // OS_WIN
 
 #if !defined(OS_MACOSX)
 #include "chrome/browser/dock_info.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/cocoa/find_pasteboard.h"
+#endif
+
 using base::TimeDelta;
 
 // How long we wait before updating the browser chrome while loading a page.
 static const int kUIUpdateCoalescingTimeMS = 200;
 
 // Idle time before helping prune memory consumption.
 static const int kBrowserReleaseMemoryInterval = 30;  // In seconds.
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 2776 matching lines @@
       WideToUTF8(profile_->GetPrefs()->GetString(prefs::kHomePage)),
       std::string()));
   if (!home_page.is_valid())
     return GURL(chrome::kChromeUINewTabURL);
   return home_page;
 }
 
 void Browser::FindInPage(bool find_next, bool forward_direction) {
   ShowFindBar();
   if (find_next) {
-    GetSelectedTabContents()->StartFinding(string16(),
+    string16 find_text;
+#if defined(OS_MACOSX)
+    // We always want to search for the contents of the find pasteboard on OS X.
+    find_text = GetFindPboardText();
+#endif
+    GetSelectedTabContents()->StartFinding(find_text,
                                            forward_direction,
                                            false);  // Not case sensitive.
   }
 }
 
 void Browser::CloseFrame() {
   window_->Close();
 }
 
 // static
@@ skipping 31 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }