[Extension Toolbar Redesign] Wants to act treatment, redux - left click

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 307 matching lines @@
       object:self];
 }
 
 - (void)mouseUp:(NSEvent*)theEvent {
   dragCouldStart_ = NO;
   // There are non-drag cases where a mouseUp: may happen
   // (e.g. mouse-down, cmd-tab to another application, move mouse,
   // mouse-up).
   NSPoint location = [self convertPoint:[theEvent locationInWindow]
                                fromView:nil];
+  // Only perform the click if we didn't drag the button.
   if (NSPointInRect(location, [self bounds]) && !isBeingDragged_) {
-    // Only perform the click if we didn't drag the button.
-    [self performClick:self];
+    // There's also a chance that the action is disabled, and the left click
+    // should show the context menu.
+    if (!viewController_->IsEnabled(
+            [browserActionsController_ currentWebContents]) &&
+        viewController_->DisabledClickOpensMenu()) {
+      // No menus-in-menus; see comment in -rightMouseDown:.
+      if ([browserActionsController_ isOverflow]) {
+        [browserActionsController_ mainButtonForId:viewController_->GetId()]->
+            viewControllerDelegate_->ShowContextMenu();
+      } else {
+        [NSMenu popUpContextMenu:[self menu] withEvent:theEvent forView:self];
+      }
+    } else {
+      [self performClick:self];
+    }
   } else {
     // Make sure an ESC to end a drag doesn't trigger 2 endDrags.
     if (isBeingDragged_) {
       [self endDrag];
     } else {
       [super mouseUp:theEvent];
     }
   }
   [self updateHighlightedState];
 }
@@ skipping 58 matching lines @@
 
   base::string16 tooltip = viewController_->GetTooltip(webContents);
   [self setToolTip:(tooltip.empty() ? nil : base::SysUTF16ToNSString(tooltip))];
 
   gfx::Image image =
       viewController_->GetIcon(webContents, gfx::Size([self frame].size));
 
   if (!image.IsEmpty())
     [self setImage:image.ToNSImage()];
 
-  [self setEnabled:viewController_->IsEnabled(webContents)];
+  BOOL enabled = viewController_->IsEnabled(webContents) ||
+                 viewController_->DisabledClickOpensMenu();
+  [self setEnabled:enabled];
 
   [self setNeedsDisplay:YES];
 }
 
 - (void)onRemoved {
   // The button is being removed from the toolbar, and the backing controller
   // will also be removed. Destroy the delegate.
   // We only need to do this because in Cocoa's memory management, removing the
   // button from the toolbar doesn't synchronously dealloc it.
   viewControllerDelegate_.reset();
@@ skipping 119 matching lines @@
 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   ui::ThemeProvider* themeProvider = [window themeProvider];
   if (!themeProvider)
     themeProvider =
         [[browserActionsController_ browser]->window()->GetNativeWindow()
             themeProvider];
   return themeProvider;
 }
 
 @end