Fix DCHECK in BrowserActionsContainer::OnWidgetClosing

chrome/browser/ui/views/browser_actions_container.cc

Index: chrome/browser/ui/views/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index ef3dd6e7008693358b448560840b4d8e19296beb..84dcfec58237d54eab479eecdf191b75a81f51ee 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -813,8 +813,12 @@ void BrowserActionsContainer::InspectPopup(ExtensionAction* action) {
 }
 
 void BrowserActionsContainer::OnWidgetClosing(views::Widget* widget) {
-  DCHECK_EQ(popup_->GetWidget(), widget);
-  popup_->GetWidget()->RemoveObserver(this);
+  // Always remove this as an observer of a closing popup.
+  widget->RemoveObserver(this);
+  // If a new popup has been opened before this gets called, popup_ will
+  // point to the new popup, so just return.
+  if (popup_->GetWidget() != widget)
+    return;
   popup_ = NULL;
   // |popup_button_| is NULL if the extension has been removed.
   if (popup_button_) {
@@ -834,8 +838,12 @@ void BrowserActionsContainer::MoveBrowserAction(const std::string& extension_id,
 }
 
 void BrowserActionsContainer::HidePopup() {
-  if (popup_) {
+  if (popup_)
     popup_->GetWidget()->Close();

[sky, 2012/03/01 21:06:01]

I think we should remove the observer at line 841 so that we don't have the
situation of a delayed OnWidgetclosing causing problems.

[stevenjb, 2012/03/02 19:43:47]

Agreed. Added that and set popup_ to NULL here + cleaned up comments.

+  if (popup_button_) {
+    // Set the popup button to not pushed here, since we might change popup_
+    // before OnWidgetClosing() gets called.
+    popup_button_->SetButtonNotPushed();
     // NULL out popup_button_ in case it's being deleted.
     popup_button_ = NULL;
   }