diff options
Diffstat (limited to 'chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h')
-rw-r--r-- | chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h index 8b3ac20..63c94b5 100644 --- a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h +++ b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_UI_GTK_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_GTK_H_ #include <gdk/gdk.h> -#include <map> #include <string> #include "base/compiler_specific.h" @@ -59,8 +58,8 @@ class ExtensionKeybindingRegistryGtk 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: @@ -85,14 +84,6 @@ class ExtensionKeybindingRegistryGtk // The accelerator group used to handle accelerators, owned by this object. GtkAccelGroup* accel_group_; - // 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_; |