Revert 83105 - Fix redistributeButtonsOnBarAsNeeded to not be confused by animation. Fixes bug wh...

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 1375 matching lines @@
     [noItemTextfield setHidden:NO];
     NSButton* importBookmarksButton = [buttonView_ importBookmarksButton];
     [importBookmarksButton setFrame:originalImportBookmarksRect_];
     [importBookmarksButton setHidden:NO];
     // Check each to see if they need to be shrunk or hidden.
     if ([self shrinkOrHideView:importBookmarksButton forMaxX:maxViewX])
       [self shrinkOrHideView:noItemTextfield forMaxX:maxViewX];
   }
 }
 
-// Scans through all buttons from left to right, calculating from scratch where
-// they should be based on the preceding widths, until it finds the one
-// requested.
-// Returns NSZeroRect if there is no such button in the bookmark bar.
-// Enables you to work out where a button will end up when it is done animating.
-- (NSRect)finalRectOfButton:(BookmarkButton*)wantedButton {
-  CGFloat left = bookmarks::kBookmarkHorizontalPadding;
-  NSRect buttonFrame = NSZeroRect;
-
-  for (NSButton* button in buttons_.get()) {
-    // Hidden buttons get no space.
-    if ([button isHidden])
-      continue;
-    buttonFrame = [button frame];
-    buttonFrame.origin.x = left;
-    left += buttonFrame.size.width + bookmarks::kBookmarkHorizontalPadding;
-    if (button == wantedButton)
-      return buttonFrame;
-  }
-  return NSZeroRect;
-}
-
-// Calculates the final position of the last button in the bar.
-// We can't just use [[self buttons] lastObject] frame] because the button
-// may be animating currently.
-- (NSRect)finalRectOfLastButton {
-  return [self finalRectOfButton:[[self buttons] lastObject]];
-}
-
 - (void)redistributeButtonsOnBarAsNeeded {
   const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode();
   NSInteger barCount = node->GetChildCount();
 
   // 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_)
     maxViewX = [otherBookmarksButton frame].origin.x -
         bookmarks::kBookmarkHorizontalPadding;
   // 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];
-    if (NSMaxX([self finalRectOfLastButton]) < maxViewX)
+    if (NSMaxX([button frame]) < maxViewX)
       break;
     [buttons_ removeLastObject];
     [button setDelegate:nil];
     [button removeFromSuperview];
     --displayedButtonCount_;
   }
 
   // As a result of cutting, deleting and dragging, the bar may now have room
   // for more buttons.
   int xOffset = displayedButtonCount_ > 0 ?
-      NSMaxX([self finalRectOfLastButton]) +
+      NSMaxX([[buttons_ lastObject] frame]) +
           bookmarks::kBookmarkHorizontalPadding : 0;
   for (int i = displayedButtonCount_; i < barCount; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     BookmarkButton* button = [self buttonForNode:child xOffset:&xOffset];
     // If we're testing against the last possible button then account
     // for the chevron no longer needing to be shown.
     if (i == barCount + 1)
       maxViewX += NSWidth([offTheSideButton_ frame]) +
           bookmarks::kBookmarkHorizontalPadding;
     if (NSMaxX([button frame]) >= maxViewX)
@@ skipping 1082 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