[Extensions Toolbar Mac] Remove ToolbarActionViewDelegateCocoa

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"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
-#import "chrome/browser/ui/cocoa/toolbar/toolbar_action_view_delegate_cocoa.h"
+#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
+#include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 
 namespace {
 
 // Returns the notification to listen to for activation for a particular
 // |extension_action|.
@@ skipping 47 matching lines @@
   ExtensionPopupController* popup = [ExtensionPopupController popup];
   if (popup && ![popup isClosing])
     [popup close];
 }
 
 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* popupController =
       [ExtensionPopupController showURL:popup_url
                               inBrowser:controller_->browser()
-                             anchoredAt:arrowPoint
+                             anchoredAt:GetPopupPoint()
                           arrowLocation:info_bubble::kTopRight
                                 devMode:devMode];
   return [popupController extensionViewHost];
 }
 
-ToolbarActionViewDelegateCocoa*
-ExtensionActionPlatformDelegateCocoa::GetDelegateCocoa() {
-  return static_cast<ToolbarActionViewDelegateCocoa*>(
-      controller_->view_delegate());
+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(
+        controller_->extension_action());
+  } else {
+    DCHECK_EQ(extensions::ActionInfo::TYPE_BROWSER,
+              controller_->extension_action()->action_type());
+    BrowserActionsController* actionsController =
+        [[windowController toolbarController] browserActionsController];
+    popupPoint = [actionsController popupPointForId:controller_->GetId()];
+  }
+  return popupPoint;
 }
 
 void ExtensionActionPlatformDelegateCocoa::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       CloseActivePopup();
       break;
@@ skipping 11 matching lines @@
           controller_->IsEnabled(
               controller_->view_delegate()->GetCurrentWebContents())) {
         controller_->ExecuteAction(true);
       }
       break;
     }
     default:
       NOTREACHED() << L"Unexpected notification";
   }
 }