Disabled context menu for external component extension icon on MAC (to be consistent with Windows).

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 131 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([[ExtensionActionContextMenuController alloc]

[groby-ooo-7-16, 2014/03/25 20:10:10]

I believe that can move into the if() too, no?

[yefimt, 2014/03/25 21:12:17]

not sure, in menuNeedsUpdate code expects it exists, at same time it probably
never be called in no menu. I don't have MAC to verify :(

On 2014/03/25 20:10:10, groby wrote:

[groby-ooo-7-16, 2014/03/25 21:15:53]

menuNeedsUpdate is the menu's delegate. If menu is indeed set nowhere else, as
you indicate below, then yes, please do move this into the if statement.

[yefimt, 2014/03/25 21:19:24]

Done.

         initWithExtension:extension
                   browser:browser
           extensionAction:browser_action]);
-    base::scoped_nsobject<NSMenu> contextMenu(
-        [[NSMenu alloc] initWithTitle:@""]);
-    [contextMenu setDelegate:self];
-    [self setMenu:contextMenu];
+    if (extension->ShowConfigureContextMenus()) {
+      base::scoped_nsobject<NSMenu> contextMenu(
+          [[NSMenu alloc] initWithTitle:@""]);
+      [contextMenu setDelegate:self];
+      [self setMenu:contextMenu];
+    }

[groby-ooo-7-16, 2014/03/25 20:10:10]

Do we need to reset the menu to nil in an else branch?

[yefimt, 2014/03/25 21:12:17]

I don't think it is necessary. It is the only place menu is set, so not setting
it will provide default behavior - no menu.

On 2014/03/25 20:10:10, groby wrote:

 
     tabId_ = tabId;
     extension_ = extension;
     iconFactoryBridge_.reset(new ExtensionActionIconFactoryBridge(
         self, browser->profile(), extension));
 
     moveAnimation_.reset([[NSViewAnimation alloc] init]);
     [moveAnimation_ gtm_setDuration:kAnimationDuration
                           eventMask:NSLeftMouseUpMask];
     [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
@@ skipping 176 matching lines @@
                operation:NSCompositeSourceOver
                 fraction:enabled ? 1.0 : 0.4
           respectFlipped:YES
                    hints:nil];
 
   cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
   [self drawBadgeWithinFrame:cellFrame];
 }
 
 @end