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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 11 matching lines @@
     views::FocusManager* focus_manager,
     ExtensionFilter extension_filter,
     Delegate* delegate)
     : ExtensionKeybindingRegistry(profile, extension_filter, delegate),
       profile_(profile),
       focus_manager_(focus_manager) {
   Init();
 }
 
 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(
     const extensions::Extension* extension,
     const std::string& command_name) {
   // This object only handles named commands, not browser/page actions.
   if (ShouldIgnoreCommand(command_name))
     return;
 
   extensions::CommandService* command_service =
       extensions::CommandService::Get(profile_);
   // Add all the active keybindings (except page actions and browser actions,
   // which are handled elsewhere).
   extensions::CommandMap commands;
   if (!command_service->GetNamedCommands(
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
           extensions::CommandService::REGULAR,
           &commands))
     return;
   extensions::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
     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);
   }
 }
 
 void ExtensionKeybindingRegistryViews::RemoveExtensionKeybindingImpl(
     const ui::Accelerator& accelerator,
     const std::string& command_name) {
   focus_manager_->UnregisterAccelerator(accelerator, this);
 }
 
 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 {
   return true;
 }