| 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) {
|
|
|