[Windows] Finish global and non-global media keys support on Windows.

chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc

Index: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
index 61f49150a6a8c2eb98b361d113bac9fc83d68e27..86b704ff95ffee1c314a64498d03eb532e0282b7 100644
--- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
+++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
@@ -29,9 +29,16 @@ ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews(
 }
 
 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() {
-  EventTargets::const_iterator iter;
-  for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter)
-    focus_manager_->UnregisterAccelerator(iter->first, this);
+  EventTargets::const_iterator eit;
+  for (eit = event_targets_.begin(); eit != event_targets_.end(); ++eit)
+    focus_manager_->UnregisterAccelerator(eit->first, this);
+
+  MediaKeysEventTargets::const_iterator mit;
+  for (mit = media_keys_event_targets_.begin();
+       mit != media_keys_event_targets_.end();
+       ++mit) {
+    focus_manager_->UnregisterAccelerator(mit->first, this);
+  }

[Finnur, 2013/11/12 16:27:54]

nit: Single line if clause, you can skip the braces.

[zhchbin, 2013/11/13 05:01:57]

Done.

 }
 
 void ExtensionKeybindingRegistryViews::AddExtensionKeybinding(
@@ -57,8 +64,14 @@ void ExtensionKeybindingRegistryViews::AddExtensionKeybinding(
     if (!command_name.empty() && (iter->second.command_name() != command_name))
       continue;
 
-    event_targets_[iter->second.accelerator()] =
-        std::make_pair(extension->id(), iter->second.command_name());
+    if (extensions::CommandService::IsMediaKey(iter->second.accelerator())) {
+      std::pair<std::string, std::string> target =
+          std::make_pair(extension->id(), iter->second.command_name());
+      media_keys_event_targets_[iter->second.accelerator()].push_back(target);
+    } else {
+      event_targets_[iter->second.accelerator()] =
+          std::make_pair(extension->id(), iter->second.command_name());
+    }
     focus_manager_->RegisterAccelerator(
         iter->second.accelerator(),
         ui::AcceleratorManager::kHighPriority, this);
@@ -73,15 +86,8 @@ void ExtensionKeybindingRegistryViews::RemoveExtensionKeybindingImpl(
 
 bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
-  EventTargets::iterator it = event_targets_.find(accelerator);
-  if (it == event_targets_.end()) {
-    NOTREACHED();  // Shouldn't get this event for something not registered.
-    return false;
-  }
-
-  CommandExecuted(it->second.first, it->second.second);
-
-  return true;
+  return ExtensionKeybindingRegistry::NotifyEventTargetsByAccelerator(
+      accelerator);

[Finnur, 2013/11/12 16:27:54]

It is good to consolidate this in the base class. Thanks.

 }
 
 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const {