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

Unified Diff: chrome/browser/ui/cocoa/browser_window_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: Remove underscore. Created 9 years, 4 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/cocoa/browser_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index f9cd26f41d784ed510e7f6181da41220a6102a17..3cb33edf647c71a70f77cd7c46a5782e363980b6 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -25,6 +25,7 @@
#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
#import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
#import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
+#include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
#import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
#import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
@@ -307,7 +308,7 @@ void BrowserWindowCocoa::ToggleBookmarkBar() {
void BrowserWindowCocoa::AddFindBar(
FindBarCocoaController* find_bar_cocoa_controller) {
- return [controller_ addFindBar:find_bar_cocoa_controller];
+ [controller_ addFindBar:find_bar_cocoa_controller];
}
void BrowserWindowCocoa::ShowAboutChromeDialog() {
@@ -585,6 +586,16 @@ WindowOpenDisposition BrowserWindowCocoa::GetDispositionForPopupBounds(
return NEW_POPUP;
}
+FindBar* BrowserWindowCocoa::CreateFindBar() {
+ // We could push the AddFindBar() call into the FindBarBridge
+ // constructor or the FindBarCocoaController init, but that makes
+ // unit testing difficult, since we would also require a
+ // BrowserWindow object.
+ FindBarBridge* bridge = new FindBarBridge();
+ AddFindBar(bridge->find_bar_cocoa_controller());
+ return bridge;
+}
+
void BrowserWindowCocoa::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {

Powered by Google App Engine
This is Rietveld 408576698