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

chrome/browser/ui/views/toolbar/wrench_menu.cc

 // 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.
 
 #include "chrome/browser/ui/views/toolbar/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 1044 matching lines @@
   ui::Accelerator menu_accelerator;
   if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator))
     return false;
 
   *accelerator = ui::Accelerator(menu_accelerator.key_code(),
                                  menu_accelerator.modifiers());
   return true;
 }
 
 void WrenchMenu::WillShowMenu(MenuItemView* menu) {
+  // If we're showing the root menu, we need to initialize the extension
+  // overflow container, because it needs to know the width of other
+  // children in the menu before it can size itself.
+  // Ideally, we'd do this earlier, but other menu sizes aren't fully set until
+  // after the menu is told to run.
+  if (menu == root_ && extension_overflow_.get())
+    extension_overflow_->Init(root_);
   if (menu == bookmark_menu_)
     CreateBookmarkMenu();
 }
 
 void WrenchMenu::WillHideMenu(MenuItemView* menu) {
   // Turns off the fade out animation of the wrench menus if
   // |feedback_menu_item_| is selected.  This excludes the wrench menu itself
   // from the snapshot in the feedback UI.
   if (menu->HasSubmenu() && feedback_menu_item_ &&
       feedback_menu_item_->IsSelected()) {
@@ skipping 53 matching lines @@
 #endif
 
       item->SetMargins(top_margin, bottom_margin);
     }
 
     if (model->GetTypeAt(i) == MenuModel::TYPE_SUBMENU)
       PopulateMenu(item, model->GetSubmenuModelAt(i));
 
     switch (model->GetCommandIdAt(i)) {
       case IDC_EXTENSIONS_OVERFLOW_MENU: {
-        scoped_ptr<ExtensionToolbarMenuView> extension_toolbar(
-            new ExtensionToolbarMenuView(browser_, this));
-        if (extension_toolbar->GetPreferredSize().height() > 0)
-          item->AddChildView(extension_toolbar.release());
-        else
+        extension_overflow_.reset(new ExtensionToolbarMenuView(browser_, this));
+        if (extension_overflow_->GetPreferredSize().height() > 0) {
+          extension_overflow_->set_owned_by_client();
+          item->AddChildView(extension_overflow_.get());
+        } else {
+          extension_overflow_.reset();
           item->SetVisible(false);
+        }
         break;
       }
 
       case IDC_CUT:
         DCHECK_EQ(MenuModel::TYPE_COMMAND, model->GetTypeAt(i));
         DCHECK_LT(i + 2, max);
         DCHECK_EQ(IDC_COPY, model->GetCommandIdAt(i + 1));
         DCHECK_EQ(IDC_PASTE, model->GetCommandIdAt(i + 2));
         item->SetTitle(l10n_util::GetStringUTF16(IDS_EDIT2));
         item->AddChildView(new CutCopyPasteView(this, model,
@@ skipping 107 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int WrenchMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }