Views: Rebuild wrench menu if error is added or removed

chrome/browser/ui/views/toolbar_view.h

Index: chrome/browser/ui/views/toolbar_view.h
===================================================================
--- chrome/browser/ui/views/toolbar_view.h	(revision 104036)
+++ chrome/browser/ui/views/toolbar_view.h	(working copy)
@@ -25,7 +25,6 @@
 class BrowserActionsContainer;
 class Browser;
 class Profile;
-class WrenchMenu;
 
 namespace views {
 class MenuListener;
@@ -199,12 +198,6 @@
   // The display mode used when laying out the toolbar.
   DisplayMode display_mode_;
 
-  // The contents of the wrench menu.
-  scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_;
-
-  // Wrench menu.
-  scoped_ptr<WrenchMenu> wrench_menu_;

[sky, 2011/10/10 17:28:53]

Keep this one as a member, otherwise we can run into weird deletion ordering and
stack unwinding problems (see note in MenuRunner for more details).

[sail, 2011/10/10 17:47:02]

Done.

-
   // A list of listeners to call when the menu opens.
   ObserverList<views::MenuListener> menu_listeners_;