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

chrome/browser/ui/extensions/accelerator_priority.cc

+// Copyright 2014 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/extensions/accelerator_priority.h"
+
+#include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/ui/accelerator_utils.h"
+#include "chrome/common/extensions/manifest_handlers/ui_overrides_handler.h"
+#include "extensions/browser/extension_registry.h"
+#include "ui/base/accelerators/accelerator.h"
+
+ui::AcceleratorManager::HandlerPriority GetAcceleratorPriority(
+    const ui::Accelerator& accelerator,
+    const extensions::Extension* extension) {
+  // Extensions overriding the bookmark shortcut need normal priority to
+  // preserve the built-in processing order of the key and not override
+  // WebContents key handling.
+  if (accelerator ==
+      chrome::GetPrimaryChromeAcceleratorForCommandId(IDC_BOOKMARK_PAGE) &&
+      extensions::UIOverrides::RemovesBookmarkShortcut(extension)) {
+    return ui::AcceleratorManager::kNormalPriority;

[Finnur, 2014/07/03 11:09:59]

Nit: single line, no braces.

[Mike Wittman, 2014/07/07 18:43:58]

Done.

+  }

[Finnur, 2014/07/03 11:09:59]

Just to be sure this is working as I expect it:

When a user sets Ctrl+D to a non-bookmark-related extension, it will always be
high priority. 

The only possible weirdness would be if a bookmark-overriding extension
*doesn't* override Ctrl+D, but the user opts to set Ctrl+D to something *else*
in that extension. But that's pretty contrived example... and the only downside
is that the shortcut isn't guaranteed to be high-priority, so the web page gets
first shot at it.

Right?

[Mike Wittman, 2014/07/07 18:43:58]

Yes, that's correct.

+
+  return ui::AcceleratorManager::kHighPriority;
+}
+
+ui::AcceleratorManager::HandlerPriority GetAcceleratorPriority(
+    const ui::Accelerator& accelerator,
+    const std::string& extension_id,
+    content::BrowserContext* browser_context) {
+  return GetAcceleratorPriority(
+      accelerator,
+      extensions::ExtensionRegistry::Get(browser_context)->enabled_extensions().
+          GetByID(extension_id));
+}