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 a819ab409c17a2a842b5d4a5249afd2bce7f4be2..6f53cd796fe759db67f669e99c0a274f616335eb 100644 |
--- a/chrome/browser/extensions/extension_keybinding_registry.cc |
+++ b/chrome/browser/extensions/extension_keybinding_registry.cc |
@@ -7,6 +7,7 @@ |
#include "base/values.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/extensions/active_tab_permission_granter.h" |
+#include "chrome/browser/extensions/api/commands/command_service.h" |
#include "chrome/browser/extensions/event_router.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/extension_system.h" |
@@ -37,18 +38,18 @@ ExtensionKeybindingRegistry::~ExtensionKeybindingRegistry() { |
void ExtensionKeybindingRegistry::RemoveExtensionKeybinding( |
const Extension* extension, |
const std::string& command_name) { |
- EventTargets::iterator iter = event_targets_.begin(); |
- while (iter != event_targets_.end()) { |
- if (iter->second.first != extension->id() || |
- (!command_name.empty() && (iter->second.second != command_name))) { |
- ++iter; |
+ EventTargets::iterator eit = event_targets_.begin(); |
+ while (eit != event_targets_.end()) { |
+ if (eit->second.first != extension->id() || |
+ (!command_name.empty() && (eit->second.second != command_name))) { |
+ ++eit; |
continue; // Not the extension or command we asked for. |
} |
// Let each platform-specific implementation get a chance to clean up. |
- RemoveExtensionKeybindingImpl(iter->first, command_name); |
+ RemoveExtensionKeybindingImpl(eit->first, command_name); |
- EventTargets::iterator old = iter++; |
+ EventTargets::iterator old = eit++; |
event_targets_.erase(old); |
// If a specific command_name was requested, it has now been deleted so |
@@ -56,6 +57,26 @@ void ExtensionKeybindingRegistry::RemoveExtensionKeybinding( |
if (!command_name.empty()) |
break; |
} |
+ |
+ MediaKeysEventTargets::iterator mit = media_keys_event_targets_.begin(); |
+ while (mit != media_keys_event_targets_.end()) { |
+ TargetList &target_list = mit->second; |
Finnur
2013/11/12 16:27:54
nit: Prefer Foo* bar over Foo *bar.
zhchbin
2013/11/13 05:01:57
Done.
|
+ TargetList::iterator target_list_it = target_list.begin(); |
Finnur
2013/11/12 16:27:54
s/target_list_it/target/
zhchbin
2013/11/13 05:01:57
Done.
|
+ while (target_list_it != target_list.end()) { |
+ if (target_list_it->first == extension->id() && |
+ (command_name.empty() || command_name == target_list_it->second)) { |
+ target_list_it = target_list.erase(target_list_it); |
Finnur
2013/11/12 16:27:54
nit: Weird indentation.
zhchbin
2013/11/13 05:01:57
Done.
|
+ } else { |
+ target_list_it++; |
+ } |
+ } |
+ |
+ MediaKeysEventTargets::iterator old = mit++; |
+ if (target_list.empty()) { |
+ RemoveExtensionKeybindingImpl(old->first, command_name); |
+ media_keys_event_targets_.erase(old); |
+ } |
+ } |
} |
void ExtensionKeybindingRegistry::Init() { |
@@ -78,6 +99,31 @@ bool ExtensionKeybindingRegistry::ShouldIgnoreCommand( |
command == manifest_values::kScriptBadgeCommandEvent; |
} |
+bool ExtensionKeybindingRegistry::NotifyEventTargetsByAccelerator( |
+ const ui::Accelerator& accelerator) { |
+ if (extensions::CommandService::IsMediaKey(accelerator)) { |
+ MediaKeysEventTargets::iterator targets_iterator = |
Finnur
2013/11/12 16:27:54
s/targets_iterator/targets/
zhchbin
2013/11/13 05:01:57
Done.
|
+ media_keys_event_targets_.find(accelerator); |
+ if (targets_iterator == media_keys_event_targets_.end() || |
+ targets_iterator->second.empty()) |
+ return false; |
+ |
+ for (TargetList::const_iterator it = targets_iterator->second.begin(); |
+ it != targets_iterator->second.end(); |
+ it++) { |
+ CommandExecuted(it->first, it->second); |
+ } |
Finnur
2013/11/12 16:27:54
nit: You don't need braces for single line if clau
zhchbin
2013/11/13 05:01:57
Done.
|
+ } else { |
+ EventTargets::iterator it = event_targets_.find(accelerator); |
+ if (it == event_targets_.end()) |
+ return false; |
+ |
+ CommandExecuted(it->second.first, it->second.second); |
+ } |
+ |
+ return true; |
+} |
+ |
void ExtensionKeybindingRegistry::CommandExecuted( |
const std::string& extension_id, const std::string& command) { |
ExtensionService* service = |