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

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: Fix Mac 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 22837a82a1b36a0831e0030efa77d2e29a56bb8c..480331ae68f0d81611c4b25c13aa639014498047 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,11 @@ ExtensionKeybindingRegistry::ExtensionKeybindingRegistry(
ExtensionKeybindingRegistry::~ExtensionKeybindingRegistry() {
}
+void ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(bool suspended) {
+ shortcut_handling_suspended_ = suspended;
+ OnShortcutHandlingSuspended(suspended);
+}
+
void ExtensionKeybindingRegistry::RemoveExtensionKeybinding(
const Extension* extension,
const std::string& command_name) {
« no previous file with comments | « chrome/browser/extensions/extension_keybinding_registry.h ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698