Implement first part of supporting global extension commands.

chrome/browser/extensions/extension_keybinding_registry.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/extensions/extension_keybinding_registry.h"
 
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/event_router.h"
@@ skipping 16 matching lines @@
                  content::Source<Profile>(profile->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
 }
 
 ExtensionKeybindingRegistry::~ExtensionKeybindingRegistry() {
 }
 
+void ExtensionKeybindingRegistry::RemoveExtensionKeybinding(
+    const Extension* extension,
+    const std::string& command_name) {
+  EventTargets::iterator iter = event_targets_.begin();
+  while (iter != event_targets_.end()) {
+    if (iter->second.first != extension->id() ||
+        (!command_name.empty() && (iter->second.second != command_name))) {
+      ++iter;
+      continue;  // Not the extension or command we asked for.
+    }
+
+    // Let each platform-specific implementation get a chance to clean up.
+    RemoveExtensionKeybindingImpl(iter->first, command_name);
+
+    EventTargets::iterator old = iter++;
+    event_targets_.erase(old);
+
+    // If a specific command_name was requested, it has now been deleted so
+    // no further work is required.
+    if (!command_name.empty())
+      break;
+  }
+}
+
 void ExtensionKeybindingRegistry::Init() {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (!service)
     return;  // ExtensionService can be null during testing.
 
   const ExtensionSet* extensions = service->extensions();
   ExtensionSet::const_iterator iter = extensions->begin();
   for (; iter != extensions->end(); ++iter)
     if (ExtensionMatchesFilter(iter->get()))
@@ skipping 10 matching lines @@
 void ExtensionKeybindingRegistry::CommandExecuted(
     const std::string& extension_id, const std::string& command) {
   ExtensionService* service =
       ExtensionSystem::Get(profile_)->extension_service();
 
   const Extension* extension = service->extensions()->GetByID(extension_id);
   if (!extension)
     return;
 
   // Grant before sending the event so that the permission is granted before
-  // the extension acts on the command.
+  // the extension acts on the command. NOTE: The Global Commands handler does
+  // not set the delegate as it deals only with named commands (not page/browser
+  // actions that are associated with the current page directly).
   ActiveTabPermissionGranter* granter =
-      delegate_->GetActiveTabPermissionGranter();
+      delegate_ ? delegate_->GetActiveTabPermissionGranter() : NULL;
   if (granter)
     granter->GrantIfRequested(extension);
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Append(new base::StringValue(command));
 
   scoped_ptr<Event> event(new Event("commands.onCommand", args.Pass()));
   event->restrict_to_profile = profile_;
   event->user_gesture = EventRouter::USER_GESTURE_ENABLED;
   ExtensionSystem::Get(profile_)->event_router()->
@@ skipping 55 matching lines @@
       return true;
     case PLATFORM_APPS_ONLY:
       return extension->is_platform_app();
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace extensions