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

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "base/command_line.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
@@ skipping 173 matching lines @@
 // fullscreen by passing through the full size in willUseFullScreenContentSize.
 - (NSSize)window:(NSWindow *)window
     willUseFullScreenContentSize:(NSSize)proposedSize {
   return proposedSize;
 }
 
 - (void)executeCommand:(int)command {
   // No-op, swallow the event.
 }
 
-- (BOOL)handledByExtensionCommand:(NSEvent*)event {
+- (BOOL)handledByExtensionCommand:(NSEvent*)event
+                         priority:
+                             (ui::AcceleratorManager::HandlerPriority)priority {

[Scott Hess - ex-Googler, 2014/07/15 19:20:59]

Here too.

[erikchen, 2014/07/15 20:48:40]

Done.

   if (appWindow_)
-    return appWindow_->HandledByExtensionCommand(event);
+    return appWindow_->HandledByExtensionCommand(event, priority);
   return NO;
 }
 
 @end
 
 // This is really a method on NSGrayFrame, so it should only be called on the
 // view passed into -[NSWindow drawCustomFrameRect:forView:].
 @interface NSView (PrivateMethods)
 - (CGFloat)roundedCornerRadius;
 @end
@@ skipping 698 matching lines @@
 }
 
 void NativeAppWindowCocoa::WindowWillZoom() {
   // See top of file NOTE: Maximize and Zoom.
   if (IsMaximized())
     Restore();
   else
     Maximize();
 }
 
-bool NativeAppWindowCocoa::HandledByExtensionCommand(NSEvent* event) {
+bool NativeAppWindowCocoa::HandledByExtensionCommand(
+    NSEvent* event,
+    ui::AcceleratorManager::HandlerPriority priority) {
   return extension_keybinding_registry_->ProcessKeyEvent(
-      content::NativeWebKeyboardEvent(event));
+      content::NativeWebKeyboardEvent(event), priority);
 }
 
 void NativeAppWindowCocoa::ShowWithApp() {
   is_hidden_with_app_ = false;
   if (!app_window_->is_hidden())
     ShowInactive();
 }
 
 void NativeAppWindowCocoa::HideWithApp() {
   is_hidden_with_app_ = true;
@@ skipping 73 matching lines @@
 }
 
 void NativeAppWindowCocoa::UpdateRestoredBounds() {
   if (IsRestored(*this))
     restored_bounds_ = [window() frame];
 }
 
 void NativeAppWindowCocoa::HideWithoutMarkingHidden() {
   [window() orderOut:window_controller_];
 }