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

1 files changed, 1 insertions, 17 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();