mac: Allow WebContents key handling to supplant extension overrides of the bookmark shortcut.

chrome/browser/ui/cocoa/chrome_event_processing_window.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/chrome_event_processing_window.h"
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
@@ skipping 43 matching lines @@
   return [self handleExtraKeyboardShortcut:event
                          fromTable:CommandForDelayedWindowKeyboardShortcut];
 }
 
 - (BOOL)handleExtraBrowserKeyboardShortcut:(NSEvent*)event {
   return [self handleExtraKeyboardShortcut:event
                                  fromTable:CommandForBrowserKeyboardShortcut];
 }
 
 - (BOOL)performKeyEquivalent:(NSEvent*)event {
-  if (redispatchingEvent_)
-    return NO;
-
+  // Some extension commands have higher priority than web content, and some
+  // have lower priority. Regardless of whether the event is being
+  // redispatched, let the extension system try to handle the event.
   NSWindow* window = event.window;
   if (window) {
     BrowserWindowController* controller = [window windowController];
-    if ([controller respondsToSelector:@selector(handledByExtensionCommand:)]) {
-      if ([controller handledByExtensionCommand:event])
+    if ([controller respondsToSelector:@selector(handledByExtensionCommand:
+                                                                  priority:)]) {
+      ui::AcceleratorManager::HandlerPriority priority =
+          redispatchingEvent_ ? ui::AcceleratorManager::kNormalPriority
+                              : ui::AcceleratorManager::kHighPriority;
+      if ([controller handledByExtensionCommand:event priority:priority])
         return YES;
     }
   }
 
+  if (redispatchingEvent_)
+    return NO;
+
   // Give the web site a chance to handle the event. If it doesn't want to
   // handle it, it will call us back with one of the |handle*| methods above.
   NSResponder* r = [self firstResponder];
   if ([r conformsToProtocol:@protocol(RenderWidgetHostViewMacBase)])
     return [r performKeyEquivalent:event];
 
   // If the delegate does not implement the BrowserCommandExecutor protocol,
   // then we don't need to handle browser specific shortcut keys.
   if (![[self delegate] conformsToProtocol:@protocol(BrowserCommandExecutor)])
     return [super performKeyEquivalent:event];
@@ skipping 78 matching lines @@
                          timestamp:[event timestamp]
                       windowNumber:[window windowNumber]
                            context:nil
                         characters:eventCharacters
        charactersIgnoringModifiers:eventUnmodCharacters
                          isARepeat:eventIsARepeat
                            keyCode:[event keyCode]];
 }
 
 @end  // ChromeEventProcessingWindow