| Index: chrome/browser/extensions/extension_keybinding_registry.h
|
| diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h
|
| index 3936196e44d0272f2fa3f1ef687cae29ef6596bf..783ad6b5f825469342000f8800219631ae6224ef 100644
|
| --- a/chrome/browser/extensions/extension_keybinding_registry.h
|
| +++ b/chrome/browser/extensions/extension_keybinding_registry.h
|
| @@ -57,9 +57,9 @@ class ExtensionKeybindingRegistry : public content::NotificationObserver,
|
|
|
| ~ExtensionKeybindingRegistry() override;
|
|
|
| - // Enables/Disables general shortcut handling in Chrome. Implemented in
|
| - // platform-specific ExtensionKeybindingsRegistry* files.
|
| + // Enables/Disables general shortcut handling in Chrome.
|
| static void SetShortcutHandlingSuspended(bool suspended);
|
| + static bool IsShortcutHandlingSuspended();
|
|
|
| // Execute the command bound to |accelerator| and provided by the extension
|
| // with |extension_id|, if it exists.
|
| @@ -173,6 +173,13 @@ class ExtensionKeybindingRegistry : public content::NotificationObserver,
|
| ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
|
| extension_registry_observer_;
|
|
|
| + // Keeps track of whether shortcut handling is currently suspended. Shortcuts
|
| + // are suspended briefly while capturing which shortcut to assign to an
|
| + // extension command in the Config UI. If handling isn't suspended while
|
| + // capturing then trying to assign Ctrl+F to a command would instead result
|
| + // in the Find box opening.
|
| + static bool shortcut_handling_suspended_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistry);
|
| };
|
|
|
|
|