More bookmark bar changes....

chrome/browser/cocoa/toolbar_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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
@@ skipping 102 matching lines @@
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(prefs::kShowHomeButton, prefs, prefObserver_.get());
   showPageOptionButtons_.Init(prefs::kShowPageOptionsButtons, prefs,
                               prefObserver_.get());
   [self showOptionalHomeButton];
   [self showOptionalPageWrenchButtons];
 
   // Create a sub-controller for the bookmark bar.
   bookmarkBarController_.reset([[BookmarkBarController alloc]
                                    initWithProfile:profile_
-                                              view:bookmarkBarView_
+                                        parentView:[self view]
                                     webContentView:webContentView_
                                           delegate:bookmarkBarDelegate_]);
+
+  // Add bookmark bar to the view hierarchy.  This also triggers the
+  // nib load.  The bookmark bar is defined (in the nib) to be
+  // bottom-aligned to it's parent view (among other things), so
+  // position and resize properties don't need to be set.
+  [[self view] addSubview:[bookmarkBarController_ view]];
 }
 
 - (LocationBar*)locationBar {
   return locationBarView_.get();
 }
 
 - (void)focusLocationBar {
   if (locationBarView_.get()) {
     locationBarView_->FocusLocation();
   }
@@ skipping 80 matching lines @@
     [locationBarFieldEditor_.get() setFieldEditor:YES];
     return locationBarFieldEditor_.get();
   }
   return nil;
 }
 
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews {
   return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
             homeButton_, starButton_, goButton_, pageButton_, wrenchButton_,
-            locationBar_, bookmarkBarView_, nil];
+            locationBar_, nil];
 }
 
 // Moves |rect| to the right by |delta|, keeping the right side fixed by
 // shrinking the width to compensate. Passing a negative value for |deltaX|
 // moves to the left and increases the width.
 - (NSRect)adjustRect:(NSRect)rect byAmount:(float)deltaX {
   NSRect frame = NSOffsetRect(rect, deltaX, 0);
   frame.size.width -= deltaX;
   return frame;
 }
@@ skipping 67 matching lines @@
                    forView:pageButton_];
 }
 
 - (IBAction)showWrenchMenu:(id)sender {
   [NSMenu popUpContextMenu:wrenchMenu_
                  withEvent:[NSApp currentEvent]
                    forView:wrenchButton_];
 }
 
 @end