Fixes component extension commands assignment on reload.

chrome/browser/extensions/api/commands/command_service.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/api/commands/command_service.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 290 matching lines @@
 
   return true;
 }
 
 void CommandService::OnExtensionWillBeInstalled(
     content::BrowserContext* browser_context,
     const Extension* extension,
     bool is_update,
     bool from_ephemeral,
     const std::string& old_name) {
-  // Component extensions don't generate normal install and uninstall events so
-  // those are handled in OnExtensionLoaded.
-  if (extension->location() != Manifest::COMPONENT)
-    UpdateKeybindings(extension);
+  UpdateKeybindings(extension);
 }
 
 void CommandService::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
     const Extension* extension,
     extensions::UninstallReason reason) {
+  // Adding a component extensions will only trigger install the first time on a
+  // clean profile or on a version increase (see
+  // ComponentLoader::AddComponentExtension). It will, however, always trigger
+  // an uninstall on removal. See http://crbug.com/458612. Isolate this case and
+  // ignore it.
+  if (reason == extensions::UNINSTALL_REASON_COMPONENT_REMOVED)
+    return;
+
   RemoveKeybindingPrefs(extension->id(), std::string());
 }
 
-void CommandService::OnExtensionLoaded(content::BrowserContext* browser_context,
-                                       const Extension* extension) {
-  if (extension->location() == Manifest::COMPONENT)
-    UpdateKeybindings(extension);
-}
-
 void CommandService::UpdateKeybindingPrefs(const std::string& extension_id,
                                            const std::string& command_name,
                                            const std::string& keystroke) {
   Command command = FindCommandByName(extension_id, command_name);
 
   // The extension command might be assigned another shortcut. Remove that
   // shortcut before proceeding.
   RemoveKeybindingPrefs(extension_id, command_name);
 
   ui::Accelerator accelerator =
@@ skipping 545 matching lines @@
   return true;
 }
 
 template <>
 void
 BrowserContextKeyedAPIFactory<CommandService>::DeclareFactoryDependencies() {
   DependsOn(ExtensionCommandsGlobalRegistry::GetFactoryInstance());
 }
 
 }  // namespace extensions