Parse media keys for named command in the manifest.

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 "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 198 matching lines @@
   }
 }
 
 void CommandService::UpdateKeybindingPrefs(const std::string& extension_id,
                                            const std::string& command_name,
                                            const std::string& keystroke) {
   // The extension command might be assigned another shortcut. Remove that
   // 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);
 }
 
 ui::Accelerator CommandService::FindShortcutForCommand(
     const std::string& extension_id, const std::string& command) {
   const base::DictionaryValue* bindings =
       profile_->GetPrefs()->GetDictionary(prefs::kExtensionCommands);
   for (base::DictionaryValue::Iterator it(*bindings); !it.IsAtEnd();
        it.Advance()) {
     const base::DictionaryValue* item = NULL;
     it.value().GetAsDictionary(&item);
 
     std::string extension;
     item->GetString(kExtension, &extension);
     if (extension != extension_id)
       continue;
     std::string command_name;
     item->GetString(kCommandName, &command_name);
     if (command != command_name)
       continue;
 
     std::string shortcut = it.key();
     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();
 }
 
 void CommandService::AssignInitialKeybindings(const Extension* extension) {
   const extensions::CommandMap* commands =
       CommandsInfo::GetNamedCommands(extension);
   if (!commands)
     return;
@@ skipping 141 matching lines @@
     return false;
 
   *command = *requested_command;
   if (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN)
     command->set_accelerator(shortcut_assigned);
 
   return true;
 }
 
 }  // namespace extensions