estade:- This revert is to fix interactive ui test failures which have been broken since Wednesday. Your CL

is not at fault though. 42498 seems to be the culprit. I had to revert your CL as it leads to conflicts while
reverting 42498

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

This crash didn't actually affect linux/views (for some reason the RunContextMenu() call seems to never return).

BUG=38964
TEST=crash an extension while the context menu for it is showing.

Review URL: http://codereview.chromium.org/1237004

TBR=estade@chromium.org
Review URL: http://codereview.chromium.org/1423002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42778 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 28 deletions

diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc
index 7ccaee8..b23cb76 100644
--- a/chrome/browser/views/browser_actions_container.cc
+++ b/chrome/browser/views/browser_actions_container.cc
@@ -125,13 +125,7 @@ BrowserActionButton::BrowserActionButton(Extension* extension,
                                Extension::kBrowserActionIconMaxSize));
 }
 
-void BrowserActionButton::Destroy() {
-  if (showing_context_menu_) {
-    context_menu_menu_->CancelMenu();
-    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-  } else {
-    delete this;
-  }
+BrowserActionButton::~BrowserActionButton() {
 }
 
 gfx::Insets BrowserActionButton::GetInsets() const {
@@ -241,8 +235,6 @@ bool BrowserActionButton::OnMousePressed(const views::MouseEvent& e) {
     context_menu_menu_->RunContextMenuAt(point);
 
     SetButtonNotPushed();
-    showing_context_menu_ = false;
-
     return false;
   } else if (IsPopup()) {
     return MenuButton::OnMousePressed(e);
@@ -284,9 +276,6 @@ void BrowserActionButton::SetButtonNotPushed() {
   menu_visible_ = false;
 }
 
-BrowserActionButton::~BrowserActionButton() {
-}
-
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
@@ -300,11 +289,6 @@ BrowserActionView::BrowserActionView(Extension* extension,
   button_->UpdateState();
 }
 
-BrowserActionView::~BrowserActionView() {
-  RemoveChildView(button_);
-  button_->Destroy();
-}
-
 gfx::Canvas* BrowserActionView::GetIconWithBadge() {
   int tab_id = panel_->GetCurrentTabId();
 
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
index de6048c..45cfaf9 100644
--- a/chrome/browser/views/browser_actions_container.h
+++ b/chrome/browser/views/browser_actions_container.h
@@ -50,9 +50,7 @@ class BrowserActionButton : public views::MenuButton,
                             public NotificationObserver {
  public:
   BrowserActionButton(Extension* extension, BrowserActionsContainer* panel);
-
-  // Call this instead of delete.
-  void Destroy();
+  ~BrowserActionButton();
 
   ExtensionAction* browser_action() const { return browser_action_; }
   Extension* extension() { return extension_; }
@@ -96,12 +94,10 @@ class BrowserActionButton : public views::MenuButton,
 
   // Notifications when to set button state to pushed/not pushed (for when the
   // popup/context menu is hidden or shown by the container).
-  void SetButtonPushed();
-  void SetButtonNotPushed();
+  virtual void SetButtonPushed();
+  virtual void SetButtonNotPushed();
 
  private:
-  virtual ~BrowserActionButton();
-
   // The browser action this view represents. The ExtensionAction is not owned
   // by this class.
   ExtensionAction* browser_action_;
@@ -128,8 +124,6 @@ class BrowserActionButton : public views::MenuButton,
 
   NotificationRegistrar registrar_;
 
-  friend class DeleteTask<BrowserActionButton>;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
 };
 
@@ -142,8 +136,6 @@ class BrowserActionButton : public views::MenuButton,
 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