Index: chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h |
diff --git a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h |
index 41f98df6a985d5fe9e6eedc2176641eb181245e2..f3fdcc9c8d6363712d07c06e38e25bc620039e36 100644 |
--- a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h |
+++ b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h |
@@ -5,7 +5,6 @@ |
#ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_COCOA_H_ |
#define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_COCOA_H_ |
-#include <map> |
#include <string> |
#include <utility> |
@@ -56,8 +55,8 @@ class ExtensionKeybindingRegistryCocoa |
virtual void AddExtensionKeybinding( |
const extensions::Extension* extension, |
const std::string& command_name) OVERRIDE; |
- virtual void RemoveExtensionKeybinding( |
- const extensions::Extension* extension, |
+ virtual void RemoveExtensionKeybindingImpl( |
+ const ui::Accelerator& accelerator, |
const std::string& command_name) OVERRIDE; |
private: |
@@ -74,14 +73,6 @@ class ExtensionKeybindingRegistryCocoa |
// The window we are associated with. |
gfx::NativeWindow window_; |
- // Maps an accelerator to a string pair (extension id, command name) for |
- // commands that have been registered. Unlike its Views counterpart, this map |
- // contains browserAction and pageAction commands (but does not route those |
- // events), so that we can query priority handlers in HasPriorityHandler(...). |
- typedef std::map< ui::Accelerator, |
- std::pair<std::string, std::string> > EventTargets; |
- EventTargets event_targets_; |
- |
// The content notification registrar for listening to extension events. |
content::NotificationRegistrar registrar_; |