Index: chrome/browser/extensions/api/commands/command_service_new.cc |
diff --git a/chrome/browser/extensions/api/commands/command_service_new.cc b/chrome/browser/extensions/api/commands/command_service_new.cc |
index 296180fb4fe288b536475181a010f055532c4061..1a26f18e51e779bd79d2258580bf65431b5d4078 100644 |
--- a/chrome/browser/extensions/api/commands/command_service_new.cc |
+++ b/chrome/browser/extensions/api/commands/command_service_new.cc |
@@ -15,6 +15,7 @@ |
#include "chrome/browser/extensions/extension_system.h" |
#include "chrome/browser/prefs/scoped_user_pref_update.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/common/extensions/api/commands/commands_handler.h" |
#include "chrome/common/pref_names.h" |
#include "components/user_prefs/pref_registry_syncable.h" |
#include "content/public/browser/notification_details.h" |
@@ -192,7 +193,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); |
} |
@@ -218,7 +220,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(); |