Support the OS X find pasteboard on OS X.

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 "app/l10n_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
@@ skipping 57 matching lines @@
   }
 
   if (!tab_contents_)
     return;
 
   registrar_.Add(this, NotificationType::FIND_RESULT_AVAILABLE,
                  Source<TabContents>(tab_contents_));
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  Source<NavigationController>(&tab_contents_->controller()));
 
+#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();
   if (find_string.empty())
     find_string = tab_contents_->find_prepopulate_text();
 
   // 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
 
   if (tab_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 94 matching lines @@
   if (find_result.number_of_matches() > -1) {
     if (last_reported_matchcount_ > 0 &&
         find_result.number_of_matches() == 1 &&
         !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());
 }