[Extensions UI Cocoa] Make disabled actions respond to the keyboard

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 93 matching lines @@
       contextMenuRunning_(false),
       weakFactory_(this) {
   viewController_->SetDelegate(this);
 }
 
 ToolbarActionViewDelegateBridge::~ToolbarActionViewDelegateBridge() {
   viewController_->SetDelegate(nullptr);
 }
 
 void ToolbarActionViewDelegateBridge::ShowContextMenu() {
-  // We should only be showing the context menu in this way if we're doing so
-  // for an overflowed action.
-  DCHECK(![owner_ superview]);
+  DCHECK(![controller_ toolbarActionsBar]->in_overflow_mode());
+  if ([owner_ superview]) {
+    // If the button is already visible on the toolbar, we can skip ahead to
+    // just showing the menu.
+    DoShowContextMenu();
+    return;
+  }
 
+  // Otherwise, we have to slide the button out.
   contextMenuRunning_ = true;
   AppMenuController* appMenuController =
       [[[BrowserWindowController browserWindowControllerForWindow:
           [controller_ browser]->window()->GetNativeWindow()]
               toolbarController] appMenuController];
   // If the app menu is open, we have to first close it. Part of this happens
   // asynchronously, so we have to use a posted task to open the next menu.
   if ([appMenuController isMenuOpen])
     [appMenuController cancel];
 
@@ skipping 196 matching lines @@
 
 - (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_) {
-    // 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];
-    }
+    [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 123 matching lines @@
                  fromRect:NSZeroRect
                 operation:NSCompositeSourceOver
                  fraction:1.0
            respectFlipped:YES
                     hints:nil];
 
   [image unlockFocus];
   return image;
 }
 
+- (void)showContextMenu {
+  viewControllerDelegate_->ShowContextMenu();
+}
+
 - (NSMenu*)menu {
   // Hack: Since Cocoa doesn't support menus-running-in-menus (see also comment
   // in -rightMouseDown:), it doesn't launch the menu for an overflowed action
   // on a Control-click. Even more unfortunate, it doesn't even pass us the
   // mouseDown event for control clicks. However, it does call -menuForEvent:,
   // which in turn calls -menu:, so we can tap in here and show the menu
   // programmatically for the Control-click case.
   if ([browserActionsController_ isOverflow] &&
       ([NSEvent modifierFlags] & NSControlKeyMask)) {
     [browserActionsController_ mainButtonForId:viewController_->GetId()]->
@@ skipping 73 matching lines @@
 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   const ui::ThemeProvider* themeProvider = [window themeProvider];
   if (!themeProvider)
     themeProvider =
         [[browserActionsController_ browser]->window()->GetNativeWindow()
             themeProvider];
   return themeProvider;
 }
 
 @end