| Index: chrome/browser/extensions/api/commands/command_service.cc
|
| diff --git a/chrome/browser/extensions/api/commands/command_service.cc b/chrome/browser/extensions/api/commands/command_service.cc
|
| index d38090c601d519129ca6b9b5fcc41512a4d67fd0..55c0be6f35e1e314871f044dfcc6003ccac3b46f 100644
|
| --- a/chrome/browser/extensions/api/commands/command_service.cc
|
| +++ b/chrome/browser/extensions/api/commands/command_service.cc
|
| @@ -308,7 +308,10 @@ void CommandService::OnExtensionWillBeInstalled(
|
| bool is_update,
|
| bool from_ephemeral,
|
| const std::string& old_name) {
|
| - UpdateKeybindings(extension);
|
| + // Component extensions don't generate normal install and uninstall events so
|
| + // those are handled in OnExtensionLoaded.
|
| + if (extension->location() != Manifest::COMPONENT)
|
| + UpdateKeybindings(extension);
|
| }
|
|
|
| void CommandService::OnExtensionUninstalled(
|
| @@ -318,6 +321,12 @@ void CommandService::OnExtensionUninstalled(
|
| 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) {
|
|
|