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

chrome/browser/extensions/extension_commands_global_registry.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_
 
 #include <map>
 #include <string>
 
@@ skipping 29 matching lines @@
   // Convenience method to get the ExtensionCommandsGlobalRegistry for a
   // profile.
   static ExtensionCommandsGlobalRegistry* Get(content::BrowserContext* context);
 
   // Enables/Disables global shortcut handling in Chrome.
   static void SetShortcutHandlingSuspended(bool suspended);
 
   explicit ExtensionCommandsGlobalRegistry(content::BrowserContext* context);
   virtual ~ExtensionCommandsGlobalRegistry();
 
+  // Returns which non-global command registry is active (belonging to the
+  // currently active window).
+  ExtensionKeybindingRegistry* registry_for_active_window() {
+    return registry_for_active_window_;
+  }
+
+  void set_registry_for_active_window(ExtensionKeybindingRegistry* registry) {
+    registry_for_active_window_ = registry;
+  }
+
+  // Returns whether |accelerator| is registered on the registry for the active
+  // window or on the global registry.
+  bool IsRegistered(const ui::Accelerator& accelerator);
+
  private:
   friend class BrowserContextKeyedAPIFactory<ExtensionCommandsGlobalRegistry>;
 
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() {
     return "ExtensionCommandsGlobalRegistry";
   }
 
   // Overridden from ExtensionKeybindingRegistry:
   virtual void AddExtensionKeybinding(
       const Extension* extension,
       const std::string& command_name) OVERRIDE;
   virtual void RemoveExtensionKeybindingImpl(
       const ui::Accelerator& accelerator,
       const std::string& command_name) OVERRIDE;
 
   // Called by the GlobalShortcutListener object when a shortcut this class has
   // registered for has been pressed.
   virtual void OnKeyPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
   // Weak pointer to our browser context. Not owned by us.
   content::BrowserContext* browser_context_;
 
+  // The global commands registry not only keeps track of global commands
+  // registered, but also of which non-global command registry is active
+  // (belonging to the currently active window). Only valid for TOOLKIT_VIEWS
+  // and
+  // NULL otherwise.
+  ExtensionKeybindingRegistry* registry_for_active_window_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionCommandsGlobalRegistry);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_