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

Unified Diff: chrome/browser/extensions/extension_keybinding_registry.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: 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_keybinding_registry.cc
diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc
index dae15fd8b0561f973cf6181f7880a041c2bd3566..fae9779cec1e194247005ae06304756c00997f75 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.cc
+++ b/chrome/browser/extensions/extension_keybinding_registry.cc
@@ -21,6 +21,8 @@ const char kOnCommandEventName[] = "commands.onCommand";
namespace extensions {
+bool ExtensionKeybindingRegistry::shortcut_handling_suspended_ = false;
+
ExtensionKeybindingRegistry::ExtensionKeybindingRegistry(
content::BrowserContext* context,
ExtensionFilter extension_filter,
@@ -43,6 +45,16 @@ ExtensionKeybindingRegistry::ExtensionKeybindingRegistry(
ExtensionKeybindingRegistry::~ExtensionKeybindingRegistry() {
}
+// static
+void ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(bool suspended) {
+ shortcut_handling_suspended_ = suspended;
+}
+
+// static
+bool ExtensionKeybindingRegistry::IsShortcutHandlingSuspended() {
+ return shortcut_handling_suspended_;
+}
+
void ExtensionKeybindingRegistry::RemoveExtensionKeybinding(
const Extension* extension,
const std::string& command_name) {

Powered by Google App Engine
This is Rietveld 408576698