Renaming the 'keybinding' permission to 'commands'.

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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 19 matching lines @@
          UTF16ToUTF8(accelerator.GetShortcutText());
 }
 
 }  // namespace
 
 namespace extensions {
 
 // static
 void CommandService::RegisterUserPrefs(
   PrefService* user_prefs) {
-      user_prefs->RegisterDictionaryPref(prefs::kExtensionKeybindings,
+      user_prefs->RegisterDictionaryPref(prefs::kExtensionCommands,
                                          PrefService::SYNCABLE_PREF);
 }
 
 CommandService::CommandService(Profile* profile)
     : profile_(profile) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile));
 }
@@ skipping 50 matching lines @@
 
 bool CommandService::AddKeybindingPref(
     const ui::Accelerator& accelerator,
     std::string extension_id,
     std::string command_name,
     bool allow_overrides) {
   if (accelerator.key_code() == ui::VKEY_UNKNOWN)
     return false;
 
   DictionaryPrefUpdate updater(profile_->GetPrefs(),
-                               prefs::kExtensionKeybindings);
+                               prefs::kExtensionCommands);
   DictionaryValue* bindings = updater.Get();
 
   std::string key = GetPlatformKeybindingKeyForAccelerator(accelerator);
 
   if (!allow_overrides && bindings->HasKey(key))
       return false;  // Already taken.
 
   DictionaryValue* keybinding = new DictionaryValue();
   keybinding->SetString(kExtension, extension_id);
   keybinding->SetString(kCommandName, command_name);
@@ skipping 38 matching lines @@
   // shortcut before proceeding.
   RemoveKeybindingPrefs(extension_id, command_name);
 
   ui::Accelerator accelerator = Command::StringToAccelerator(keystroke);
   AddKeybindingPref(accelerator, extension_id, command_name, true);
 }
 
 ui::Accelerator CommandService::FindShortcutForCommand(
     const std::string& extension_id, const std::string& command) {
   const DictionaryValue* bindings =
-      profile_->GetPrefs()->GetDictionary(prefs::kExtensionKeybindings);
+      profile_->GetPrefs()->GetDictionary(prefs::kExtensionCommands);
   for (DictionaryValue::key_iterator it = bindings->begin_keys();
        it != bindings->end_keys(); ++it) {
     const DictionaryValue* item = NULL;
     bindings->GetDictionary(*it, &item);
 
     std::string extension;
     item->GetString(kExtension, &extension);
     if (extension != extension_id)
       continue;
     std::string command_name;
@@ skipping 36 matching lines @@
     AddKeybindingPref(page_action_command->accelerator(),
                       extension->id(),
                       page_action_command->command_name(),
                       false);  // Overwriting not allowed.
   }
 }
 
 void CommandService::RemoveKeybindingPrefs(const std::string& extension_id,
                                            const std::string& command_name) {
   DictionaryPrefUpdate updater(profile_->GetPrefs(),
-                               prefs::kExtensionKeybindings);
+                               prefs::kExtensionCommands);
   DictionaryValue* bindings = updater.Get();
 
   typedef std::vector<std::string> KeysToRemove;
   KeysToRemove keys_to_remove;
   for (DictionaryValue::key_iterator it = bindings->begin_keys();
        it != bindings->end_keys(); ++it) {
     std::string key = *it;
     DictionaryValue* item = NULL;
     bindings->GetDictionary(key, &item);
 
@@ skipping 58 matching lines @@
     return false;
 
   *command = *requested_command;
   if (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN)
     command->set_accelerator(shortcut_assigned);
 
   return true;
 }
 
 }  // namespace extensions