a bunch of bookmark bar changes

chrome/browser/cocoa/bookmark_bar_controller.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
@@ skipping 27 matching lines @@
   // contentAreaHasOffset_ is an implementation detail of bookmark bar
   // show state.
   BOOL contentViewHasOffset_;
   BOOL barShouldBeShown_;
 
   // If the bar is disabled, we hide it and ignore show/hide commands.
   // Set when using fullscreen mode.
   BOOL barIsEnabled_;
 
   // The view of the bookmark bar itself.
-  // Not made into a scoped_nsobject since I may move it into a nib.
-  // (See TODO in initWithProfile: in bookmark_bar_controller.mm).
-  IBOutlet BookmarkBarView* bookmarkBarView_;
+  // Owned by the toolbar view, its parent view.
+  BookmarkBarView* bookmarkBarView_;  // weak
 
-  // The tab content area for the window (where the web goes)
-  IBOutlet NSView* contentView_;
+  NSView* webContentView_;  // weak; where the web goes
 
   // Bridge from Chrome-style C++ notifications (e.g. derived from
   // BookmarkModelObserver)
   scoped_ptr<BookmarkBarBridge> bridge_;
 
   // Delegate which can open URLs for us.
   id<BookmarkURLOpener> delegate_;  // weak
 }
 
 // Initializes the controller with the given browser profile and
-// content view.  We use |content| as a parent view for the bookmark
+// content view.  We use |webContentView| as the view for the bookmark
 // bar view and for geometry management.  |delegate| is used for
-// opening URLs.
+// opening URLs.  |view| is expected to be hidden.
 - (id)initWithProfile:(Profile*)profile
-          contentView:(NSView*)content
+                 view:(BookmarkBarView*)view
+       webContentView:(NSView*)webContentView
              delegate:(id<BookmarkURLOpener>)delegate;
 
-// Resizes the bookmark bar based on the state of the content area.
-- (void)resizeBookmarkBar;
-
 // Returns whether or not the bookmark bar is visible.
 - (BOOL)isBookmarkBarVisible;
 
 // Toggle the state of the bookmark bar.
 - (void)toggleBookmarkBar;
 
 // Turn on or off the bookmark bar and prevent or reallow its
 // appearance.  On disable, toggle off if shown.  On enable, show only
 // if needed.  For fullscreen mode.
 - (void)setBookmarkBarEnabled:(BOOL)enabled;
@@ skipping 12 matching lines @@
            parent:(const BookmarkNode*)oldParent index:(int)index;
 - (void)nodeChanged:(BookmarkModel*)model
                node:(const BookmarkNode*)node;
 - (void)nodeFavIconLoaded:(BookmarkModel*)model
                      node:(const BookmarkNode*)node;
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(const BookmarkNode*)node;
 @end
 
 
-// These APIs should only be used by unit tests, in place of "friend" classes.
+// These APIs should only be used by unit tests (or used internally).
 @interface BookmarkBarController(TestingAPI)
 // Access to the bookmark bar's view represented by this controller.
 - (NSView*)view;
+// Set the delegate for a unit test.
+- (void)setDelegate:(id<BookmarkURLOpener>)delegate;
+// Action for our bookmark buttons.
+- (void)openBookmark:(id)sender;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_