Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chrome/browser/extensions/api/commands/command_service.cc

Issue 16915006: Convert most of extensions and some other random stuff to using the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a14a38ba52895a1ea74e51e64c4f801c2cfd5677..d5d75f30ed42a3e4c67195ea0a3d549aa4267ed2 100644
--- a/chrome/browser/extensions/api/commands/command_service.cc
+++ b/chrome/browser/extensions/api/commands/command_service.cc
@@ -43,7 +43,7 @@ std::string GetPlatformKeybindingKeyForAccelerator(
void SetInitialBindingsHaveBeenAssigned(
ExtensionPrefs* prefs, const std::string& extension_id) {
prefs->UpdateExtensionPref(extension_id, kInitialBindingsHaveBeenAssigned,
- Value::CreateBooleanValue(true));
+ base::Value::CreateBooleanValue(true));
}
bool InitialBindingsHaveBeenAssigned(
@@ -165,14 +165,14 @@ bool CommandService::AddKeybindingPref(
DictionaryPrefUpdate updater(profile_->GetPrefs(),
prefs::kExtensionCommands);
- DictionaryValue* bindings = updater.Get();
+ base::DictionaryValue* bindings = updater.Get();
std::string key = GetPlatformKeybindingKeyForAccelerator(accelerator);
if (!allow_overrides && bindings->HasKey(key))
return false; // Already taken.
- DictionaryValue* keybinding = new DictionaryValue();
+ base::DictionaryValue* keybinding = new base::DictionaryValue();
keybinding->SetString(kExtension, extension_id);
keybinding->SetString(kCommandName, command_name);
@@ -222,10 +222,11 @@ void CommandService::UpdateKeybindingPrefs(const std::string& extension_id,
ui::Accelerator CommandService::FindShortcutForCommand(
const std::string& extension_id, const std::string& command) {
- const DictionaryValue* bindings =
+ const base::DictionaryValue* bindings =
profile_->GetPrefs()->GetDictionary(prefs::kExtensionCommands);
- for (DictionaryValue::Iterator it(*bindings); !it.IsAtEnd(); it.Advance()) {
- const DictionaryValue* item = NULL;
+ for (base::DictionaryValue::Iterator it(*bindings); !it.IsAtEnd();
+ it.Advance()) {
+ const base::DictionaryValue* item = NULL;
it.value().GetAsDictionary(&item);
std::string extension;
@@ -312,12 +313,13 @@ void CommandService::RemoveKeybindingPrefs(const std::string& extension_id,
const std::string& command_name) {
DictionaryPrefUpdate updater(profile_->GetPrefs(),
prefs::kExtensionCommands);
- DictionaryValue* bindings = updater.Get();
+ base::DictionaryValue* bindings = updater.Get();
typedef std::vector<std::string> KeysToRemove;
KeysToRemove keys_to_remove;
- for (DictionaryValue::Iterator it(*bindings); !it.IsAtEnd(); it.Advance()) {
- const DictionaryValue* item = NULL;
+ for (base::DictionaryValue::Iterator it(*bindings); !it.IsAtEnd();
+ it.Advance()) {
+ const base::DictionaryValue* item = NULL;
it.value().GetAsDictionary(&item);
std::string extension;

Powered by Google App Engine
This is Rietveld 408576698