Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5958)

Unified Diff: chrome/browser/ui/panels/panel_window_controller_cocoa.mm

Issue 7538010: Make BrowserWindow::CreateFindBar non-static so that it can be overridden by Panels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Also change TestBrowserWindow Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_window_controller_cocoa.mm
diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
index 72573df3548ec9d0944279c6f9dbb1337971107d..96f5d1073f4c29ff4f317c649af829e640079fe8 100644
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
@@ -9,6 +9,8 @@
#include "base/logging.h"
#include "base/mac/mac_util.h"
#include "chrome/browser/ui/browser.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
#include "chrome/browser/ui/panels/panel.h"
#include "chrome/browser/ui/panels/panel_browser_window_cocoa.h"
#import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
@@ -85,6 +87,23 @@ const int kMinimumWindowSize = 1;
[self enableTabContentsViewAutosizing];
}
+- (void)addFindBar:(FindBarCocoaController*)findBarCocoaController {
+ // Shouldn't call addFindBar twice.
+ DCHECK(!findBarCocoaController_.get());
+
+ // Create a controller for the findbar.
+ findBarCocoaController_.reset([findBarCocoaController retain]);
+ NSView* contentView = [[self window] contentView];
+ [contentView addSubview:[findBarCocoaController_ view]
+ positioned:NSWindowBelow
+ relativeTo:titlebar_view_];
+
+ // Place the find bar immediately below the title bar.
+ CGFloat maxY = NSMinY([titlebar_view_ frame]);
+ CGFloat maxWidth = NSWidth([contentView frame]);
+ [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:maxWidth];
+}
+
- (void)closePanel {
windowShim_->panel()->Close();
}

Powered by Google App Engine
This is Rietveld 408576698