a bunch of 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 56 matching lines @@
  private:
   ToolbarController* controller_;  // weak, owns us
 };
 
 }  // namespace
 
 @implementation ToolbarController
 
 - (id)initWithModel:(ToolbarModel*)model
            commands:(CommandUpdater*)commands
-            profile:(Profile*)profile {
+            profile:(Profile*)profile
+     webContentView:(NSView*)webContentView
+   bookmarkDelegate:(id<BookmarkURLOpener>)delegate {
   DCHECK(model && commands && profile);
   if ((self = [super initWithNibName:@"Toolbar"
                               bundle:mac_util::MainAppBundle()])) {
     toolbarModel_ = model;
     commands_ = commands;
     profile_ = profile;
+    bookmarkBarDelegate_ = delegate;
+    webContentView_ = webContentView;
 
     // Register for notifications about state changes for the toolbar buttons
     commandObserver_.reset(new CommandObserverBridge(self, commands));
     commandObserver_->ObserveCommand(IDC_BACK);
     commandObserver_->ObserveCommand(IDC_FORWARD);
     commandObserver_->ObserveCommand(IDC_RELOAD);
     commandObserver_->ObserveCommand(IDC_HOME);
     commandObserver_->ObserveCommand(IDC_STAR);
   }
   return self;
@@ skipping 10 matching lines @@
 
   // Register pref observers for the optional home and page/options buttons
   // and then add them to the toolbar them based on those prefs.
   prefObserver_.reset(new ToolbarControllerInternal::PrefObserverBridge(self));
   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_
+                                    webContentView:webContentView_
+                                          delegate:bookmarkBarDelegate_]);
 }
 
 - (LocationBar*)locationBar {
   return locationBarView_.get();
 }
 
 - (void)focusLocationBar {
   if (locationBarView_.get()) {
     locationBarView_->FocusLocation();
   }
@@ skipping 47 matching lines @@
   NSString* imageName = @"go";
   NSInteger tag = IDC_GO;
   if (isLoading) {
     imageName = @"stop";
     tag = IDC_STOP;
   }
   [goButton_ setImage:[NSImage imageNamed:imageName]];
   [goButton_ setTag:tag];
 }
 
+- (BookmarkBarController*)bookmarkBarController {
+  return bookmarkBarController_.get();
+}
+
 - (id)customFieldEditorForObject:(id)obj {
   if (obj == locationBar_) {
     // Lazilly construct Field editor, Cocoa UI code always runs on the
     // same thread, so there shoudn't be a race condition here.
     if (locationBarFieldEditor_.get() == nil) {
       locationBarFieldEditor_.reset([[LocationBarFieldEditor alloc] init]);
     }
 
     // This needs to be called every time, otherwise notifications
     // aren't sent correctly.
     DCHECK(locationBarFieldEditor_.get());
     [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_, nil];
+            locationBar_, bookmarkBarView_, 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