[Mac] Prep for animating the Browser Action Buttons in and out....

chrome/browser/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2010 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 "browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "app/resource_bundle.h"
@@ skipping 45 matching lines @@
 - (void)createActionButtonForExtension:(Extension*)extension
                              withIndex:(NSUInteger)index;
 
 // Removes an action button for the given extension from the container. This
 // method also does not affect the underlying toolbar model since it is called
 // when the toolbar model changes.
 - (void)removeActionButtonForExtension:(Extension*)extension;
 
 // Useful in the case of a Browser Action being added/removed from the middle of
 // the container, this method repositions each button according to the current
-// toolbar model.
-- (void)repositionActionButtonsAndAnimate:(BOOL)animate;
+// toolbar model. Since during an insert or remove, the icons to the right will
+// be the only ones needing a position change, a starting point is provided.
+- (void)repositionActionButtonsStartingAtIndex:(NSUInteger)index
+                                       animate:(BOOL)animate;
 
 // During container resizing, buttons become more transparent as they are pushed
 // off the screen. This method updates each button's opacity determined by the
 // position of the button.
 - (void)updateButtonOpacity;
 
 // Returns the existing button with the given extension backing it; nil if it
 // cannot be found or the extension's ID is invalid.
 - (BrowserActionButton*)buttonForExtension:(Extension*)extension;
 
@@ skipping 103 matching lines @@
         break;
       }
       default:
         NOTREACHED() << L"Unexpected notification";
     }
   }
 
   // ExtensionToolbarModel::Observer implementation.
   void BrowserActionAdded(Extension* extension, int index) {
     [owner_ createActionButtonForExtension:extension withIndex:index];
-    [owner_ resizeContainerAndAnimate:NO];
   }
 
   void BrowserActionRemoved(Extension* extension) {
     [owner_ removeActionButtonForExtension:extension];
-    [owner_ resizeContainerAndAnimate:NO];
   }
 
  private:
   // The object we need to inform when we get a notification. Weak. Owns us.
   BrowserActionsController* owner_;
 
   // Used for registering to receive notifications and automatic clean up.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsServiceObserverBridge);
@@ skipping 59 matching lines @@
     chevronAnimation_.reset([[NSViewAnimation alloc] init]);
     [chevronAnimation_ gtm_setDuration:kAnimationDuration
                              eventMask:NSLeftMouseDownMask];
     [chevronAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
 
     hiddenButtons_.reset([[NSMutableArray alloc] init]);
     buttons_.reset([[NSMutableDictionary alloc] init]);
     [self createButtons];
     [self showChevronIfNecessaryInFrame:[containerView_ frame] animate:NO];
     [self updateGrippyCursors];
+    isInitialized_ = YES;
   }
 
   return self;
 }
 
 - (void)dealloc {
   if (toolbarModel_)
     toolbarModel_->RemoveObserver(observer_.get());
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ skipping 24 matching lines @@
   if (iconCount < 0)  // If no buttons are hidden.
     iconCount = [self buttonCount];
 
   [containerView_ resizeToWidth:[self containerWidthWithButtonCount:iconCount]
                         animate:animate];
   NSRect frame = animate ? [containerView_ animationEndFrame] :
                            [containerView_ frame];
 
   [self showChevronIfNecessaryInFrame:frame animate:animate];
 
-  if (!animate) {
-    [[NSNotificationCenter defaultCenter]
-        postNotificationName:kBrowserActionVisibilityChangedNotification
-                      object:self];
-  }
+  [[NSNotificationCenter defaultCenter]
+      postNotificationName:kBrowserActionVisibilityChangedNotification
+                    object:self];
 }
 
 - (NSView*)browserActionViewForExtension:(Extension*)extension {
   for (BrowserActionButton* button in [buttons_ allValues]) {
     if ([button extension] == extension)
       return button;
   }
   NOTREACHED();
   return nil;
 }
@@ skipping 119 matching lines @@
                   tabId:[self currentTabId]] autorelease];
   [newButton setTarget:self];
   [newButton setAction:@selector(browserActionClicked:)];
   NSString* buttonKey = base::SysUTF8ToNSString(extension->id());
   if (!buttonKey)
     return;
 
   [buttons_ setObject:newButton forKey:buttonKey];
   if (index < [self containerButtonCapacity]) {
     [containerView_ addSubview:newButton];
+    if (!profile_->IsOffTheRecord() && isInitialized_)
+      toolbarModel_->SetVisibleIconCount([self visibleButtonCount]);
   } else {
     [hiddenButtons_ addObject:newButton];
     [newButton setAlphaValue:0.0];
     [self updateOverflowMenu];
   }
 
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(actionButtonDragging:)
              name:kBrowserActionButtonDraggingNotification
            object:newButton];
 
