Implement first part of supporting global extension commands.

chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

 // 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/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 66 matching lines @@
 
 void ExtensionKeybindingRegistryCocoa::AddExtensionKeybinding(
     const extensions::Extension* extension,
     const std::string& command_name) {
   extensions::CommandService* command_service =
       extensions::CommandService::Get(profile_);
   extensions::CommandMap commands;
   command_service->GetNamedCommands(
           extension->id(),
           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());
@@ skipping 31 matching lines @@
           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());
   }
 }
 
-void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybinding(
-    const extensions::Extension* extension,
+void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybindingImpl(
+    const ui::Accelerator& accelerator,
     const std::string& command_name) {
-  EventTargets::iterator iter = event_targets_.begin();
-  while (iter != event_targets_.end()) {
-    EventTargets::iterator old = iter++;
-    if (old->second.first == extension->id() &&
-        (command_name.empty() || (old->second.second == command_name)))
-      event_targets_.erase(old);
-  }
 }