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);

[not at google - send to devlin, 2015/02/20 16:14:50]

For the commands case specifically, Finnur, why do we update the key bindings
both for install and for loaded? If I'm to guess... it's so that extensions that
are disabled or whatever still claim the keybindings?

[David Tseng, 2015/02/20 18:01:09]

The loaded case is removed in this cl.

This was part of the original hack to work around what turned out to be the
unbalanced install/uninstall issue. Since component extensions only ever got
install the first time a component extension was added in a new profile, we had
to update keybindings for component extensions on loaded as well.

 }
 
 void CommandService::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
     const Extension* extension,
     extensions::UninstallReason reason) {
+  // Component extensions will only ever install once, but can notify uninstall
+  // repeatedly, see http://crbug.com/458612.

[not at google - send to devlin, 2015/02/20 16:14:50]

Could you still mention why? The bug describes the sequence of steps but it'd be
good to mention something extra here. I can't suggest anything because I don't
know.

[David Tseng, 2015/02/20 18:01:09]

Done.

+  if (reason == extensions::UNINSTALL_REASON_COMPONENT)
+    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