Keep reference view pressed while extension actions have a popup

chrome/browser/ui/views/toolbar/browser_actions_container.cc

Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
index 3d49636bb7a28233790b9676fa6cca075a0c5d3f..e96c18da5637c1158769fe7d7ee6f38f133993a7 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -291,7 +291,7 @@ void BrowserActionsContainer::OnBrowserActionViewDragDone() {
                     OnBrowserActionDragDone());
 }
 
-views::View* BrowserActionsContainer::GetOverflowReferenceView() {
+views::MenuButton* BrowserActionsContainer::GetOverflowReferenceView() {
   // With traditional overflow, the reference is the chevron. With the
   // redesign, we use the wrench menu instead.
   return chevron_ ?
@@ -300,8 +300,10 @@ views::View* BrowserActionsContainer::GetOverflowReferenceView() {
 }
 
 void BrowserActionsContainer::SetPopupOwner(BrowserActionView* popup_owner) {
-  // We should never be setting a popup owner when one already exists.
-  DCHECK(!popup_owner_ || !popup_owner);
+  // We should never be setting a popup owner when one already exists, and
+  // never unsetting one when one wasn't set.
+  DCHECK((!popup_owner_ && popup_owner) ||
+         (popup_owner_ && !popup_owner));
   popup_owner_ = popup_owner;
 }