Use the wrench menu as a reference view for overflowed extension actions' popups

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 291 matching lines @@
 
 views::Widget* BrowserActionView::GetParentForContextMenu() {
   // RunMenuAt expects a nested menu to be parented by the same widget as the
   // already visible menu, in this case the Chrome menu.
   return delegate_->ShownInsideMenu() ?
       BrowserView::GetBrowserViewForBrowser(view_controller_->browser())
           ->toolbar()->app_menu()->GetWidget() :
       GetWidget();
 }
 
+ExtensionActionViewController*
+BrowserActionView::GetPreferredPopupViewController() {
+  return delegate_->ShownInsideMenu() ?
+      delegate_->GetMainViewForExtension(extension())->view_controller() :
+      view_controller();
+}
+
 views::View* BrowserActionView::GetReferenceViewForPopup() {
   // Browser actions in the overflow menu can still show popups, so we may need
   // a reference view other than this button's parent. If so, use the overflow
   // view.
   return visible() ? this : delegate_->GetOverflowReferenceView();
 }
 
 content::WebContents* BrowserActionView::GetCurrentWebContents() {
   return delegate_->GetCurrentWebContents();
 }
@@ skipping 17 matching lines @@
   delegate_->SetPopupOwner(NULL);
 }
 
 void BrowserActionView::OnWillShowContextMenus() {
   SetButtonPushed();
 }
 
 void BrowserActionView::OnContextMenuDone() {
   SetButtonNotPushed();
 }