Dynamically calculate the number of extension icons to show per row in overflow

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

Index: chrome/browser/ui/views/toolbar/browser_actions_container.h
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.h b/chrome/browser/ui/views/toolbar/browser_actions_container.h
index f3702c5aa560c5c1824198a68836a2d4c9d4e201..fc4425ceaba75913871a250e4b831688124ed836 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.h
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.h
@@ -248,6 +248,21 @@ class BrowserActionsContainer
   // unit tests.
   void TestSetIconVisibilityCount(size_t icons);
 
+  // Returns the width of an icon, optionally with its padding.
+  static int IconWidth(bool include_padding);
+
+  // Returns the height of an icon.
+  static int IconHeight();
+
+  // The maximum number of icons to show per row when in overflow mode (showing
+  // icons in the application menu).
+  // This is set by the active menu before display.
+  static int icons_per_overflow_menu_row;

[sky, 2014/09/11 19:42:27]

style guide says no public members.

[Devlin, 2014/09/11 20:32:13]

Done.

+
+  // Horizontal spacing between most items in the container, as well as after
+  // the last item or chevron (if visible).
+  static const int kItemSpacing;

[sky, 2014/09/11 19:42:27]

nit: constants should be first in the section (see style guide for exact order).

[Devlin, 2014/09/11 20:32:13]

Done.

+
   // During testing we can disable animations by setting this flag to true,
   // so that the bar resizes instantly, instead of having to poll it while it
   // animates to open/closed status.
@@ -261,18 +276,11 @@ class BrowserActionsContainer
   virtual void OnThemeChanged() OVERRIDE;
 
  private:
-  friend class BrowserActionView;  // So it can access IconWidth().
-
   // A struct representing the position at which an action will be dropped.
   struct DropPosition;
 
   typedef std::vector<BrowserActionView*> BrowserActionViews;
 
-  // Returns the width of an icon, optionally with its padding.
-  static int IconWidth(bool include_padding);
-
-  // Returns the height of an icon.
-  static int IconHeight();
 
   // extensions::ExtensionToolbarModel::Observer implementation.
   virtual void ToolbarExtensionAdded(const extensions::Extension* extension,