[Extensions UI Views] Adjust the wrench menu actions for items added/removed

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

 // Copyright 2014 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/extension_toolbar_menu_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/app_menu.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 
 namespace {
 // The delay before we close the app menu if this was opened for a drop so that
 // the user can see a browser action if one was moved.
 // This can be changed for tests.
 int g_close_menu_delay = 300;
 }
 
-ExtensionToolbarMenuView::ExtensionToolbarMenuView(Browser* browser,
-                                                   AppMenu* app_menu)
+ExtensionToolbarMenuView::ExtensionToolbarMenuView(
+    Browser* browser,
+    AppMenu* app_menu,
+    views::MenuItemView* menu_item)
     : browser_(browser),
       app_menu_(app_menu),
+      menu_item_(menu_item),
       container_(nullptr),
       max_height_(0),
       toolbar_actions_bar_observer_(this),
       weak_factory_(this) {
   BrowserActionsContainer* main =
       BrowserView::GetBrowserViewForBrowser(browser_)
           ->toolbar()->browser_actions();
   container_ = new BrowserActionsContainer(browser_, main);
   container_->Init();
   SetContents(container_);
@@ skipping 76 matching lines @@
   Redraw();
 }
 
 void ExtensionToolbarMenuView::CloseAppMenu() {
   app_menu_->CloseMenu();
 }
 
 void ExtensionToolbarMenuView::Redraw() {
   // In a case where the size of the container may have changed (e.g., by a row
   // being added or removed), we need to re-layout the menu in order to resize
-  // the view (calling Layout() on this is insufficient because other items may
-  // need to shift up or down).
-  parent()->parent()->Layout();
-  // The Menus layout code doesn't recursively call layout on its children like
-  // the default View code. Explicitly layout this view.
+  // the view. This may result in redrawing the window. Luckily, this happens
+  // only in the case of a row being aded or removed (very rare), and
+  // typically happens near menu initialization (rather than once the menu is
+  // fully open).
   Layout();
+  menu_item_->GetParentMenuItem()->ChildrenChanged();
 }
 
 int ExtensionToolbarMenuView::start_padding() const {
   // We pad enough on the left so that the first icon starts at the same point
   // as the labels. We subtract kItemSpacing because there needs to be padding
   // so we can see the drop indicator.
   return views::MenuItemView::label_start() -
       container_->toolbar_actions_bar()->platform_settings().item_spacing;
 }