Move more extension action cocoa logic into the platform delegate

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"
@@ skipping 22 matching lines @@
 static const CGFloat kMinimumDragDistance = 5;
 
 // A class to bridge the ToolbarActionViewController and the
 // BrowserActionButton.
 class ToolbarActionViewDelegateBridge : public ToolbarActionViewDelegateCocoa {
  public:
   ToolbarActionViewDelegateBridge(BrowserActionButton* owner,
                                   BrowserActionsController* controller);
   ~ToolbarActionViewDelegateBridge();
 
+  ExtensionActionContextMenuController* menuController() {
+    return menuController_;
+  }
+
  private:
   // ToolbarActionViewDelegateCocoa:
   ToolbarActionViewController* GetPreferredPopupViewController() override;
   content::WebContents* GetCurrentWebContents() const override;
   void UpdateState() override;
   NSPoint GetPopupPoint() override;
+  void SetContextMenuController(
+      ExtensionActionContextMenuController* menuController) override;
 
   // The owning button. Weak.
   BrowserActionButton* owner_;
 
   // The BrowserActionsController that owns the button. Weak.
   BrowserActionsController* controller_;
 
+  // The context menu controller. Weak.
+  ExtensionActionContextMenuController* menuController_;
+
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionViewDelegateBridge);
 };
 
 ToolbarActionViewDelegateBridge::ToolbarActionViewDelegateBridge(
     BrowserActionButton* owner,
     BrowserActionsController* controller)
     : owner_(owner),
-      controller_(controller) {
+      controller_(controller),
+      menuController_(nil) {
 }
 
 ToolbarActionViewDelegateBridge::~ToolbarActionViewDelegateBridge() {
 }
 
 ToolbarActionViewController*
 ToolbarActionViewDelegateBridge::GetPreferredPopupViewController() {
   return [owner_ viewController];
 }
 
 content::WebContents* ToolbarActionViewDelegateBridge::GetCurrentWebContents()
     const {
   return [controller_ currentWebContents];
 }
 
 void ToolbarActionViewDelegateBridge::UpdateState() {
   [owner_ updateState];
 }
 
 NSPoint ToolbarActionViewDelegateBridge::GetPopupPoint() {
   return [controller_ popupPointForId:[owner_ viewController]->GetId()];
 }
 
+void ToolbarActionViewDelegateBridge::SetContextMenuController(
+    ExtensionActionContextMenuController* menuController) {
+  menuController_ = menuController;
+}
+
 @interface BrowserActionCell (Internals)
 - (void)drawBadgeWithinFrame:(NSRect)frame;
 @end
 
 @interface BrowserActionButton (Private)
 - (void)endDrag;
 @end
 
 @implementation BrowserActionButton
 
 @synthesize isBeingDragged = isBeingDragged_;
 
 + (Class)cellClass {
   return [BrowserActionCell class];
 }
 
 - (id)initWithFrame:(NSRect)frame
      viewController:(scoped_ptr<ToolbarActionViewController>)viewController
-         controller:(BrowserActionsController*)controller
-     menuController:(ExtensionActionContextMenuController*)menuController {
+         controller:(BrowserActionsController*)controller {
   if ((self = [super initWithFrame:frame])) {
     BrowserActionCell* cell = [[[BrowserActionCell alloc] init] autorelease];
     // [NSButton setCell:] warns to NOT use setCell: other than in the
     // initializer of a control.  However, we are using a basic
     // NSButton whose initializer does not take an NSCell as an
     // object.  To honor the assumed semantics, we do nothing with
     // NSButton between alloc/init and setCell:.
     [self setCell:cell];
 
     browserActionsController_ = controller;
@@ skipping 14 matching lines @@
       forButtonState:image_button_cell::kHoverState];
     [cell setImageID:IDR_BROWSER_ACTION_P
       forButtonState:image_button_cell::kPressedState];
     [cell setImageID:IDR_BROWSER_ACTION
       forButtonState:image_button_cell::kDisabledState];
 
     [self setTitle:@""];
     [self setButtonType:NSMomentaryChangeButton];
     [self setShowsBorderOnlyWhileMouseInside:YES];
 
-    contextMenuController_.reset(menuController);
-
     base::scoped_nsobject<NSMenu> contextMenu(
         [[NSMenu alloc] initWithTitle:@""]);
     [contextMenu setDelegate:self];
     [self setMenu:contextMenu];
 
     moveAnimation_.reset([[NSViewAnimation alloc] init]);
     [moveAnimation_ gtm_setDuration:kAnimationDuration
                           eventMask:NSLeftMouseUpMask];
     [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
 
@@ skipping 140 matching lines @@
 
   bounds.origin.y += kBrowserActionBadgeOriginYOffset;
   [[self cell] drawBadgeWithinFrame:bounds];
 
   [image unlockFocus];
   return image;
 }
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   [menu removeAllItems];
-  [contextMenuController_ populateMenu:menu];
+  // |menuController()| can be nil if we don't show context menus for the given
+  // action.
+  if (viewControllerDelegate_->menuController())
+    [viewControllerDelegate_->menuController() populateMenu:menu];
 }
 
 @end
 
 @implementation BrowserActionCell
 
 @synthesize browserActionsController = browserActionsController_;
 @synthesize viewController = viewController_;
 
 - (void)drawBadgeWithinFrame:(NSRect)frame
@@ skipping 22 matching lines @@
                 fraction:enabled ? 1.0 : 0.4
           respectFlipped:YES
                    hints:nil];
 
   cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
   [self drawBadgeWithinFrame:cellFrame
                  webContents:webContents];
 }
 
 @end