Mac bookmark work. ...

chrome/browser/cocoa/tab_contents_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 "chrome/browser/cocoa/tab_contents_controller.h"
 
 #import "base/sys_string_conversions.h"
 #import "chrome/app/chrome_dll_resource.h"
+#import "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/command_updater.h"
 #import "chrome/browser/location_bar.h"
 #import "chrome/browser/tab_contents/tab_contents.h"
 #import "chrome/browser/toolbar_model.h"
 #import "chrome/browser/net/url_fixer_upper.h"
 
 // For now, tab_contents lives here. TODO(port):fix
 #include "chrome/common/temp_scaffolding_stubs.h"
 
 // Names of images in the bundle for the star icon (normal and 'starred').
 static NSString* const kStarImageName = @"star";
 static NSString* const kStarredImageName = @"starred";
 
 @interface TabContentsController(CommandUpdates)
 - (void)enabledStateChangedForCommand:(NSInteger)command enabled:(BOOL)enabled;
 @end
 
 @interface TabContentsController(LocationBar)
 - (NSString*)locationBarString;
 - (void)focusLocationBar;
 @end
 
 @interface TabContentsController(Private)
 - (void)updateToolbarCommandStatus;
+- (void)applyContentsBoxOffset:(BOOL)apply;
 @end
 
 // A C++ bridge class that handles listening for updates to commands and
 // passing them back to the controller.
 class TabContentsCommandObserver : public CommandUpdater::CommandObserver {
  public:
   TabContentsCommandObserver(TabContentsController* controller,
                              CommandUpdater* commands);
   ~TabContentsCommandObserver();
 
@@ skipping 28 matching lines @@
  private:
   TabContentsController* controller_;  // weak, owns me
 };
 
 @implementation TabContentsController
 
 - (id)initWithNibName:(NSString*)name
                bundle:(NSBundle*)bundle
              contents:(TabContents*)contents
              commands:(CommandUpdater*)commands
-         toolbarModel:(ToolbarModel*)toolbarModel {
+         toolbarModel:(ToolbarModel*)toolbarModel
+        bookmarkModel:(BookmarkModel*)bookmarkModel {
   if ((self = [super initWithNibName:name bundle:bundle])) {
     commands_ = commands;
     if (commands_)
       observer_ = new TabContentsCommandObserver(self, commands);
     locationBarBridge_ = new LocationBarBridge(self);
     contents_ = contents;
     toolbarModel_ = toolbarModel;
+    bookmarkModel_ = bookmarkModel;
   }
   return self;
 }
 
 - (void)dealloc {
   // make sure our contents have been removed from the window
   [[self view] removeFromSuperview];
   delete observer_;
   delete locationBarBridge_;
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   [contentsBox_ setContentView:contents_->GetNativeView()];
+  [self applyContentsBoxOffset:YES];
 
   // Provide a starting point since we won't get notifications if the state
   // doesn't change between tabs.
   [self updateToolbarCommandStatus];
 
   [locationBar_ setStringValue:@"http://dev.chromium.org"];
 }
 
 - (LocationBar*)locationBar {
   return locationBarBridge_;
@@ skipping 114 matching lines @@
   return localGrowBox;
 }
 
 - (void)setIsLoading:(BOOL)isLoading {
   NSString* imageName = @"go";
   if (isLoading)
     imageName = @"stop";
   [goButton_ setImage:[NSImage imageNamed:imageName]];
 }
 
+- (void)toggleBookmarkBar:(BOOL)enable {
+  contentsBoxHasOffset_ = enable;
+  [self applyContentsBoxOffset:enable];
+
+  if (enable) {
+    // TODO(jrg): display something useful in the bookmark bar
+    // TODO(jrg): use a BookmarksView, not a ToolbarView
+    // TODO(jrg): don't draw a border around it
+    // TODO(jrg): ...
+  }
+}
+
+// Apply a contents box offset to make (or remove) room for the
+// bookmark bar.  If apply==YES, always make room (the contentsBox_ is
+// "full size").  If apply==NO we are trying to undo an offset.  If no
+// offset there is nothing to undo.
+- (void)applyContentsBoxOffset:(BOOL)apply {
+
+  if (bookmarkView_ == nil) {
+    // We're too early, but awakeFromNib will call me again.
+    return;
+  }
+  if (!contentsBoxHasOffset_ && apply) {
+    // There is no offset to unconditionally apply.
+    return;
+  }
+
+  int offset = [bookmarkView_ frame].size.height;
+  NSRect frame = [contentsBox_ frame];
+  if (apply)
+    frame.size.height -= offset;
+  else
+    frame.size.height += offset;
+
+  // TODO(jrg): animate
+  [contentsBox_ setFrame:frame];
+
+  [bookmarkView_ setNeedsDisplay:YES];
+  [contentsBox_ setNeedsDisplay:YES];
+}
+
 @end
 
 //--------------------------------------------------------------------------
 
 TabContentsCommandObserver::TabContentsCommandObserver(
     TabContentsController* controller, CommandUpdater* commands)
         : controller_(controller), commands_(commands) {
   DCHECK(controller_ && commands);
   // Register for notifications about state changes for the toolbar buttons
   commands_->AddCommandObserver(IDC_BACK, this);
@@ skipping 25 matching lines @@
   // over.
   std::wstring url = base::SysNSStringToWide([controller_ locationBarString]);
 
   // Try to flesh out the input to make a real URL.
   return URLFixerUpper::FixupURL(url, std::wstring());
 }
 
 void LocationBarBridge::FocusLocation() {
   [controller_ focusLocationBar];
 }