Extension Commands changed by the user now take effect immediately.

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 "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_set.h"
-#include "chrome/browser/extensions/extension_service.h"
 
 namespace extensions {
 
 ExtensionKeybindingRegistry::ExtensionKeybindingRegistry(Profile* profile)
     : profile_(profile) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  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::Init() {
   ExtensionService* service = profile_->GetExtensionService();
   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)
-    AddExtensionKeybinding(*iter);
+    AddExtensionKeybinding(*iter, std::string());
 }
 
 bool ExtensionKeybindingRegistry::ShouldIgnoreCommand(
     const std::string& command) const {
   return command == extension_manifest_values::kPageActionKeybindingEvent ||
          command == extension_manifest_values::kBrowserActionKeybindingEvent;
 }
 
 void ExtensionKeybindingRegistry::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_LOADED:
       AddExtensionKeybinding(
-          content::Details<const extensions::Extension>(details).ptr());
+          content::Details<const extensions::Extension>(details).ptr(),
+          std::string());
       break;
     case chrome::NOTIFICATION_EXTENSION_UNLOADED:
       RemoveExtensionKeybinding(
-          content::Details<UnloadedExtensionInfo>(details)->extension);
+          content::Details<UnloadedExtensionInfo>(details)->extension,
+          std::string());
       break;
+    case chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED:
+    case chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED: {
+      std::pair<const std::string, const std::string>* payload =
+          content::Details<std::pair<const std::string, const std::string> >(
+              details).ptr();
+
+      const extensions::Extension* extension =
+          ExtensionSystem::Get(profile_)->extension_service()->
+              extensions()->GetByID(payload->first);
+      // During install and uninstall the extension won't be found. We'll catch
+      // those events above, with the LOADED/UNLOADED, so we ignore this event.
+      if (!extension)
+        return;

[Yoyo Zhou, 2012/06/28 22:40:51]

ShouldIgnoreCommand could go here instead of in the Views implementation; I
don't have a strong preference though. (But it seems like it's missing from the
Gtk implementation.)

[Finnur, 2012/06/28 22:49:01]

No, this is actually deliberate. The Views implementation does not keep track of
page action commands and browser action commands and therefore should not listen
to Add/Remove calls for those commands. GTK, on the other hand, needs to keep
track of them and must update its state when commands are added and removed.

On 2012/06/28 22:40:51, Yoyo Zhou wrote:

+
+      if (type == chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED)
+        AddExtensionKeybinding(extension, payload->second);
+      else
+        RemoveExtensionKeybinding(extension, payload->second);
+      break;
+    }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions