Mac bookmark work. ...

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.
 
+#import "chrome/app/chrome_dll_resource.h"  // IDC_*
 #import "chrome/browser/browser.h"
 #import "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 
 @implementation BrowserWindowController
 
 // Load the browser window nib and do any Cocoa-specific initialization.
 // Takes ownership of |browser|. Note that the nib also sets this controller
 // up as the window's delegate.
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithWindowNibName:@"BrowserWindow"])) {
     browser_ = browser;
     DCHECK(browser_);
-    windowShim_ = new BrowserWindowCocoa(self, [self window]);
+    windowShim_ = new BrowserWindowCocoa(browser, self, [self window]);
+    windowShim_->Init();
   }
   return self;
 }
 
 - (void)dealloc {
   browser_->CloseAllTabs();
   [tabStripController_ release];
   delete browser_;
   delete windowShim_;
   [super dealloc];
 }
 
 // Access the C++ bridge between the NSWindow and the rest of Chromium
 - (BrowserWindow*)browserWindow {
   return windowShim_;
 }
 
 - (void)windowDidLoad {
   // Create a controller for the tab strip, giving it the model object for
   // this window's Browser and the tab strip view. The controller will handle
   // registering for the appropriate tab notifications from the back-end and
   // managing the creation of new tabs.
-  tabStripController_ =
-      [[TabStripController alloc]
-          initWithView:tabStripView_
-              tabModel:browser_->tabstrip_model()
-          toolbarModel:browser_->toolbar_model()
-              commands:browser_->command_updater()];
+  tabStripController_ = [[TabStripController alloc]
+                          initWithView:tabStripView_ browser:browser_];
 
   // Place the tab bar above the content box and add it to the view hierarchy
   // as a sibling of the content view so it can overlap with the window frame.
   NSRect tabFrame = [contentBox_ frame];
   tabFrame.origin = NSMakePoint(0, NSMaxY(tabFrame));
   tabFrame.size.height = NSHeight([tabStripView_ frame]);
   [tabStripView_ setFrame:tabFrame];
   [[[[self window] contentView] superview] addSubview:tabStripView_];
 }
 
@@ skipping 36 matching lines @@
     // down. When the tab strip is empty we'll be called back again.
     [[self window] orderOut:self];
     browser_->OnWindowClosing();
     return NO;
   }
 
   // the tab strip is empty, it's ok to close the window
   return YES;
 }
 
+// Update a toggle state for an NSMenuItem if modified.
+// Take care to insure |item| looks like a NSMenuItem.
+// Called by validateUserInterfaceItem:.
+- (void)updateToggleStateWithTag:(NSInteger)tag forItem:(id)item {
+  if (![item respondsToSelector:@selector(state)] ||
+      ![item respondsToSelector:@selector(setState:)])
+    return;
+
+  // On Windows this logic happens in bookmark_bar_view.cc.  On the
+  // Mac we're a lot more MVC happy so we've moved it into a
+  // controller.  To be clear, this simply updates the menu item; it
+  // does not display the bookmark bar itself.
+  if (tag == IDC_SHOW_BOOKMARK_BAR) {
+    bool toggled = windowShim_->IsBookmarkBarVisible();
+    NSInteger oldState = [item state];
+    NSInteger newState = toggled ? NSOnState : NSOffState;
+    if (oldState != newState)
+      [item setState:newState];
+  }
+}
+
 // Called to validate menu and toolbar items when this window is key. All the
 // items we care about have been set with the |commandDispatch:| action and
 // a target of FirstResponder in IB. If it's not one of those, let it
 // continue up the responder chain to be handled elsewhere. We pull out the
 // tag as the cross-platform constant to differentiate and dispatch the
 // various commands.
 // NOTE: we might have to handle state for app-wide menu items,
 // although we could cheat and directly ask the app controller if our
 // command_updater doesn't support the command. This may or may not be an issue,
 // too early to tell.
 - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
   SEL action = [item action];
   BOOL enable = NO;
   if (action == @selector(commandDispatch:)) {
     NSInteger tag = [item tag];
-    if (browser_->command_updater()->SupportsCommand(tag))
+    if (browser_->command_updater()->SupportsCommand(tag)) {
+      // Generate return value (enabled state)
       enable = browser_->command_updater()->IsCommandEnabled(tag) ? YES : NO;
+
+      // If the item is toggleable, find it's toggle state and
+      // try to update it.  This is a little awkward, but the alternative is
+      // to check after a commandDispatch, which seems worse.
+      [self updateToggleStateWithTag:tag forItem:item];
+    }
   }
   return enable;
 }
 
 // Called when the user picks a menu or toolbar item when this window is key.
 // Calls through to the browser object to execute the command. This assumes that
 // the command is supported and doesn't check, otherwise it would have been
 // disabled in the UI in validateUserInterfaceItem:.
 - (void)commandDispatch:(id)sender {
   NSInteger tag = [sender tag];
@@ skipping 36 matching lines @@
   } else {
     // TODO(pinkerton): stop the timer.
   }
 }
 
 // Make the location bar the first responder, if possible.
 - (void)focusLocationBar {
   [tabStripController_ focusLocationBar];
 }
 
+- (BOOL)isBookmarkBarVisible {
+  return [tabStripController_ isBookmarkBarVisible];
+
+}
+
+- (void)toggleBookmarkBar {
+  [tabStripController_ toggleBookmarkBar];
+}
+
+
 @end