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

BUG=None
TEST=PanelBrowserTest.FindBar

Review URL: http://codereview.chromium.org/7538010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95897 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/ui/gtk/browser_window_factory_gtk.cc b/chrome/browser/ui/gtk/browser_window_factory_gtk.cc
index 3c0af69..e4322e8 100644
--- a/chrome/browser/ui/gtk/browser_window_factory_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_factory_gtk.cc
@@ -6,14 +6,9 @@
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
-#include "chrome/browser/ui/gtk/find_bar_gtk.h"
 
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }
-
-FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
-  return new FindBarGtk(browser);
-}
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 292ff4b..017322b 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1168,6 +1168,10 @@ WindowOpenDisposition BrowserWindowGtk::GetDispositionForPopupBounds(
   return NEW_POPUP;
 }
 
+FindBar* BrowserWindowGtk::CreateFindBar() {
+  return new FindBarGtk(this);
+}
+
 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() {
   new DownloadInProgressDialogGtk(browser());
 }
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 59d1652e..e511e44 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -135,6 +135,7 @@ class BrowserWindowGtk : public BrowserWindow,
   virtual gfx::Rect GetInstantBounds();
   virtual WindowOpenDisposition GetDispositionForPopupBounds(
       const gfx::Rect& bounds);
+  virtual FindBar* CreateFindBar() OVERRIDE;
 
   // Overridden from NotificationObserver:
   virtual void Observe(int type,
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index d4cd609..b369681 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -173,10 +173,10 @@ void BuildBorder(GtkWidget* child,
 
 }  // namespace
 
-FindBarGtk::FindBarGtk(Browser* browser)
-    : browser_(browser),
-      window_(static_cast<BrowserWindowGtk*>(browser->window())),
-      theme_service_(GtkThemeService::GetFrom(browser->profile())),
+FindBarGtk::FindBarGtk(BrowserWindowGtk* window)
+    : browser_(window->browser()),
+      window_(window),
+      theme_service_(GtkThemeService::GetFrom(browser_->profile())),
       container_width_(-1),
       container_height_(-1),
       match_label_failure_(false),
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.h b/chrome/browser/ui/gtk/find_bar_gtk.h
index 68ecac9..cf5b57f 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.h
+++ b/chrome/browser/ui/gtk/find_bar_gtk.h
@@ -36,7 +36,7 @@ class FindBarGtk : public FindBar,
                    public FindBarTesting,
                    public NotificationObserver {
  public:
-  explicit FindBarGtk(Browser* browser);
+  explicit FindBarGtk(BrowserWindowGtk* window);
   virtual ~FindBarGtk();
 
   GtkWidget* widget() const { return slide_widget_->widget(); }