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

chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.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/gtk/extensions/extension_keybinding_registry_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 55 matching lines @@
           extensions::CommandService::ACTIVE_ONLY,
           extensions::CommandService::REGULAR,
           &commands);
 
   for (extensions::CommandMap::const_iterator iter = commands.begin();
        iter != commands.end(); ++iter) {
     if (!command_name.empty() && (iter->second.command_name() != command_name))
       continue;
 
     ui::Accelerator accelerator(iter->second.accelerator());
-    event_targets_[accelerator] =
-        std::make_pair(extension->id(), iter->second.command_name());
+    event_targets_[accelerator].push_back(
+        std::make_pair(extension->id(), iter->second.command_name()));
+
+    // Shortcuts except media keys have only one target in the list. See comment
+    // about |event_targets_|.
+    if (!extensions::CommandService::IsMediaKey(iter->second.accelerator()))
+      DCHECK_EQ(1u, event_targets_[accelerator].size());
 
     if (!accel_group_) {
       accel_group_ = gtk_accel_group_new();
       gtk_window_add_accel_group(window_, accel_group_);
     }
 
     gtk_accel_group_connect(
         accel_group_,
         ui::GetGdkKeyCodeForAccelerator(accelerator),
         ui::GetGdkModifierForAccelerator(accelerator),
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk), this, NULL));
   }
 
   // Unlike on Windows, we need to explicitly add the browser action and page
   // action to the event_targets_, even though we don't register them as
   // handlers. See http://crbug.com/124873.
   extensions::Command browser_action;
   if (command_service->GetBrowserActionCommand(
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action,
           NULL)) {
     ui::Accelerator accelerator(browser_action.accelerator());
-    event_targets_[accelerator] =
-      std::make_pair(extension->id(), browser_action.command_name());
+    event_targets_[accelerator].push_back(
+        std::make_pair(extension->id(), browser_action.command_name()));
+    // We should have only one target. See comment about |event_targets_|.
+    DCHECK_EQ(1u, event_targets_[accelerator].size());
   }
 
   // Add the Page Action (if any).
   extensions::Command page_action;
   if (command_service->GetPageActionCommand(
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &page_action,
           NULL)) {
     ui::Accelerator accelerator(page_action.accelerator());
-    event_targets_[accelerator] =
-        std::make_pair(extension->id(), page_action.command_name());
+    event_targets_[accelerator].push_back(
+        std::make_pair(extension->id(), page_action.command_name()));
+    // We should have only one target. See comment about |event_targets_|.
+    DCHECK_EQ(1u, event_targets_[accelerator].size());
   }
 
   // Add the Script Badge (if any).
   extensions::Command script_badge;
   if (command_service->GetScriptBadgeCommand(
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &script_badge,
           NULL)) {
     ui::Accelerator accelerator(script_badge.accelerator());
-    event_targets_[accelerator] =
-        std::make_pair(extension->id(), script_badge.command_name());
+    event_targets_[accelerator].push_back(
+        std::make_pair(extension->id(), script_badge.command_name()));
+    // We should have only one target. See comment about |event_targets_|.
+    DCHECK_EQ(1u, event_targets_[accelerator].size());
   }
 }
 
 void ExtensionKeybindingRegistryGtk::RemoveExtensionKeybindingImpl(
     const ui::Accelerator& accelerator,
     const std::string& command_name) {
   // On GTK, unlike Windows, the Event Targets contain all events but we must
   // only unregister the ones we registered targets for.
   if (!ShouldIgnoreCommand(command_name)) {
     gtk_accel_group_disconnect_key(
         accel_group_,
         ui::GetGdkKeyCodeForAccelerator(accelerator),
         ui::GetGdkModifierForAccelerator(accelerator));
   }
 }
 
 gboolean ExtensionKeybindingRegistryGtk::OnGtkAccelerator(
     GtkAccelGroup* group,
     GObject* acceleratable,
     guint keyval,
     GdkModifierType modifier) {
   ui::Accelerator accelerator = ui::AcceleratorForGdkKeyCodeAndModifier(
       keyval, modifier);
 
-  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::NotifyEventTargets(accelerator);
 }