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

chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc

Index: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
index 477a08eeb4064ccb8a8040dd4fa304900f409b36..16b4414f5ccfb4b13d23cfed9e93ef6cfc5ac449 100644
--- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
+++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
@@ -6,8 +6,8 @@
 
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/extensions/accelerator_priority.h"
 #include "extensions/common/extension.h"
 #include "ui/views/focus/focus_manager.h"
 
@@ -56,7 +56,9 @@ void ExtensionKeybindingRegistryViews::AddExtensionKeybinding(
       continue;
     if (!IsAcceleratorRegistered(iter->second.accelerator())) {

[Peter Kasting, 2014/07/07 23:47:10]

Nit: Shorter:

    const ui::Accelerator& accelerator = iter->second.accelerator();
    if (!IsAcceleratorRegistered(accelerator)) {
      focus_manager_->RegisterAccelerator(
          accelerator, GetAcceleratorPriority(accelerator, extension), this);
    }

    AddEventTarget(accelerator, extension->id(), iter->second.command_name());

[Mike Wittman, 2014/07/08 19:29:01]

Done.

       focus_manager_->RegisterAccelerator(iter->second.accelerator(),
-                                          ui::AcceleratorManager::kHighPriority,
+                                          GetAcceleratorPriority(
+                                              iter->second.accelerator(),
+                                              extension),
                                           this);
     }
 
@@ -74,6 +76,16 @@ void ExtensionKeybindingRegistryViews::RemoveExtensionKeybindingImpl(
 
 bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
+  std::string extension_id, command_name;
+  GetFirstTarget(accelerator, &extension_id, &command_name);
+  // Normal priority shortcuts must be handled via the standard browser command
+  // processing to be effective.

[Peter Kasting, 2014/07/07 23:47:10]

Nit: What does "to be effective" mean here?  This phrase seems somewhat
ambiguous to a reader; I suggest finding a clearer formulation.  (3 different
files)

[Mike Wittman, 2014/07/08 19:29:01]

Done.

+  if (GetAcceleratorPriorityById(accelerator,

[Peter Kasting, 2014/07/07 23:47:10]

Nit: Shorter:

  const ui::AcceleratorManager::HandlerPriority priority =
      GetAcceleratorPriorityById(accelerator, extension_id, browser_context());
  return (priority == ui::AcceleratorManager::kHighPriority) &&
      ExtensionKeybindingRegistry::NotifyEventTargets(accelerator);

[Mike Wittman, 2014/07/08 19:29:01]

Done.

+                                 extension_id,
+                                 browser_context()) ==
+      ui::AcceleratorManager::kNormalPriority)
+    return false;
+
   return ExtensionKeybindingRegistry::NotifyEventTargets(accelerator);
 }