Extension Commands changed by the user now take effect immediately.

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/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
@@ skipping 16 matching lines @@
   Init();
 }
 
 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() {
   EventTargets::const_iterator iter;
   for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter)
     focus_manager_->UnregisterAccelerator(iter->first, this);
 }
 
 void ExtensionKeybindingRegistryViews::AddExtensionKeybinding(
-    const extensions::Extension* extension) {
+    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::CommandServiceFactory::GetForProfile(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, &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());
     focus_manager_->RegisterAccelerator(
         iter->second.accelerator(),
         ui::AcceleratorManager::kHighPriority, this);
   }
 }
 
 void ExtensionKeybindingRegistryViews::RemoveExtensionKeybinding(
-    const extensions::Extension* extension) {
+    const extensions::Extension* extension,
+    const std::string& command_name) {
+  // This object only handles named commands, not browser/page actions.
+  if (ShouldIgnoreCommand(command_name))
+    return;
+
   EventTargets::iterator iter = event_targets_.begin();
   while (iter != event_targets_.end()) {
-    if (iter->second.first != extension->id()) {
+    if (iter->second.first != extension->id() ||
+        (!command_name.empty() && (iter->second.second != command_name))) {
       ++iter;
-      continue;  // Not the extension we asked for.
+      continue;  // Not the extension or command we asked for.
     }
 
     focus_manager_->UnregisterAccelerator(iter->first, this);
 
     EventTargets::iterator old = iter++;
     event_targets_.erase(old);
   }
 }
 
 bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   ExtensionService* service = profile_->GetExtensionService();
 
   EventTargets::iterator it = event_targets_.find(accelerator);
   if (it == event_targets_.end()) {
     NOTREACHED();  // Shouldn't get this event for something not registered.
     return false;
   }
 
   service->browser_event_router()->CommandExecuted(
       profile_, it->second.first, it->second.second);
 
   return true;
 }
 
 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const {
   return true;
 }