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

chrome/browser/ui/views/toolbar/browser_actions_container.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_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 245 matching lines @@
 void BrowserActionsContainer::OnBrowserActionViewDragDone() {
   // We notify here as well as in OnPerformDrop because the dragged view is
   // removed in OnPerformDrop, so it will never get its OnDragDone() call.
   // TODO(devlin): we should see about fixing that.
   FOR_EACH_OBSERVER(BrowserActionsContainerObserver,
                     observers_,
                     OnBrowserActionDragDone());
 }
 
 views::View* BrowserActionsContainer::GetOverflowReferenceView() {
-  // We should only need an overflow reference when using the traditional
-  // chevron overflow.
-  DCHECK(chevron_);
-  return chevron_;
+  // With traditional overflow, the reference is the chevron. With the
+  // redesign, we use the wrench menu instead.
+  return chevron_ ? chevron_ :
+      BrowserView::GetBrowserViewForBrowser(browser_)->toolbar()->app_menu();

[Peter Kasting, 2014/09/11 20:23:13]

Nit: I'd probably wrap like this to ensure the arms are aligned:

  return chevron ?
      chevron_ :
      BrowserView::GetBrowserViewForBrowser(browser_)->toolbar()->app_menu();

[Devlin, 2014/09/11 20:53:42]

Sure, done.

 }
 
 void BrowserActionsContainer::SetPopupOwner(BrowserActionView* popup_owner) {
   // We should never be setting a popup owner when one already exists.
   DCHECK(!popup_owner_ || !popup_owner);
   popup_owner_ = popup_owner;
 }
 
 void BrowserActionsContainer::HideActivePopup() {
   if (popup_owner_)
     popup_owner_->view_controller()->HidePopup();
 }
 
+BrowserActionView* BrowserActionsContainer::GetMainViewForExtension(
+    const Extension* extension) {
+  return in_overflow_mode() ? main_container_->GetViewForExtension(extension) :
+                              GetViewForExtension(extension);

[Peter Kasting, 2014/09/11 20:23:13]

Tiny nit: Personally, I think this indentation is unusual and I'd do the
following, but up to you.

  return in_overflow_mode() ?
      main_container_->GetViewForExtension(extension) :
      GetViewForExtension(extension);

[Devlin, 2014/09/11 20:53:42]

I don't feel strongly, so happy to oblige. :)

+}
+
 void BrowserActionsContainer::AddObserver(
     BrowserActionsContainerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void BrowserActionsContainer::RemoveObserver(
     BrowserActionsContainerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 761 matching lines @@
   size_t absolute_model_size =
       model_size == -1 ? extensions.size() : model_size;
 
   // The main container will try to show |model_size| icons, but reduce if there
   // aren't enough displayable icons to do so.
   size_t main_displayed = std::min(displayable_icon_count, absolute_model_size);
   // The overflow will display the extras, if any.
   return in_overflow_mode() ?
       displayable_icon_count - main_displayed : main_displayed;
 }