[Extension Toolbar] Slide out overflowed actions for popups

chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.h"
 
 #include <string>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 57 matching lines @@
   registrar_.Add(
       this,
       extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
       content::Source<Profile>(controller_->browser()->profile()));
   registrar_.Add(
       this,
       GetNotificationTypeForAction(*controller_->extension_action()),
       content::Source<Profile>(controller_->browser()->profile()));
 }
 
-extensions::ExtensionViewHost*
-ExtensionActionPlatformDelegateCocoa::ShowPopupWithUrl(
-    ExtensionActionViewController::PopupShowAction show_action,
-    const GURL& popup_url,
-    bool grant_tab_permissions) {
+void ExtensionActionPlatformDelegateCocoa::ShowPopup(
+    scoped_ptr<extensions::ExtensionViewHost> host,
+    bool grant_tab_permissions,
+    ExtensionActionViewController::PopupShowAction show_action) {
+  BOOL devMode =
+      show_action == ExtensionActionViewController::SHOW_POPUP_AND_INSPECT;
+  [ExtensionPopupController host:host.Pass()
+                       inBrowser:controller_->browser()
+                      anchoredAt:GetPopupPoint()
+                   arrowLocation:info_bubble::kTopRight
+                         devMode:devMode];
+}
+
+void ExtensionActionPlatformDelegateCocoa::CloseOverflowMenu() {
   // If this was triggered by an action overflowed to the wrench menu, then
   // the wrench menu will be open. Close it before opening the popup.
   WrenchMenuController* wrenchMenuController =
       [[[BrowserWindowController
           browserWindowControllerForWindow:
               controller_->browser()->window()->GetNativeWindow()]
           toolbarController] wrenchMenuController];
   if ([wrenchMenuController isMenuOpen])
     [wrenchMenuController cancel];
-
-  BOOL devMode =
-      show_action == ExtensionActionViewController::SHOW_POPUP_AND_INSPECT;
-  ExtensionPopupController* popupController =
-      [ExtensionPopupController showURL:popup_url
-                              inBrowser:controller_->browser()
-                             anchoredAt:GetPopupPoint()
-                          arrowLocation:info_bubble::kTopRight
-                                devMode:devMode];
-  return [popupController extensionViewHost];
 }
 
 NSPoint ExtensionActionPlatformDelegateCocoa::GetPopupPoint() const {
   BrowserWindowController* windowController =
       [BrowserWindowController browserWindowControllerForWindow:
           controller_->browser()->window()->GetNativeWindow()];
   NSPoint popupPoint;
   if (controller_->extension_action()->action_type() ==
           extensions::ActionInfo::TYPE_PAGE) {
     popupPoint = [windowController locationBarBridge]->GetPageActionBubblePoint(
@@ skipping 37 matching lines @@
           controller_->IsEnabled(
               controller_->view_delegate()->GetCurrentWebContents())) {
         controller_->ExecuteAction(true);
       }
       break;
     }
     default:
       NOTREACHED() << L"Unexpected notification";
   }
 }