Make BrowserWindow::CreateFindBar non-static so that it can be overridden by Panels.

chrome/browser/ui/panels/panel_browser_window_cocoa.mm

 // Copyright (c) 2011 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/panels/panel_browser_window_cocoa.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #include "chrome/browser/ui/panels/panel.h"
 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 
 namespace {
 
 // Use this instead of 0 for minimum size of a window when doing opening and
 // closing animations, since OSX window manager does not like 0-sized windows
 // (according to avi@).
 const int kMinimumWindowSize = 1;
 
@@ skipping 17 matching lines @@
                                       const gfx::Rect& bounds) {
   return new PanelBrowserWindowCocoa(browser, panel, bounds);
 }
 
 PanelBrowserWindowCocoa::PanelBrowserWindowCocoa(Browser* browser,
                                                  Panel* panel,
                                                  const gfx::Rect& bounds)
   : browser_(browser),
     panel_(panel),
     bounds_(bounds),
-    is_shown_(false) {
+    is_shown_(false),
+    has_find_bar_(false) {
   controller_ = [[PanelWindowControllerCocoa alloc] initWithBrowserWindow:this];
 }
 
 PanelBrowserWindowCocoa::~PanelBrowserWindowCocoa() {
 }
 
 bool PanelBrowserWindowCocoa::isClosed() {
   return !controller_;
 }
 
@@ skipping 70 matching lines @@
 }
 
 void PanelBrowserWindowCocoa::UpdatePanelTitleBar() {
   NOTIMPLEMENTED();
 }
 
 void PanelBrowserWindowCocoa::ShowTaskManagerForPanel() {
   NOTIMPLEMENTED();
 }
 
+FindBar* PanelBrowserWindowCocoa::CreatePanelFindBar() {
+  // Find bar should only be created once per panel!
+  DCHECK(!has_find_bar_);

[Dmitry Titov, 2011/08/08 20:08:31]

It's nice to do it this way, but I don't have a strong opinion on that:
DCHECK(!foo) << "foo must be only teleported once";

[jennb, 2011/08/08 21:21:21]

Done.

+  has_find_bar_ = true;
+
+  FindBarBridge* bridge = new FindBarBridge();
+  [controller_ addFindBar:bridge->find_bar_cocoa_controller()];
+  return bridge;
+}
+
 void PanelBrowserWindowCocoa::NotifyPanelOnUserChangedTheme() {
   NOTIMPLEMENTED();
 }
 
 void PanelBrowserWindowCocoa::DrawAttention() {
   NOTIMPLEMENTED();
 }
 
 bool PanelBrowserWindowCocoa::IsDrawingAttention() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 Browser* PanelBrowserWindowCocoa::GetPanelBrowser() const {
   return browser();
 }
 
 void PanelBrowserWindowCocoa::DestroyPanelBrowser() {
   [controller_ close];
   controller_ = NULL;
 }
 
 NativePanelTesting* PanelBrowserWindowCocoa::GetNativePanelTesting() {
   return this;
 }