[Extension Toolbar] Refactor and finish pop out logic for actions

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2012 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/extensions/browser_actions_controller.h"
 
 #include <string>
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 217 matching lines @@
 @implementation BrowserActionsController
 
 @synthesize containerView = containerView_;
 @synthesize browser = browser_;
 
 #pragma mark -
 #pragma mark Public Methods
 
 - (id)initWithBrowser:(Browser*)browser
         containerView:(BrowserActionsContainerView*)container
-           isOverflow:(BOOL)isOverflow {
+       mainController:(BrowserActionsController*)mainController {
   DCHECK(browser && container);
 
   if ((self = [super init])) {
     browser_ = browser;
-    isOverflow_ = isOverflow;
+    isOverflow_ = mainController != nil;
 
     toolbarActionsBarBridge_.reset(new ToolbarActionsBarBridge(self));
+    ToolbarActionsBar* mainBar =
+        mainController ? [mainController toolbarActionsBar] : nullptr;
     toolbarActionsBar_.reset(
         new ToolbarActionsBar(toolbarActionsBarBridge_.get(),
                               browser_,
-                              isOverflow));
+                              mainBar));
 
     containerView_ = container;
     [containerView_ setPostsFrameChangedNotifications:YES];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(containerFrameChanged:)
                name:NSViewFrameDidChangeNotification
              object:containerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
@@ skipping 188 matching lines @@
   for (NSUInteger i = 0; i < [buttons_ count]; ++i) {
     if ([[buttons_ objectAtIndex:i] viewController] != toolbar_actions[i]) {
       size_t j = i + 1;
       while (toolbar_actions[i] != [[buttons_ objectAtIndex:j] viewController])
         ++j;
       [buttons_ exchangeObjectAtIndex:i withObjectAtIndex: j];
     }
   }
 
   [self showChevronIfNecessaryInFrame:[containerView_ frame]];
-  NSUInteger offset = isOverflow_ ?
+  NSUInteger minIndex = isOverflow_ ?
       [buttons_ count] - toolbarActionsBar_->GetIconCount() : 0;
-  for (NSUInteger i = offset; i < [buttons_ count]; ++i) {
-    if (![[buttons_ objectAtIndex:i] isBeingDragged])
-      [self moveButton:[buttons_ objectAtIndex:i] toIndex:i - offset];
+  NSUInteger maxIndex = isOverflow_ ?
+      [buttons_ count] : toolbarActionsBar_->GetIconCount();
+  for (NSUInteger i = 0; i < [buttons_ count]; ++i) {
+    BrowserActionButton* button = [buttons_ objectAtIndex:i];
+    if ([button isBeingDragged])
+      continue;
+
+    [self moveButton:[buttons_ objectAtIndex:i] toIndex:i - minIndex];
+
+    if (i >= minIndex && i < maxIndex) {
+      // Make sure the button is within the visible container.
+      if ([button superview] != containerView_) {
+        // We add the subview under the sibling views so that when it
+        // "slides in", it does so under its neighbors.
+        [containerView_ addSubview:button
+                        positioned:NSWindowBelow
+                        relativeTo:nil];
+      }
+      // We need to set the alpha value in case the container has resized.
+      [button setAlphaValue:1.0];
+    } else if ([button superview] == containerView_) {
+      [button removeFromSuperview];
+      [button setAlphaValue:0.0];
+    }
   }
 }
 
 - (void)removeViewForAction:(ToolbarActionViewController*)action {
   BrowserActionButton* button = [self buttonForId:action->GetId()];
 
   [button removeFromSuperview];
   [button onRemoved];
   [buttons_ removeObject:button];
 }
@@ skipping 147 matching lines @@
   CGFloat xOffset = platformSettings.left_padding +
       (indexInRow * ToolbarActionsBar::IconWidth(true));
 
   NSRect buttonFrame = [button frame];
   buttonFrame.origin.x = xOffset;
   buttonFrame.origin.y = NSMaxY([containerView_ frame]) -
        (ToolbarActionsBar::IconHeight() * (rowIndex + 1));
 
   [button setFrame:buttonFrame
            animate:!toolbarActionsBar_->suppress_animation()];
-
-  if (index < toolbarActionsBar_->GetIconCount()) {
-    // Make sure the button is within the visible container.
-    if ([button superview] != containerView_) {
-      // We add the subview under the sibling views so that when it "slides in",
-      // it does so under its neighbors.
-      [containerView_ addSubview:button
-                      positioned:NSWindowBelow
-                      relativeTo:nil];
-    }
-    // We need to set the alpha value in case the container has resized.
-    [button setAlphaValue:1.0];
-  } else if ([button superview] == containerView_) {
-    [button removeFromSuperview];
-    [button setAlphaValue:0.0];
-  }
 }
 
 - (BOOL)browserActionClicked:(BrowserActionButton*)button {
   return [button viewController]->ExecuteAction(true);
 }
 
 - (void)showChevronIfNecessaryInFrame:(NSRect)frame {
   if (!toolbarActionsBar_->platform_settings().chevron_enabled)
     return;
   bool hidden = suppressChevron_ ||
@@ skipping 85 matching lines @@
 - (ToolbarActionsBar*)toolbarActionsBar {
   return toolbarActionsBar_.get();
 }
 
 + (BrowserActionsController*)fromToolbarActionsBarDelegate:
     (ToolbarActionsBarDelegate*)delegate {
   return static_cast<ToolbarActionsBarBridge*>(delegate)->controller_for_test();
 }
 
 @end