Views: fix a crash where in the browser actions container....

chrome/browser/views/browser_actions_container.h

 // Copyright (c) 2010 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_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 32 matching lines @@
 
 // The BrowserActionButton is a specialization of the MenuButton class.
 // It acts on a ExtensionAction, in this case a BrowserAction and handles
 // loading the image for the button asynchronously on the file thread.
 class BrowserActionButton : public views::MenuButton,
                             public views::ButtonListener,
                             public ImageLoadingTracker::Observer,
                             public NotificationObserver {
  public:
   BrowserActionButton(Extension* extension, BrowserActionsContainer* panel);
-  ~BrowserActionButton();
+
+  // Call this instead of delete.
+  void Destroy();
 
   ExtensionAction* browser_action() const { return browser_action_; }
   Extension* extension() { return extension_; }
 
   // Called to update the display to match the browser action's state.
   void UpdateState();
 
   // Returns the default icon, if any.
   const SkBitmap& default_icon() const { return default_icon_; }
 
@@ skipping 23 matching lines @@
   virtual void OnMouseReleased(const views::MouseEvent& e, bool canceled);
   virtual bool OnKeyReleased(const views::KeyEvent& e);
   virtual void OnMouseExited(const views::MouseEvent& event);
 
   // Does this button's action have a popup?
   virtual bool IsPopup();
   virtual GURL GetPopupUrl();
 
   // Notifications when to set button state to pushed/not pushed (for when the
   // popup/context menu is hidden or shown by the container).
-  virtual void SetButtonPushed();
-  virtual void SetButtonNotPushed();
+  void SetButtonPushed();
+  void SetButtonNotPushed();
 
  private:
+  virtual ~BrowserActionButton();
+
   // The browser action this view represents. The ExtensionAction is not owned
   // by this class.
   ExtensionAction* browser_action_;
 
   // The extension associated with the browser action we're displaying.
   Extension* extension_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously.
   ImageLoadingTracker tracker_;
 
   // Whether we are currently showing/just finished showing a context menu.
   bool showing_context_menu_;
 
   // The default icon for our browser action. This might be non-empty if the
   // browser action had a value for default_icon in the manifest.
   SkBitmap default_icon_;
 
   // The browser action shelf.
   BrowserActionsContainer* panel_;
 
   scoped_ptr<ExtensionContextMenuModel> context_menu_contents_;
   scoped_ptr<views::Menu2> context_menu_menu_;
 
   NotificationRegistrar registrar_;
 
+  friend class DeleteTask<BrowserActionButton>;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
 // A single section in the browser action container. This contains the actual
 // BrowserActionButton, as well as the logic to paint the badge.
 
 class BrowserActionView : public views::View {
  public:
   BrowserActionView(Extension* extension, BrowserActionsContainer* panel);
+  virtual ~BrowserActionView();
+
   BrowserActionButton* button() { return button_; }
 
   // Allocates a canvas object on the heap and draws into it the icon for the
   // view as well as the badge (if any). Caller is responsible for deleting the
   // returned object.
   gfx::Canvas* GetIconWithBadge();
 
   // Accessibility accessors, overridden from View.
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual bool GetAccessibleName(std::wstring* name);
@@ skipping 329 matching lines @@
 
   ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_