Mac bookmark work. ...

chrome/browser/cocoa/tab_strip_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/tab_strip_controller.h"
 
 #import "base/sys_string_conversions.h"
 #import "chrome/app/chrome_dll_resource.h"
+#import "chrome/browser/browser.h"
+#import "chrome/browser/cocoa/bookmark_bar_state_controller.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_cell.h"
 #import "chrome/browser/cocoa/tab_contents_controller.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/tab_contents/tab_contents.h"
 #import "chrome/browser/tabs/tab_strip_model.h"
 
 // The amount of overlap tabs have in their button frames.
 const short kTabOverlap = 16;
@@ skipping 37 matching lines @@
   virtual void TabStripEmpty();
 
  private:
   TabStripController* controller_;  // weak, owns me
   TabStripModel* model_;  // weak, owned by Browser
 };
 
 @implementation TabStripController
 
 - (id)initWithView:(TabStripView*)view
-          tabModel:(TabStripModel*)tabModel
-      toolbarModel:(ToolbarModel*)toolbarModel
-          commands:(CommandUpdater*)commands {
-  DCHECK(view && tabModel && toolbarModel);
+           browser:(Browser*)browser {
+  DCHECK(view && browser);
   if ((self = [super init])) {
     tabView_ = view;
-    tabModel_ = tabModel;
-    toolbarModel_ = toolbarModel;
-    commands_ = commands;
-    bridge_ = new TabStripBridge(tabModel, self);
+    tabModel_ = browser->tabstrip_model();
+    toolbarModel_ = browser->toolbar_model();
+    bookmarkModel_ = browser->profile()->GetBookmarkModel();
+    commands_ = browser->command_updater();
+    bridge_ = new TabStripBridge(tabModel_, self);
     tabContentsArray_ = [[NSMutableArray alloc] init];
     tabArray_ = [[NSMutableArray alloc] init];
-
+    bookmarkBarStateController_ = [[BookmarkBarStateController alloc]
+                                    initWithBrowser:browser];
     // Take the only child view present in the nib as the new tab button. For
     // some reason, if the view is present in the nib apriori, it draws
     // correctly. If we create it in code and add it to the tab view, it draws
     // with all sorts of crazy artifacts.
     newTabButton_ = [[tabView_ subviews] objectAtIndex:0];
     DCHECK([newTabButton_ isKindOfClass:[NSButton class]]);
     [newTabButton_ setTarget:nil];
     [newTabButton_ setAction:@selector(commandDispatch:)];
     [newTabButton_ setTag:IDC_NEW_TAB];
 
     [tabView_ setWantsLayer:YES];
   }
   return self;
 }
 
 - (void)dealloc {
   delete bridge_;
+  [bookmarkBarStateController_ release];
   [tabContentsArray_ release];
   [tabArray_ release];
   [super dealloc];
 }
 
 // Finds the associated TabContentsController at the given |index| and swaps
 // out the sole child of the contentArea to display its contents.
 - (void)swapInTabAtIndex:(NSInteger)index {
   TabContentsController* controller = [tabContentsArray_ objectAtIndex:index];
 
@@ skipping 111 matching lines @@
 
   // TODO(pinkerton): handle tab dragging in here
 
   // Make a new tab. Load the contents of this tab from the nib and associate
   // the new controller with |contents| so it can be looked up later.
   TabContentsController* contentsController =
       [[[TabContentsController alloc] initWithNibName:@"TabContents"
                                                bundle:nil
                                              contents:contents
                                              commands:commands_
-                                         toolbarModel:toolbarModel_]
+                                         toolbarModel:toolbarModel_
+                                        bookmarkModel:bookmarkModel_]
           autorelease];
+  if ([self isBookmarkBarVisible])
+    [contentsController toggleBookmarkBar:YES];
   [tabContentsArray_ insertObject:contentsController atIndex:index];
 
   // Make a new tab and add it to the strip. Keep track of its controller.
   // TODO(pinkerton): move everyone else over and animate. Also will need to
   // move the "add tab" button over.
   NSRect newTabFrame = [self frameForNewTabAtIndex:index];
   TabController* newController = [self newTabWithFrame:newTabFrame];
   [tabArray_ insertObject:newController atIndex:index];
   NSView* newView = [newController view];
   [tabView_ addSubview:newView];
@@ skipping 141 matching lines @@
   [selectedController setIsLoading:isLoading];
 }
 
 // Make the location bar the first responder, if possible.
 - (void)focusLocationBar {
   TabContentsController* selectedController =
       [tabContentsArray_ objectAtIndex:tabModel_->selected_index()];
   [selectedController focusLocationBar];
 }
 
+- (BOOL)isBookmarkBarVisible {
+  return [bookmarkBarStateController_ visible];
+}
+
+// Called from BrowserWindowController
+- (void)toggleBookmarkBar {
+  [bookmarkBarStateController_ toggleBookmarkBar];
+  BOOL visible = [self isBookmarkBarVisible];
+  for (TabContentsController *controller in tabContentsArray_) {
+    [controller toggleBookmarkBar:visible];
+  }
+
+}
+
+
 @end
 
 //--------------------------------------------------------------------------
 
 TabStripBridge::TabStripBridge(TabStripModel* model,
                                TabStripController* controller)
     : controller_(controller), model_(model) {
   // Register to be a listener on the model so we can get updates and tell
   // the TabStripController about them.
   model_->AddObserver(this);
@@ skipping 32 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void TabStripBridge::TabChangedAt(TabContents* contents, int index) {
   [controller_ tabChangedWithContents:contents atIndex:index];
 }
 
 void TabStripBridge::TabStripEmpty() {
   NOTIMPLEMENTED();
 }