Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Unified Diff: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h

Issue 23812010: Implement first part of supporting global extension commands. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gclient sync Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h
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 8b3ac20bfb16f4703155e4111924653d1bd3136e..63c94b5aada28de846f0f9cf1bc6ff8a03b6e3d2 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_;

Powered by Google App Engine
This is Rietveld 408576698