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 38 matching lines @@
   }
 }
 
 void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybinding(
     const extensions::Extension* extension,
     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)))
+        (command_name.empty() || (old->second.second == command_name))) {
       event_targets_.erase(old);
+
+      // If a specific command_name was requested, it has now been deleted so
+      // no further work is required.

[Nico, 2013/10/03 16:48:53]

This seems to be in every UI implementation. Is there some way to put this in
model code to share it somehow?

(You could for example have event_targets_ return an iterator that iterates over
the already-filtered sequence, which would allow you to get rid of the if, and
if this method on event_targets_ took command_name as parameter, it could return
an iterator with at most one element)

[Finnur, 2013/10/03 21:57:58]

I'll take a closer look tomorrow morning.

[Finnur, 2013/10/04 17:57:02]

I opted for moving this into the base class, which kills quite a bit of code and
duplication for the map. Would you mind taking a look at that code shift
(ExtensionKeybindingRegistry* classes)?

[Yoyo Zhou, 2013/10/04 18:12:07]

Looks fine to me.

+      if (!command_name.empty())
+        break;
+    }
   }
 }