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

Unified Diff: components/policy/core/common/policy_map.cc

Issue 108603005: Update uses of Value in chromeos/, cloud_print/, components/, content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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: components/policy/core/common/policy_map.cc
diff --git a/components/policy/core/common/policy_map.cc b/components/policy/core/common/policy_map.cc
index ffcdf43dcc1bad91f981dbacaf291da3cff08e7e..5e1fd5b06375e385c61a8bb66bd9b67e702c1ea6 100644
--- a/components/policy/core/common/policy_map.cc
+++ b/components/policy/core/common/policy_map.cc
@@ -48,7 +48,7 @@ bool PolicyMap::Entry::has_higher_priority_than(
bool PolicyMap::Entry::Equals(const PolicyMap::Entry& other) const {
return level == other.level &&
scope == other.scope &&
- Value::Equals(value, other.value) &&
+ base::Value::Equals(value, other.value) &&
ExternalDataFetcher::Equals(external_data_fetcher,
other.external_data_fetcher);
}
@@ -65,7 +65,7 @@ const PolicyMap::Entry* PolicyMap::Get(const std::string& policy) const {
return entry == map_.end() ? NULL : &entry->second;
}
-const Value* PolicyMap::GetValue(const std::string& policy) const {
+const base::Value* PolicyMap::GetValue(const std::string& policy) const {
PolicyMapType::const_iterator entry = map_.find(policy);
return entry == map_.end() ? NULL : entry->second.value;
}
@@ -73,7 +73,7 @@ const Value* PolicyMap::GetValue(const std::string& policy) const {
void PolicyMap::Set(const std::string& policy,
PolicyLevel level,
PolicyScope scope,
- Value* value,
+ base::Value* value,
ExternalDataFetcher* external_data_fetcher) {
Entry& entry = map_[policy];
entry.DeleteOwnedMembers();
@@ -124,11 +124,13 @@ void PolicyMap::MergeFrom(const PolicyMap& other) {
}
void PolicyMap::LoadFrom(
- const DictionaryValue* policies,
+ const base::DictionaryValue* policies,
PolicyLevel level,
PolicyScope scope) {
- for (DictionaryValue::Iterator it(*policies); !it.IsAtEnd(); it.Advance())
+ for (base::DictionaryValue::Iterator it(*policies);
+ !it.IsAtEnd(); it.Advance()) {
Set(it.key(), level, scope, it.value().DeepCopy(), NULL);
+ }
}
void PolicyMap::GetDifferingKeys(const PolicyMap& other,

Powered by Google App Engine
This is Rietveld 408576698