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

ui/views/controls/menu/menu_item_view.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 247 matching lines @@
 
   // Returns the command id of this item.
   int GetCommand() const { return command_; }
 
   // Paints the menu item.
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Returns the preferred size of this item.
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
 
+  // Gets the preferred height for the given |width|. This is only different
+  // from GetPreferredSize().width() if the item has a child view with flexible
+  // dimensions.
+  virtual int GetHeightForWidth(int width) const OVERRIDE;
+
   // Return the preferred dimensions of the item in pixel.
   const MenuItemDimensions& GetDimensions() const;
 
   // Returns the object responsible for controlling showing the menu.
   MenuController* GetMenuController();
   const MenuController* GetMenuController() const;
 
   // Returns the delegate. This returns the delegate of the root menu item.
   MenuDelegate* GetDelegate();
   const MenuDelegate* GetDelegate() const;
@@ skipping 134 matching lines @@
 
   // Returns number of child views excluding icon_view.
   int NonIconChildViewsCount() const;
 
   // Returns the max icon width; recurses over submenus.
   int GetMaxIconViewWidth() const;
 
   // Returns true if the menu has items with a checkbox or a radio button.
   bool HasChecksOrRadioButtons() const;
 
-  void invalidate_dimensions() { dimensions_.height = 0; }
+  void invalidate_dimensions() const { dimensions_.height = 0; }

[sky, 2014/09/12 20:09:37]

This shouldn't be const. It's modifying a member. That said, dimensions_ is
const, so you shouldn't need the const. Maybe I'm missing something.

[Devlin, 2014/09/12 22:41:37]

|dimensions_| are mutable, because it's just a value cached for performance
reasons.  But we need to invalidate them in GetHeightForWidth() (see other
comment), and, if we want to use this function (rather than just saying
"dimensions_.height = 0;"), we need to add the const here.

   bool is_dimensions_valid() const { return dimensions_.height > 0; }
 
   // The delegate. This is only valid for the root menu item. You shouldn't
   // use this directly, instead use GetDelegate() which walks the tree as
   // as necessary.
   MenuDelegate* delegate_;
 
   // The controller for the run operation, or NULL if the menu isn't showing.
   MenuController* controller_;
 
@@ skipping 78 matching lines @@
   // If set to false, the right margin will be removed for menu lines
   // containing other elements.
   bool use_right_margin_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_