Views: Rebuild wrench menu if error is added or removed

chrome/browser/ui/views/toolbar_view.h

 // Copyright (c) 2011 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 CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
 #pragma once
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 #include "chrome/browser/ui/views/accessible_pane_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/reload_button.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/models/accelerator.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
 
 class BrowserActionsContainer;
 class Browser;
 class Profile;
-class WrenchMenu;
 
 namespace views {
 class MenuListener;
 }
 
 // The Browser Window's toolbar.
 class ToolbarView : public AccessiblePaneView,
                     public views::ViewMenuDelegate,
                     public ui::AcceleratorProvider,
                     public LocationBarView::Delegate,
@@ skipping 153 matching lines @@
 
   // Contents of the profiles menu to populate with profile names.
   scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // 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_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_