[Extensions Mac UI] Fix more bugs in the action overflow container

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/extensions/extension_message_bubble_controller.h"
@@ skipping 582 matching lines @@
   [self showChevronIfNecessaryInFrame:[containerView_ frame]];
   NSUInteger minIndex = isOverflow_ ?
       [buttons_ count] - toolbarActionsBar_->GetIconCount() : 0;
   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];
+    [self moveButton:[buttons_ objectAtIndex:i] toIndex:i];
 
     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];
       }
@@ skipping 244 matching lines @@
 }
 
 - (void)actionButtonDragFinished:(NSNotification*)notification {
   suppressChevron_ = NO;
   [self redraw];
 }
 
 - (NSRect)frameForIndex:(NSUInteger)index {
   const ToolbarActionsBar::PlatformSettings& platformSettings =
       toolbarActionsBar_->platform_settings();
+  int startIndex = isOverflow_ ?
+      [buttons_ count] - toolbarActionsBar_->GetIconCount() : 0;
+  int relativeIndex = index - startIndex;
+
+  int iconWidth = ToolbarActionsBar::IconWidth(false);
+  int iconHeight = ToolbarActionsBar::IconHeight();
+
+  // If the index is for an action that is before range we show (i.e., is for
+  // a button that's on the main bar, and this is the overflow), the frame is
+  // set outside the bounds of the view.
+  if (relativeIndex < 0)
+    return NSMakeRect(-iconWidth - 1, 0, iconWidth, iconHeight);
+
   int icons_per_overflow_row = platformSettings.icons_per_overflow_menu_row;
-  NSUInteger rowIndex = isOverflow_ ? index / icons_per_overflow_row : 0;
-  NSUInteger indexInRow = isOverflow_ ? index % icons_per_overflow_row : index;
+  NSUInteger rowIndex = isOverflow_ ?
+      relativeIndex / icons_per_overflow_row : 0;
+  NSUInteger indexInRow = isOverflow_ ?
+      relativeIndex % icons_per_overflow_row : relativeIndex;
 
   CGFloat xOffset = platformSettings.left_padding +
       (indexInRow * ToolbarActionsBar::IconWidth(true));
   CGFloat yOffset = NSHeight([containerView_ frame]) -
        (ToolbarActionsBar::IconHeight() * (rowIndex + 1));
 
   return NSMakeRect(xOffset,
                     yOffset,
                     ToolbarActionsBar::IconWidth(false),
                     ToolbarActionsBar::IconHeight());
@@ skipping 170 matching lines @@
 }
 
 #pragma mark -
 #pragma mark Testing Methods
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   return index < [buttons_ count] ? [buttons_ objectAtIndex:index] : nil;
 }
 
 @end