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

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

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.cc
diff --git a/chrome/browser/extensions/extension_commands_global_registry.cc b/chrome/browser/extensions/extension_commands_global_registry.cc
index fafa223c4613ca03265d2a31e49c0e77310de764..2cfafb807583a2488045a071a656be6c470a1bc0 100644
--- a/chrome/browser/extensions/extension_commands_global_registry.cc
+++ b/chrome/browser/extensions/extension_commands_global_registry.cc
@@ -52,13 +52,6 @@ ExtensionCommandsGlobalRegistry* ExtensionCommandsGlobalRegistry::Get(
context);
}
-// static
-void ExtensionCommandsGlobalRegistry::SetShortcutHandlingSuspended(
- bool suspended) {
- GlobalShortcutListener::GetInstance()->SetShortcutHandlingSuspended(
- suspended);
-}
-
bool ExtensionCommandsGlobalRegistry::IsRegistered(
const ui::Accelerator& accelerator) {
return (registry_for_active_window() &&
@@ -66,6 +59,13 @@ bool ExtensionCommandsGlobalRegistry::IsRegistered(
IsAcceleratorRegistered(accelerator);
}
+void ExtensionCommandsGlobalRegistry::SetShortcutHandlingSuspended(
+ bool suspended) {
+ ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(suspended);
+ GlobalShortcutListener::GetInstance()->SetShortcutHandlingSuspended(
+ suspended);
+}
+
void ExtensionCommandsGlobalRegistry::AddExtensionKeybindings(
const extensions::Extension* extension,
const std::string& command_name) {

Powered by Google App Engine
This is Rietveld 408576698