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

chrome/browser/ui/views/toolbar/browser_actions_container.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
 
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
@@ skipping 267 matching lines @@
   void ToolbarExtensionAdded(const extensions::Extension* extension,
                              int index) override;
   void ToolbarExtensionRemoved(const extensions::Extension* extension) override;
   void ToolbarExtensionMoved(const extensions::Extension* extension,
                              int index) override;
   void ToolbarExtensionUpdated(const extensions::Extension* extension) override;
   bool ShowExtensionActionPopup(const extensions::Extension* extension,
                                 bool grant_active_tab) override;
   void ToolbarVisibleCountChanged() override;
   void ToolbarHighlightModeChanged(bool is_highlighting) override;
-  void OnToolbarReorderNecessary(content::WebContents* web_contents) override;
   Browser* GetBrowser() override;
 
   void LoadImages();
 
   // Called when an action's visibility may have changed.
   void OnBrowserActionVisibilityChanged();
 
   // Returns the preferred width of the container in order to show all icons
   // that should be visible and, optionally, the chevron.
   int GetPreferredWidth();
@@ skipping 14 matching lines @@
   size_t WidthToIconCount(int pixels) const;
 
   // Returns the absolute minimum size you can shrink the container down to and
   // still show it. If there's no chevron (i.e., there's a separate overflow
   // container), this leaves only enough room for the resize area; otherwise,
   // this assumes a visible chevron because the only way we would not have a
   // chevron when shrinking down this far is if there were no icons, in which
   // case the container wouldn't be shown at all.
   int MinimumNonemptyWidth() const;
 
-  // Animates to the target size (unless testing, in which case we go straight
-  // to the target size).
+  // Animate to the target size (unless testing, in which case we go straight to
+  // the target size).
   void Animate(gfx::Tween::Type type, size_t num_visible_icons);
 
-  // Reorders the views to match the toolbar model for the active tab.
-  void ReorderViews();
-
   // Returns the number of icons that this container should draw. This differs
-  // from the model's visible_icon_count if this container is for the overflow.
+  // from the model's GetVisibleIconCount if this container is for the overflow.
   size_t GetIconCount() const;
 
   // Whether this container is in overflow mode (as opposed to in 'main'
   // mode). See class comments for details on the difference.
   bool in_overflow_mode() const { return main_container_ != NULL; }
 
   // Whether or not the container has been initialized.
   bool initialized_;
 
   // The vector of toolbar actions (icons/image buttons for each action).
@@ skipping 28 matching lines @@
 
   // The painter used when we are highlighting a subset of extensions.
   scoped_ptr<views::Painter> highlight_painter_;
 
   // The animation that happens when the container snaps to place.
   scoped_ptr<gfx::SlideAnimation> resize_animation_;
 
   // Don't show the chevron while animating.
   bool suppress_chevron_;
 
-  // True if we should suppress animation; we typically do this e.g. when
-  // switching tabs changes the state of the icons.
-  bool suppress_animation_;
-
-  // True if we should suppress layout, such as when we are creating or
-  // adjusting a lot of views.
-  bool suppress_layout_;
-
   // This is used while the user is resizing (and when the animations are in
   // progress) to know how wide the delta is between the current state and what
   // we should draw.
   int resize_amount_;
 
   // Keeps track of the absolute pixel width the container should have when we
   // are done animating.
   int animation_target_size_;
 
   // The DropPosition for the current drag-and-drop operation, or NULL if there
   // is none.
   scoped_ptr<DropPosition> drop_position_;
 
   // The class that registers for keyboard shortcuts for extension commands.
   scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
 
   ObserverList<BrowserActionsContainerObserver> observers_;
 
   // The maximum number of icons to show per row when in overflow mode (showing
   // icons in the application menu).
   static int icons_per_overflow_menu_row_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_