Mac: Implements the special bookmark bar on NTP.

Based mostly on Ben's patch, but made it compile, work, and descoped
moving the bookmark bar around the view heiarchy.

XIB modification: The root view is now a BookmarkBarToolbarView instead of an NSView and is [BookmarkBarController view].

BUG=17625

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

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

1 files changed, 7 insertions, 9 deletions

diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h
index 71467433..6af4241 100644
--- a/chrome/browser/cocoa/toolbar_controller.h
+++ b/chrome/browser/cocoa/toolbar_controller.h
@@ -10,7 +10,7 @@
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/command_observer_bridge.h"
-#import "chrome/browser/cocoa/bookmark_bar_controller.h"
+#import "chrome/browser/cocoa/toolbar_compressable.h"
 #import "chrome/browser/cocoa/delayedmenu_button.h"
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/common/pref_member.h"
@@ -18,6 +18,7 @@
 @class AutocompleteTextField;
 @class AutocompleteTextFieldEditor;
 @class BackForwardMenuController;
+@class BackgroundGradientView;
 class Browser;
 class BubblePositioner;
 class CommandUpdater;
@@ -39,7 +40,7 @@ class ToolbarView;
 // the web content view.
 
 @interface ToolbarController :
-    NSViewController<CommandObserverProtocol, ViewResizer> {
+    NSViewController<CommandObserverProtocol, ToolbarCompressable> {
  @private
   ToolbarModel* toolbarModel_;  // weak, one per window
   CommandUpdater* commands_;  // weak, one per window
@@ -48,9 +49,7 @@ class ToolbarView;
   scoped_ptr<CommandObserverBridge> commandObserver_;
   scoped_ptr<LocationBarViewMac> locationBarView_;
   scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;
-  scoped_nsobject<BookmarkBarController> bookmarkBarController_;
   id<ViewResizer> resizeDelegate_;  // weak
-  id<BookmarkURLOpener> bookmarkBarDelegate_;  // weak
   scoped_nsobject<BackForwardMenuController> backMenuController_;
   scoped_nsobject<BackForwardMenuController> forwardMenuController_;
 
@@ -98,8 +97,7 @@ class ToolbarView;
            commands:(CommandUpdater*)commands
             profile:(Profile*)profile
             browser:(Browser*)browser
-     resizeDelegate:(id<ViewResizer>)resizeDelegate
-   bookmarkDelegate:(id<BookmarkURLOpener>)delegate;
+     resizeDelegate:(id<ViewResizer>)resizeDelegate;
 
 // Get the C++ bridge object representing the location bar for this tab.
 - (LocationBar*)locationBar;
@@ -110,6 +108,9 @@ class ToolbarView;
 // returns nil if we don't want to override the custom field editor for |obj|.
 - (id)customFieldEditorForObject:(id)obj;
 
+// Returns the backdrop to the toolbar.
+- (BackgroundGradientView*)backgroundGradientView;
+
 // Make the location bar the first responder, if possible.
 - (void)focusLocationBar;
 
@@ -132,9 +133,6 @@ class ToolbarView;
 // [self view].
 - (void)setHasToolbar:(BOOL)toolbar;
 
-// Return the bookmark bar controller.
-- (BookmarkBarController*)bookmarkBarController;
-
 // The bookmark bubble (when you click the star) needs to know where to go.
 // Somewhere near the star button seems like a good start.
 - (NSRect)starButtonInWindowCoordinates;