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

chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.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.
 
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/extensions/accelerator_priority.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 
 namespace values = extensions::manifest_values;
 
 // static
 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
     bool suspended) {
@@ skipping 10 matching lines @@
     : ExtensionKeybindingRegistry(profile, extension_filter, delegate),
       profile_(profile),
       window_(window) {
   Init();
 }
 
 ExtensionKeybindingRegistryCocoa::~ExtensionKeybindingRegistryCocoa() {
 }
 
 bool ExtensionKeybindingRegistryCocoa::ProcessKeyEvent(
-    const content::NativeWebKeyboardEvent& event) {
+    const content::NativeWebKeyboardEvent& event,
+    ui::AcceleratorManager::HandlerPriority priority) {
   if (shortcut_handling_suspended_)
     return false;
 
   ui::Accelerator accelerator(
       static_cast<ui::KeyboardCode>(event.windowsKeyCode),
       content::GetModifiersFromNativeWebKeyboardEvent(event));
 
   std::string extension_id;
   std::string command_name;
   if (!GetFirstTarget(accelerator, &extension_id, &command_name))
     return false;
 
+  const ui::AcceleratorManager::HandlerPriority accelerator_priority =
+      GetAcceleratorPriorityById(accelerator, extension_id, profile_);
+  // Only handle the event if it has the right priority.
+  if (priority != accelerator_priority)
+    return false;
+
   int type = 0;
   if (command_name == values::kPageActionCommandEvent) {
     type = chrome::NOTIFICATION_EXTENSION_COMMAND_PAGE_ACTION_MAC;
   } else if (command_name == values::kBrowserActionCommandEvent) {
     type = chrome::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC;
   } else {
     // Not handled by using notifications. Route it through the Browser Event
     // Router using the base class (it will iterate through all targets).
     return ExtensionKeybindingRegistry::NotifyEventTargets(accelerator);
   }
@@ skipping 55 matching lines @@
     AddEventTarget(page_action.accelerator(),
                    extension->id(),
                    page_action.command_name());
   }
 }
 
 void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybindingImpl(
     const ui::Accelerator& accelerator,
     const std::string& command_name) {
 }