Fix three small bugs in BrowserActionsContainer

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 289 matching lines @@
   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();
 
   // Sets the chevron to be visible or not based on whether all browser actions
   // are displayed.
   void SetChevronVisibility();
 
-  // Given a number of |icons| and whether to |display_chevron|, returns the
-  // amount of pixels needed to draw the entire container.  For convenience,
-  // callers can set |icons| to -1 to mean "all icons".
-  int IconCountToWidth(int icons, bool display_chevron) const;
+  // Given a number of |icons|, returns the pixels needed to draw the entire
+  // container (including the chevron if the number of icons is not all the
+  // icons and we're not using the redesign). For convenience, callers can set

[Peter Kasting, 2014/10/02 21:49:56]

These two edited comments appear to be the only references to "the redesign". 
Unless you intend to remove these references within the next week or two, it
would probably be better to be more clear about what you mean, stated in terms
of variables/methods/classes this file already refers to.

[Devlin, 2014/10/02 22:11:06]

Good point. Done.

+  // |icons| to -1 to mean "all icons".
+  int IconCountToWidth(int icons) const;
 
   // Given a pixel width, returns the number of icons that fit.  (This
   // automatically determines whether a chevron will be needed and includes it
   // in the calculation.)
   size_t WidthToIconCount(int pixels) const;
 
   // Returns the absolute minimum size you can shrink the container down to and
-  // still show it.  This assumes a visible chevron because the only way we
+  // still show it. In the redesign, 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;
 
   // 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);
 
   // Returns true if this extension should be shown in this toolbar. This can
   // return false if we are in an incognito window and the extension is disabled
@@ skipping 74 matching lines @@
   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_