Reland Track the active ExtensionKeybindingRegistry and make it available to EventRewriter.

chrome/browser/extensions/extension_commands_global_registry.cc

 // Copyright (c) 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/extensions/extension_commands_global_registry.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/global_shortcut_listener.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 
 ExtensionCommandsGlobalRegistry::ExtensionCommandsGlobalRegistry(
     content::BrowserContext* context)
     : ExtensionKeybindingRegistry(context,
                                   ExtensionKeybindingRegistry::ALL_EXTENSIONS,
                                   NULL),
-      browser_context_(context) {
+      browser_context_(context),
+      registry_for_active_window_(NULL) {
   Init();
 }
 
 ExtensionCommandsGlobalRegistry::~ExtensionCommandsGlobalRegistry() {
   if (!IsEventTargetsEmpty()) {
     GlobalShortcutListener* global_shortcut_listener =
         GlobalShortcutListener::GetInstance();
 
     // Resume GlobalShortcutListener before we clean up if the shortcut handling
     // is currently suspended.
@@ skipping 21 matching lines @@
       context);
 }
 
 // static
 void ExtensionCommandsGlobalRegistry::SetShortcutHandlingSuspended(
     bool suspended) {
   GlobalShortcutListener::GetInstance()->SetShortcutHandlingSuspended(
       suspended);
 }
 
+bool ExtensionCommandsGlobalRegistry::IsRegistered(
+    const ui::Accelerator& accelerator) {
+  return (registry_for_active_window() &&
+          registry_for_active_window()->IsAcceleratorRegistered(accelerator)) ||
+         IsAcceleratorRegistered(accelerator);
+}
+
 void ExtensionCommandsGlobalRegistry::AddExtensionKeybinding(
     const extensions::Extension* extension,
     const std::string& command_name) {
   // This object only handles named commands, not browser/page actions.
   if (ShouldIgnoreCommand(command_name))
     return;
 
   extensions::CommandService* command_service =
       extensions::CommandService::Get(browser_context_);
   // Add all the active global keybindings, if any.
@@ skipping 33 matching lines @@
   GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
       accelerator, this);
 }
 
 void ExtensionCommandsGlobalRegistry::OnKeyPressed(
     const ui::Accelerator& accelerator) {
   ExtensionKeybindingRegistry::NotifyEventTargets(accelerator);
 }
 
 }  // namespace extensions