Chromium Code Reviews| 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 22837a82a1b36a0831e0030efa77d2e29a56bb8c..d0e932da8400e6c152fd673f8e2f1f1ad90da195 100644 |
| --- a/chrome/browser/extensions/extension_keybinding_registry.cc |
| +++ b/chrome/browser/extensions/extension_keybinding_registry.cc |
| @@ -28,7 +28,8 @@ ExtensionKeybindingRegistry::ExtensionKeybindingRegistry( |
| : browser_context_(context), |
| extension_filter_(extension_filter), |
| delegate_(delegate), |
| - extension_registry_observer_(this) { |
| + extension_registry_observer_(this), |
| + shortcut_handling_suspended_(false) { |
| extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_)); |
| Profile* profile = Profile::FromBrowserContext(browser_context_); |
| @@ -43,6 +44,16 @@ ExtensionKeybindingRegistry::ExtensionKeybindingRegistry( |
| ExtensionKeybindingRegistry::~ExtensionKeybindingRegistry() { |
| } |
| +void ExtensionKeybindingRegistry::set_shortcut_handling_suspended( |
|
Finnur
2015/01/16 10:05:05
nit: Should not be unix_hacker style (calls virtua
Devlin
2015/01/16 15:49:55
I probably caused this confusion; I only meant tha
Andre
2015/01/16 18:40:15
Done.
|
| + bool suspended) { |
| + shortcut_handling_suspended_ = suspended; |
| + OnShortcutHandlingSuspended(suspended); |
| +} |
| + |
| +bool ExtensionKeybindingRegistry::shortcut_handling_suspended() const { |
| + return shortcut_handling_suspended_; |
| +} |
| + |
| void ExtensionKeybindingRegistry::RemoveExtensionKeybinding( |
| const Extension* extension, |
| const std::string& command_name) { |