Mac. Auto show and hide Bookmark Bar "Other Bookmarks" folder button depending on whether it's em...

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 825 matching lines @@
   DCHECK([[self view] isKindOfClass:[BackgroundGradientView class]]);
   return (BackgroundGradientView*)[self view];
 }
 
 // (Private) Method is the same as [self view], but is provided to be explicit.
 - (AnimatableView*)animatableView {
   DCHECK([[self view] isKindOfClass:[AnimatableView class]]);
   return (AnimatableView*)[self view];
 }
 
-// Position the off-the-side chevron to the left of the otherBookmarks button.
+// Position the off-the-side chevron to the left of the otherBookmarks button,
+// unless it's hidden in which case it's right aligned on top of it.
 - (void)positionOffTheSideButton {
   NSRect frame = [offTheSideButton_ frame];
   frame.size.height = bookmarks::kBookmarkFolderButtonHeight;
-  if (otherBookmarksButton_.get()) {
+  if (otherBookmarksButton_.get() && ![otherBookmarksButton_ isHidden]) {
     frame.origin.x = ([otherBookmarksButton_ frame].origin.x -
                       (frame.size.width +
                        bookmarks::kBookmarkHorizontalPadding));
+  } else {
+    frame.origin.x = (NSMaxX([otherBookmarksButton_ frame]) - frame.size.width);
   }
   [offTheSideButton_ setFrame:frame];
 }
 
 // Configure the off-the-side button (e.g. specify the node range,
 // check if we should enable or disable it, etc).
 - (void)configureOffTheSideButtonContentsAndVisibility {
   // If deleting a button while off-the-side is open, buttons may be
   // promoted from off-the-side to the bar.  Accomodate.
   if (folderController_ &&
@@ skipping 443 matching lines @@
     ++displayedButtonCount_;
   }
   NSUInteger removalCount =
       [buttons count] - (NSUInteger)displayedButtonCount_;
   if (removalCount > 0) {
     NSRange removalRange = NSMakeRange(displayedButtonCount_, removalCount);
     [buttons removeObjectsInRange:removalRange];
   }
 }
 
+// Shows or hides the Other Bookmarks button as appropriate, and returns
+// whether it ended up visible.
+- (BOOL)setOtherBookmarksButtonVisibility {
+  if (!otherBookmarksButton_.get())
+    return NO;
+
+  BOOL visible = ![otherBookmarksButton_ bookmarkNode]->empty();
+  [otherBookmarksButton_ setHidden:!visible];
+  return visible;
+}
+
 // Create the button for "Other Bookmarks" on the right of the bar.
 - (void)createOtherBookmarksButton {
   // Can't create this until the model is loaded, but only need to
   // create it once.
-  if (otherBookmarksButton_.get())
+  if (otherBookmarksButton_.get()) {
+    [self setOtherBookmarksButtonVisibility];
     return;
+  }
 
   // TODO(jrg): remove duplicate code
   NSCell* cell = [self cellForBookmarkNode:bookmarkModel_->other_node()];
   int ignored = 0;
   NSRect frame = [self frameForBookmarkButtonFromCell:cell xOffset:&ignored];
   frame.origin.x = [[self buttonView] bounds].size.width - frame.size.width;
   frame.origin.x -= bookmarks::kBookmarkHorizontalPadding;
   BookmarkButton* button = [[BookmarkButton alloc] initWithFrame:frame];
   [button setDraggable:NO];
   [button setActsOnMouseDown:YES];
   otherBookmarksButton_.reset(button);
   view_id_util::SetID(button, VIEW_ID_OTHER_BOOKMARKS);
 
   // Make sure this button, like all other BookmarkButtons, lives
   // until the end of the current event loop.
   [[button retain] autorelease];
 
   // Peg at right; keep same height as bar.
   [button setAutoresizingMask:(NSViewMinXMargin)];
   [button setCell:cell];
   [button setDelegate:self];
   [button setTarget:self];
   [button setAction:@selector(openBookmarkFolderFromButton:)];
   [buttonView_ addSubview:button];
 
+  [self setOtherBookmarksButtonVisibility];
+
   // Now that it's here, move the chevron over.
   [self positionOffTheSideButton];
 }
 
 // Now that the model is loaded, set the bookmark bar root as the node
 // represented by the bookmark bar (default, background) menu.
 - (void)setNodeForBarMenu {
   const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode();
   BookmarkMenu* menu = static_cast<BookmarkMenu*>([[self view] menu]);
 
@@ skipping 189 matching lines @@
 }
 
 - (void)redistributeButtonsOnBarAsNeeded {
   const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode();
   NSInteger barCount = node->child_count();
 
   // Determine the current maximum extent of the visible buttons.
   CGFloat maxViewX = NSMaxX([[self view] bounds]);
   NSButton* otherBookmarksButton = otherBookmarksButton_.get();
   // If necessary, pull in the width to account for the Other Bookmarks button.
-  if (otherBookmarksButton_)
+  if ([self setOtherBookmarksButtonVisibility])
     maxViewX = [otherBookmarksButton frame].origin.x -
         bookmarks::kBookmarkHorizontalPadding;
+
+  [self positionOffTheSideButton];
   // If we're already overflowing, then we need to account for the chevron.
   if (barCount > displayedButtonCount_)
     maxViewX = [offTheSideButton_ frame].origin.x -
         bookmarks::kBookmarkHorizontalPadding;
 
   // As a result of pasting or dragging, the bar may now have more buttons
   // than will fit so remove any which overflow.  They will be shown in
   // the off-the-side folder.
   while (displayedButtonCount_ > 0) {
     BookmarkButton* button = [buttons_ lastObject];
@@ skipping 519 matching lines @@
   // If a context menu is open, close it.
   [self cancelMenuTracking];
 
   const BookmarkNode* newNode = newParent->GetChild(newIndex);
   id<BookmarkButtonControllerProtocol> newController =
       [self controllerForNode:newParent];
   [newController addButtonForNode:newNode atIndex:newIndex];
   // If we go from 0 --> 1 bookmarks we may need to hide the
   // "bookmarks go here" text container.
   [self showOrHideNoItemContainerForNode:model->GetBookmarkBarNode()];
+  // Cope with chevron or "Other Bookmarks" buttons possibly changing state.
+  [self reconfigureBookmarkBar];
 }
 
 // TODO(jrg): for now this is brute force.
 - (void)nodeChanged:(BookmarkModel*)model
                node:(const BookmarkNode*)node {
   [self loaded:model];
 }
 
 - (void)nodeMoved:(BookmarkModel*)model
         oldParent:(const BookmarkNode*)oldParent oldIndex:(int)oldIndex
         newParent:(const BookmarkNode*)newParent newIndex:(int)newIndex {
   const BookmarkNode* movedNode = newParent->GetChild(newIndex);
   id<BookmarkButtonControllerProtocol> oldController =
       [self controllerForNode:oldParent];
   id<BookmarkButtonControllerProtocol> newController =
       [self controllerForNode:newParent];
   if (newController == oldController) {
     [oldController moveButtonFromIndex:oldIndex toIndex:newIndex];
   } else {
     [oldController removeButton:oldIndex animate:NO];
     [newController addButtonForNode:movedNode atIndex:newIndex];
   }
   // If the bar is one of the parents we may need to update the visibility
   // of the "bookmarks go here" presentation.
   [self showOrHideNoItemContainerForNode:model->GetBookmarkBarNode()];
-  // If we moved the only item on the "off the side" menu somewhere
-  // else, we may no longer need to show it.
-  [self configureOffTheSideButtonContentsAndVisibility];
+  // Cope with chevron or "Other Bookmarks" buttons possibly changing state.
+  [self reconfigureBookmarkBar];
 }
 
 - (void)nodeRemoved:(BookmarkModel*)model
              parent:(const BookmarkNode*)oldParent index:(int)index {
   // If a context menu is open, close it.
   [self cancelMenuTracking];
 
   // Locate the parent node. The parent may not be showing, in which case
   // we do nothing.
   id<BookmarkButtonControllerProtocol> parentController =
@@ skipping 591 matching lines @@
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end