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

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 for Devlin 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..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) {

Powered by Google App Engine
This is Rietveld 408576698