[Extension Toolbar] Slide out overflowed actions for popups

chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc

 // Copyright 2014 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/extensions/extension_action_platform_delegate_views.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_action.h"
+#include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/accelerator_priority.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/command.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 65 matching lines @@
         GetAcceleratorPriority(extension_command.accelerator(),
                                controller_->extension()),
         this);
   }
 }
 
 void ExtensionActionPlatformDelegateViews::OnDelegateSet() {
   GetDelegateViews()->GetAsView()->set_context_menu_controller(this);
 }
 
-extensions::ExtensionViewHost*
-ExtensionActionPlatformDelegateViews::ShowPopupWithUrl(
-    ExtensionActionViewController::PopupShowAction show_action,
-    const GURL& popup_url,
-    bool grant_tab_permissions) {
+void ExtensionActionPlatformDelegateViews::ShowPopup(
+    scoped_ptr<extensions::ExtensionViewHost> host,
+    bool grant_tab_permissions,
+    ExtensionActionViewController::PopupShowAction show_action) {
   // TOP_RIGHT is correct for both RTL and LTR, because the views platform
   // performs the flipping in RTL cases.
   views::BubbleBorder::Arrow arrow = views::BubbleBorder::TOP_RIGHT;
 
   views::View* reference_view = GetDelegateViews()->GetReferenceViewForPopup();
 
   ExtensionPopup::ShowAction popup_show_action =
       show_action == ExtensionActionViewController::SHOW_POPUP ?
           ExtensionPopup::SHOW : ExtensionPopup::SHOW_AND_INSPECT;
-  ExtensionPopup* popup = ExtensionPopup::ShowPopup(popup_url,
-                                                    controller_->browser(),
-                                                    reference_view,
-                                                    arrow,
-                                                    popup_show_action);
-  return popup->host();
+  ExtensionPopup::ShowPopup(host.Pass(),
+                            reference_view,
+                            arrow,
+                            popup_show_action);
+}
+
+void ExtensionActionPlatformDelegateViews::CloseOverflowMenu() {
+  ToolbarView* toolbar =
+      BrowserView::GetBrowserViewForBrowser(controller_->browser())->toolbar();
+  if (toolbar->IsWrenchMenuShowing())
+    toolbar->CloseAppMenu();
 }
 
 void ExtensionActionPlatformDelegateViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == extensions::NOTIFICATION_EXTENSION_COMMAND_ADDED ||
          type == extensions::NOTIFICATION_EXTENSION_COMMAND_REMOVED);
   extensions::ExtensionCommandRemovedDetails* payload =
       content::Details<extensions::ExtensionCommandRemovedDetails>(details)
@@ skipping 34 matching lines @@
   // might be hidden in an overflow menu.
   return controller_->extension_action()->action_type() ==
       ActionInfo::TYPE_PAGE ? GetDelegateViews()->GetAsView()->visible() :
           true;
 }
 
 void ExtensionActionPlatformDelegateViews::ShowContextMenuForView(
     views::View* source,
     const gfx::Point& point,
     ui::MenuSourceType source_type) {
+  LOG(WARNING) << "Show context menu for view";

[Finnur, 2015/04/27 14:39:00]

Accidentally included?

[Devlin, 2015/04/28 00:35:56]

Done.

   // If there's another active menu that won't be dismissed by opening this one,
   // then we can't show this one right away, since we can only show one nested
   // menu at a time.
   // If the other menu is an extension action's context menu, then we'll run
   // this one after that one closes. If it's a different type of menu, then we
   // close it and give up, for want of a better solution. (Luckily, this is
   // rare).
   // TODO(devlin): Update this when views code no longer runs menus in a nested
   // loop.
   if (context_menu_owner) {
     context_menu_owner->followup_context_menu_task_ =
         base::Bind(&ExtensionActionPlatformDelegateViews::DoShowContextMenu,
                    weak_factory_.GetWeakPtr(),
                    source_type);
   }
   if (CloseActiveMenuIfNeeded())
     return;
 
+  LOG(WARNING) << "Do Show";

[Finnur, 2015/04/27 14:39:00]

Accidentally included?

[Devlin, 2015/04/28 00:35:56]

Done.

   // Otherwise, no other menu is showing, and we can proceed normally.
   DoShowContextMenu(source_type);
 }
 
 void ExtensionActionPlatformDelegateViews::DoShowContextMenu(
     ui::MenuSourceType source_type) {
   ui::MenuModel* context_menu_model = controller_->GetContextMenu();
   // It's possible the extension doesn't have a context menu.
   if (!context_menu_model)
     return;
 
   DCHECK(!context_menu_owner);
   context_menu_owner = this;
 
-  // We shouldn't have both a popup and a context menu showing.
-  controller_->HideActivePopup();
-
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(GetDelegateViews()->GetAsView(),
                                     &screen_loc);
 
   int run_types =
       views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU;
   if (GetDelegateViews()->IsShownInMenu())
     run_types |= views::MenuRunner::IS_NESTED;
 
   views::Widget* parent = GetDelegateViews()->GetParentForContextMenu();
 
   menu_runner_.reset(new views::MenuRunner(context_menu_model, run_types));
 
+  // We shouldn't have both a popup and a context menu showing.
+  controller_->HideActivePopup();
+
   if (menu_runner_->RunMenuAt(
           parent,
           GetDelegateViews()->GetContextMenuButton(),
           gfx::Rect(screen_loc, GetDelegateViews()->GetAsView()->size()),
           views::MENU_ANCHOR_TOPLEFT,
           source_type) == views::MenuRunner::MENU_DELETED) {
     return;
   }
 
+  LOG(WARNING) << "Ran";

[Finnur, 2015/04/27 14:39:00]

Accidentally included? ... or just checking to see if I was paying attention? :)

[Devlin, 2015/04/28 00:35:56]

Nope, just those "rough edges" I mentioned. ;)

   context_menu_owner = NULL;
   menu_runner_.reset();
+  controller_->OnMenuClosed();
 
   // If another extension action wants to show its context menu, allow it to.
   if (!followup_context_menu_task_.is_null()) {
     base::Closure task = followup_context_menu_task_;
     followup_context_menu_task_ = base::Closure();
     task.Run();
   }
 }
 
 void ExtensionActionPlatformDelegateViews::UnregisterCommand(
@@ skipping 34 matching lines @@
   }
 
   return false;
 }
 
 ToolbarActionViewDelegateViews*
 ExtensionActionPlatformDelegateViews::GetDelegateViews() const {
   return static_cast<ToolbarActionViewDelegateViews*>(
       controller_->view_delegate());
 }