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

Unified Diff: chrome/browser/extensions/extension_commands_global_registry.h

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Use overrides Created 5 years, 11 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/extensions/extension_commands_global_registry.h
diff --git a/chrome/browser/extensions/extension_commands_global_registry.h b/chrome/browser/extensions/extension_commands_global_registry.h
index 06efa812a56c92bf99d0d9edbdf6bfc232d918f7..b1f595f1a3db85934ece66dfa86c3259dd706330 100644
--- a/chrome/browser/extensions/extension_commands_global_registry.h
+++ b/chrome/browser/extensions/extension_commands_global_registry.h
@@ -41,9 +41,6 @@ class ExtensionCommandsGlobalRegistry
// profile.
static ExtensionCommandsGlobalRegistry* Get(content::BrowserContext* context);
- // Enables/Disables global shortcut handling in Chrome.
- static void SetShortcutHandlingSuspended(bool suspended);
-
explicit ExtensionCommandsGlobalRegistry(content::BrowserContext* context);
~ExtensionCommandsGlobalRegistry() override;
@@ -61,6 +58,9 @@ class ExtensionCommandsGlobalRegistry
// window or on the global registry.
bool IsRegistered(const ui::Accelerator& accelerator);
+ // Overridden from ExtensingKeybindingRegistry.
+ void SetShortcutHandlingSuspended(bool suspended) override;
+
private:
friend class BrowserContextKeyedAPIFactory<ExtensionCommandsGlobalRegistry>;

Powered by Google App Engine
This is Rietveld 408576698