| 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 2978a1f9338b7e2413e3418fe431e8580069f0f9..5d38936f1aba3355f5fa43942d57741e4bc2eae1 100644
|
| --- a/chrome/browser/extensions/api/commands/command_service.cc
|
| +++ b/chrome/browser/extensions/api/commands/command_service.cc
|
| @@ -216,7 +216,8 @@ void CommandService::UpdateKeybindingPrefs(const std::string& extension_id,
|
| // shortcut before proceeding.
|
| RemoveKeybindingPrefs(extension_id, command_name);
|
|
|
| - ui::Accelerator accelerator = Command::StringToAccelerator(keystroke);
|
| + ui::Accelerator accelerator =
|
| + Command::StringToAccelerator(keystroke, command_name);
|
| AddKeybindingPref(accelerator, extension_id, command_name, true);
|
| }
|
|
|
| @@ -242,7 +243,7 @@ ui::Accelerator CommandService::FindShortcutForCommand(
|
| if (StartsWithASCII(shortcut, Command::CommandPlatform() + ":", true))
|
| shortcut = shortcut.substr(Command::CommandPlatform().length() + 1);
|
|
|
| - return Command::StringToAccelerator(shortcut);
|
| + return Command::StringToAccelerator(shortcut, command_name);
|
| }
|
|
|
| return ui::Accelerator();
|
|
|