a bunch of bookmark bar changes

chrome/browser/cocoa/browser_window_controller.mm

 // 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.
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_*
@@ skipping 140 matching lines @@
 
     // Puts the incognito badge on the window frame, if necessary.
     [self installIncognitoBadge];
 
     // Create a controller for the toolbar, giving it the toolbar model object
     // and the toolbar view from the nib. The controller will handle
     // registering for the appropriate command state changes from the back-end.
     toolbarController_.reset([[ToolbarController alloc]
                                initWithModel:browser->toolbar_model()
                                     commands:browser->command_updater()
-                                     profile:browser->profile()]);
+                                     profile:browser->profile()
+                              webContentView:[self tabContentArea]
+                            bookmarkDelegate:self]);
     [self positionToolbar];
-
-    // After we've adjusted the toolbar, create a controller for the bookmark
-    // bar. It will show/hide itself based on the global preference and handle
-    // positioning itself (if visible) above the content area, which is why
-    // we need to do it after we've placed the toolbar.
-    bookmarkBarController_.reset([[BookmarkBarController alloc]
-                                initWithProfile:browser_->profile()
-                                    contentView:[self tabContentArea]
-                                       delegate:self]);
-
-   [self fixWindowGradient];
+    [self fixWindowGradient];
 
     // Create the bridge for the status bubble.
     statusBubble_.reset(new StatusBubbleMac([self window]));
   }
   return self;
 }
 
 - (void)dealloc {
   browser_->CloseAllTabs();
   // Under certain testing configurations we may not actually own the browser.
@@ skipping 391 matching lines @@
                                  yStretchiness:yStretchiness];
 }
 
 - (void)removePlaceholder {
   [tabStripController_ insertPlaceholderForTab:nil
                                          frame:NSZeroRect
                                  yStretchiness:0];
 }
 
 - (BOOL)isBookmarkBarVisible {
-  return [bookmarkBarController_ isBookmarkBarVisible];
+  return [[toolbarController_ bookmarkBarController] isBookmarkBarVisible];
 
 }
 
 - (void)toggleBookmarkBar {
-  [bookmarkBarController_ toggleBookmarkBar];
+  [[toolbarController_ bookmarkBarController] toggleBookmarkBar];
 }
 
 - (BOOL)isDownloadShelfVisible {
   return downloadShelfController_ != nil &&
       [downloadShelfController_ isVisible];
 }
 
 - (DownloadShelfController*)downloadShelf {
   if (!downloadShelfController_.get()) {
     downloadShelfController_.reset([[DownloadShelfController alloc]
@@ skipping 11 matching lines @@
   [[[self window] contentView] addSubview:[findBarCocoaController_ view]];
   [findBarCocoaController_ positionFindBarView:[self tabContentArea]];
 }
 
 // Adjust the UI for fullscreen mode.  E.g. when going fullscreen,
 // remove the toolbar.  When stopping fullscreen, add it back in.
 - (void)adjustUIForFullscreen:(BOOL)fullscreen {
   if (fullscreen) {
     // Disable showing of the bookmark bar.  This does not toggle the
     // preference.
-    [bookmarkBarController_ setBookmarkBarEnabled:NO];
+    [[toolbarController_ bookmarkBarController] setBookmarkBarEnabled:NO];
     // Make room for more content area.
     [self removeToolbar];
     // Hide the menubar, and allow it to un-hide when moving the mouse
     // to the top of the screen.  Does this eliminate the need for an
     // info bubble describing how to exit fullscreen mode?
     SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
   } else {
     SetSystemUIMode(kUIModeNormal, 0);
     [self positionToolbar];
-    [bookmarkBarController_ setBookmarkBarEnabled:YES];
+    [[toolbarController_ bookmarkBarController] setBookmarkBarEnabled:YES];
   }
 }
 
 - (NSWindow*)fullscreenWindow {
   return [[[FullscreenWindow alloc] initForScreen:[[self window] screen]]
            autorelease];
 }
 
 - (void)setFullscreen:(BOOL)fullscreen {
   fullscreen_ = fullscreen;
@@ skipping 171 matching lines @@
       [win respondsToSelector:@selector(
            setContentBorderThickness:forEdge:)]) {
     [win setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
     [win setContentBorderThickness:kWindowGradientHeight forEdge:NSMaxYEdge];
   }
 }
 
 - (void)tabContentAreaFrameChanged:(id)sender {
   // TODO(rohitrao): This is triggered by window resizes also.  Make
   // sure we aren't doing anything wasteful in those cases.
-  [bookmarkBarController_ resizeBookmarkBar];
-
   [downloadShelfController_ resizeDownloadShelf];
 
   [findBarCocoaController_ positionFindBarView:[self tabContentArea]];
 }
 
 - (void)saveWindowPositionIfNeeded {
   if (browser_ != BrowserList::GetLastActive())
     return;
 
   if (!g_browser_process || !g_browser_process->local_state() ||
@@ skipping 35 matching lines @@
   return defaultSheetRect;
 }
 
 // In addition to the tab strip and content area, which the superview's impl
 // takes care of, we need to add the toolbar and bookmark bar to the
 // overlay so they draw correctly when dragging out a new window.
 - (NSArray*)viewsToMoveToOverlay {
   NSArray* views = [super viewsToMoveToOverlay];
   NSArray* browserViews =
       [NSArray arrayWithObjects:[toolbarController_ view],
-                                [bookmarkBarController_ view],
                                 nil];
   return [views arrayByAddingObjectsFromArray:browserViews];
 }
 
 // Undocumented method for multi-touch gestures in 10.5. Future OS's will
 // likely add a public API, but the worst that will happen is that this will
 // turn into dead code and just won't get called.
 - (void)swipeWithEvent:(NSEvent*)event {
   // Map forwards and backwards to history; left is positive, right is negative.
   unsigned int command = 0;
@@ skipping 12 matching lines @@
     browser_->ExecuteCommand(command);
 }
 
 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj {
   // Ask the toolbar controller if it wants to return a custom field editor
   // for the specific object.
   return [toolbarController_ customFieldEditorForObject:obj];
 }
 
 @end