[Extensions Toolbar Mac] Remove ToolbarActionViewDelegateCocoa

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

 // Copyright (c) 2012 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/browser_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.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/themed_window.h"
-#import "chrome/browser/ui/cocoa/toolbar/toolbar_action_view_delegate_cocoa.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_controller.h"
+#include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 NSString* const kBrowserActionButtonDraggingNotification =
     @"BrowserActionButtonDraggingNotification";
 NSString* const kBrowserActionButtonDragEndNotification =
     @"BrowserActionButtonDragEndNotification";
 
 static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
 static const CGFloat kAnimationDuration = 0.2;
 static const CGFloat kMinimumDragDistance = 5;
 
 @interface BrowserActionButton ()
 - (void)endDrag;
 - (void)updateHighlightedState;
 @end
 
 // A class to bridge the ToolbarActionViewController and the
 // BrowserActionButton.
-class ToolbarActionViewDelegateBridge : public ToolbarActionViewDelegateCocoa {
+class ToolbarActionViewDelegateBridge : public ToolbarActionViewDelegate {
  public:
   ToolbarActionViewDelegateBridge(BrowserActionButton* owner,
                                   BrowserActionsController* controller,
                                   ToolbarActionViewController* viewController);
   ~ToolbarActionViewDelegateBridge() override;
 
   // Shows the context menu for the owning action.
   void ShowContextMenu();
 
   bool user_shown_popup_visible() const { return user_shown_popup_visible_; }
 
  private:
-  // ToolbarActionViewDelegateCocoa:
+  // ToolbarActionViewDelegate:
   ToolbarActionViewController* GetPreferredPopupViewController() override;
   content::WebContents* GetCurrentWebContents() const override;
   void UpdateState() override;
   void OnPopupShown(bool by_user) override;
   void OnPopupClosed() override;
-  NSPoint GetPopupPoint() override;
 
   // A helper method to implement showing the context menu.
   void DoShowContextMenu();
 
   // The owning button. Weak.
   BrowserActionButton* owner_;
 
   // The BrowserActionsController that owns the button. Weak.
   BrowserActionsController* controller_;
 
@@ skipping 65 matching lines @@
   if (by_user)
     user_shown_popup_visible_ = true;
   [owner_ updateHighlightedState];
 }
 
 void ToolbarActionViewDelegateBridge::OnPopupClosed() {
   user_shown_popup_visible_ = false;
   [owner_ updateHighlightedState];
 }
 
-NSPoint ToolbarActionViewDelegateBridge::GetPopupPoint() {
-  return [controller_ popupPointForId:[owner_ viewController]->GetId()];
-}
-
 void ToolbarActionViewDelegateBridge::DoShowContextMenu() {
   NSButton* wrenchButton =
       [[[BrowserWindowController browserWindowControllerForWindow:
           [controller_ browser]->window()->GetNativeWindow()]
               toolbarController] wrenchButton];
   // The point the menu shows matches that of the normal wrench menu - that is,
   // the right-left most corner of the menu is left-aligned with the wrench
   // button, and the menu is displayed "a little bit" lower. It would be nice to
   // be able to avoid the magic '5' here, but since it's built into Cocoa, it's
   // not too hopeful.
@@ skipping 360 matching lines @@
 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   ui::ThemeProvider* themeProvider = [window themeProvider];
   if (!themeProvider)
     themeProvider =
         [[browserActionsController_ browser]->window()->GetNativeWindow()
             themeProvider];
   return themeProvider;
 }
 
 @end