[Extensions Toolbar] Move some popup logic to be platform-agnostic

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 59 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()));
 }
 
-bool ExtensionActionPlatformDelegateCocoa::IsShowingPopup() const {
-  return GetPopup() != nil;
-}
-
 void ExtensionActionPlatformDelegateCocoa::CloseActivePopup() {
   ExtensionPopupController* popup = [ExtensionPopupController popup];
   if (popup && ![popup isClosing])
     [popup close];
 }
 
 void ExtensionActionPlatformDelegateCocoa::CloseOwnPopup() {
   ExtensionPopupController* popup = GetPopup();
-  DCHECK(popup);
   if (popup && ![popup isClosing])
     [popup close];
 }
 
-bool ExtensionActionPlatformDelegateCocoa::ShowPopupWithUrl(
+extensions::ExtensionViewHost*
+ExtensionActionPlatformDelegateCocoa::ShowPopupWithUrl(
     ExtensionActionViewController::PopupShowAction show_action,
     const GURL& popup_url,
     bool grant_tab_permissions) {
   NSPoint arrowPoint = GetDelegateCocoa()->GetPopupPoint();
 
   // 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 showURL:popup_url
-                          inBrowser:controller_->browser()
-                         anchoredAt:arrowPoint
-                      arrowLocation:info_bubble::kTopRight
-                            devMode:devMode];
-  return true;
+  ExtensionPopupController* popupController =
+      [ExtensionPopupController showURL:popup_url
+                              inBrowser:controller_->browser()
+                             anchoredAt:arrowPoint
+                          arrowLocation:info_bubble::kTopRight
+                                devMode:devMode];
+  return [popupController extensionViewHost];
 }
 
 ToolbarActionViewDelegateCocoa*
 ExtensionActionPlatformDelegateCocoa::GetDelegateCocoa() {
   return static_cast<ToolbarActionViewDelegateCocoa*>(
       controller_->view_delegate());
 }
 
 ExtensionPopupController* ExtensionActionPlatformDelegateCocoa::GetPopup()
     const {
@@ skipping 24 matching lines @@
           controller_->IsEnabled(
               controller_->view_delegate()->GetCurrentWebContents())) {
         controller_->ExecuteAction(true);
       }
       break;
     }
     default:
       NOTREACHED() << L"Unexpected notification";
   }
 }