Revert of Make extensions that desire to act pop out if in overflow

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 <cmath>
 #include <string>
 
 #include "base/strings/sys_string_conversions.h"
@@ skipping 227 matching lines @@
     ExtensionPopupController* popup = [ExtensionPopupController popup];
     if (popup || !browser_->window()->IsActive())
       return false;
 
     BrowserActionButton* button = [owner_ buttonForId:extension->id()];
     return button && [button viewController]->ExecuteAction(grant_active_tab);
   }
 
   void ToolbarVisibleCountChanged() override {}
 
-  void OnToolbarReorderNecessary(content::WebContents* web_contents) override {
-    // TODO(devlin): Implement on mac.
-  }
-
   void ToolbarHighlightModeChanged(bool is_highlighting) override {}
 
   Browser* GetBrowser() override { return browser_; }
 
  private:
   // The object we need to inform when we get a notification. Weak. Owns us.
   BrowserActionsController* owner_;
 
   // The browser we listen for events from. Weak.
   Browser* browser_;
@@ skipping 90 matching lines @@
 
 - (NSUInteger)buttonCount {
   return [buttons_ count];
 }
 
 - (NSUInteger)visibleButtonCount {
   return [self buttonCount] - [hiddenButtons_ count];
 }
 
 - (void)resizeContainerAndAnimate:(BOOL)animate {
-  int iconCount = toolbarModel_->visible_icon_count();
+  int iconCount = toolbarModel_->GetVisibleIconCount();
+  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];
   }
 }
 
 - (CGFloat)savedWidth {
   if (!toolbarModel_)
     return 0;
 
-  int savedButtonCount = toolbarModel_->visible_icon_count();
-  if (static_cast<NSUInteger>(savedButtonCount) > [self buttonCount])
+  int savedButtonCount = toolbarModel_->GetVisibleIconCount();
+  if (savedButtonCount < 0 ||  // all icons are visible
+      static_cast<NSUInteger>(savedButtonCount) > [self buttonCount])
     savedButtonCount = [self buttonCount];
   return [self containerWidthWithButtonCount:savedButtonCount];
 }
 
 - (NSPoint)popupPointForId:(const std::string&)id {
   NSButton* button = [self buttonForId:id];
   if (!button)
     return NSZeroPoint;
 
   if ([hiddenButtons_ containsObject:button])
@@ skipping 440 matching lines @@
   const extensions::ExtensionList& toolbar_items =
       toolbarModel_->toolbar_items();
   if (index < toolbar_items.size()) {
     const Extension* extension = toolbar_items[index].get();
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end