Fix DCHECK in BrowserActionsContainer::OnWidgetClosing

BUG=116270
TEST=See issue


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

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

chrome/browser/ui/views/browser_actions_container.cc

@@ -834,9 +834,15 @@ void BrowserActionsContainer::MoveBrowserAction(const std::string& extension_id,
 }
 
 void BrowserActionsContainer::HidePopup() {
+  // Remove this as an observer and clear |popup_| and |popup_button_| here,
+  // since we might change them before OnWidgetClosing() gets called.
   if (popup_) {
+    popup_->GetWidget()->RemoveObserver(this);
     popup_->GetWidget()->Close();
-    // NULL out popup_button_ in case it's being deleted.
+    popup_ = NULL;
+  }
+  if (popup_button_) {
+    popup_button_->SetButtonNotPushed();
     popup_button_ = NULL;
   }
 }