-  [self repositionActionButtonsAndAnimate:NO];
   [containerView_ setMaxWidth:
       [self containerWidthWithButtonCount:[self buttonCount]]];
-  [containerView_ setNeedsDisplay:YES];
+  [self resizeContainerAndAnimate:isInitialized_];
+
+  // TODO(andybons): Use isInitialized_ to animate this.
+  [self repositionActionButtonsStartingAtIndex:0 animate:NO];
 }
 
 - (void)removeActionButtonForExtension:(Extension*)extension {
   if (!extension->browser_action())
     return;
 
   NSString* buttonKey = base::SysUTF8ToNSString(extension->id());
   if (!buttonKey)
     return;
 
   BrowserActionButton* button = [buttons_ objectForKey:buttonKey];
+  [buttons_ removeObjectForKey:buttonKey];
   // This could be the case in incognito, where only a subset of extensions are
   // shown.
   if (!button)
     return;
 
   [button removeFromSuperview];
-  // It may or may not be hidden, but it won't matter to NSMutableArray either
-  // way.
-  [hiddenButtons_ removeObject:button];
-  [self updateOverflowMenu];
 
-  [buttons_ removeObjectForKey:buttonKey];
+  if ([hiddenButtons_ containsObject:button]) {
+    [hiddenButtons_ removeObject:button];
+    [self updateOverflowMenu];
+  } else {
+    if (!profile_->IsOffTheRecord() && isInitialized_)
+      toolbarModel_->SetVisibleIconCount([self visibleButtonCount]);
+  }
+
   if ([self buttonCount] == 0) {
     // No more buttons? Hide the container.
     [containerView_ setHidden:YES];
   } else {
-    [self repositionActionButtonsAndAnimate:NO];
+    [self repositionActionButtonsStartingAtIndex:0 animate:NO];
   }
   [containerView_ setMaxWidth:
       [self containerWidthWithButtonCount:[self buttonCount]]];
-  [containerView_ setNeedsDisplay:YES];
+  [self resizeContainerAndAnimate:isInitialized_];
 }
 
-- (void)repositionActionButtonsAndAnimate:(BOOL)animate {
+- (void)repositionActionButtonsStartingAtIndex:(NSUInteger)index
+                                       animate:(BOOL)animate {
   NSUInteger i = 0;
   for (ExtensionList::iterator iter = toolbarModel_->begin();
        iter != toolbarModel_->end(); ++iter) {
     if (![self shouldDisplayBrowserAction:*iter])
       continue;
+
+    if (i < index) {
+      ++i;
+      continue;
+    }
     BrowserActionButton* button = [self buttonForExtension:(*iter)];
     if (!button)
       continue;
     if (![button isBeingDragged])
       [self moveButton:button toIndex:i animate:animate];
     ++i;
   }
 }
 
 - (void)updateButtonOpacity {
@@ skipping 120 matching lines @@
   NSUInteger index = 0;
   for (ExtensionList::iterator iter = toolbarModel_->begin();
        iter != toolbarModel_->end(); ++iter) {
     BrowserActionButton* button = [self buttonForExtension:(*iter)];
     CGFloat intersectionWidth =
         NSWidth(NSIntersectionRect(draggedButtonFrame, [button frame]));
 
     if (intersectionWidth > dragThreshold && button != draggedButton &&
         ![button isAnimating] && index < [self visibleButtonCount]) {
       toolbarModel_->MoveBrowserAction([draggedButton extension], index);
-      [self repositionActionButtonsAndAnimate:YES];
+      [self repositionActionButtonsStartingAtIndex:0 animate:YES];
       return;
     }
     ++index;
   }
 }
 
 - (void)actionButtonDragFinished:(NSNotification*)notification {
   [self showChevronIfNecessaryInFrame:[containerView_ frame] animate:YES];
-  [self repositionActionButtonsAndAnimate:YES];
+  [self repositionActionButtonsStartingAtIndex:0 animate:YES];
 }
 
 - (void)moveButton:(BrowserActionButton*)button
            toIndex:(NSUInteger)index
            animate:(BOOL)animate {
   CGFloat xOffset = kGrippyXOffset +
       (index * (kBrowserActionWidth + kBrowserActionButtonPadding));
   NSRect buttonFrame = [button frame];
   buttonFrame.origin.x = xOffset;
   [button setFrame:buttonFrame animate:animate];
@@ skipping 140 matching lines @@
        iter != toolbarModel_->end(); ++iter) {
     if (i == index)
       return [buttons_ objectForKey:base::SysUTF8ToNSString((*iter)->id())];
 
     ++i;
   }
   return nil;
 }
 
 @end