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

Unified Diff: base/prefs/testing_pref_service.h

Issue 16797003: Make base use the proper Value namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwarnings fixed 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: base/prefs/testing_pref_service.h
diff --git a/base/prefs/testing_pref_service.h b/base/prefs/testing_pref_service.h
index ff15c4d8e6253e9bfd6e15af33556f53e1aa2865..74d11f55166ef611b46b3bf680091f12f5968024 100644
--- a/base/prefs/testing_pref_service.h
+++ b/base/prefs/testing_pref_service.h
@@ -27,24 +27,24 @@ class TestingPrefServiceBase : public SuperPrefService {
// Read the value of a preference from the managed layer. Returns NULL if the
// preference is not defined at the managed layer.
- const Value* GetManagedPref(const char* path) const;
+ const base::Value* GetManagedPref(const char* path) const;
// Set a preference on the managed layer and fire observers if the preference
// changed. Assumes ownership of |value|.
- void SetManagedPref(const char* path, Value* value);
+ void SetManagedPref(const char* path, base::Value* value);
// Clear the preference on the managed layer and fire observers if the
// preference has been defined previously.
void RemoveManagedPref(const char* path);
// Similar to the above, but for user preferences.
- const Value* GetUserPref(const char* path) const;
- void SetUserPref(const char* path, Value* value);
+ const base::Value* GetUserPref(const char* path) const;
+ void SetUserPref(const char* path, base::Value* value);
void RemoveUserPref(const char* path);
// Similar to the above, but for recommended policy preferences.
- const Value* GetRecommendedPref(const char* path) const;
- void SetRecommendedPref(const char* path, Value* value);
+ const base::Value* GetRecommendedPref(const char* path) const;
+ void SetRecommendedPref(const char* path, base::Value* value);
void RemoveRecommendedPref(const char* path);
// Do-nothing implementation for TestingPrefService.
@@ -61,10 +61,12 @@ class TestingPrefServiceBase : public SuperPrefService {
private:
// Reads the value of the preference indicated by |path| from |pref_store|.
// Returns NULL if the preference was not found.
- const Value* GetPref(TestingPrefStore* pref_store, const char* path) const;
+ const base::Value* GetPref(TestingPrefStore* pref_store,
+ const char* path) const;
// Sets the value for |path| in |pref_store|.
- void SetPref(TestingPrefStore* pref_store, const char* path, Value* value);
+ void SetPref(TestingPrefStore* pref_store, const char* path,
+ base::Value* value);
// Removes the preference identified by |path| from |pref_store|.
void RemovePref(TestingPrefStore* pref_store, const char* path);
@@ -109,7 +111,7 @@ TestingPrefServiceBase<
}
template<class SuperPrefService, class ConstructionPrefRegistry>
-const Value* TestingPrefServiceBase<
+const base::Value* TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::GetManagedPref(
const char* path) const {
return GetPref(managed_prefs_.get(), path);
@@ -118,7 +120,7 @@ const Value* TestingPrefServiceBase<
template<class SuperPrefService, class ConstructionPrefRegistry>
void TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::SetManagedPref(
- const char* path, Value* value) {
+ const char* path, base::Value* value) {
SetPref(managed_prefs_.get(), path, value);
}
@@ -130,7 +132,7 @@ void TestingPrefServiceBase<
}
template<class SuperPrefService, class ConstructionPrefRegistry>
-const Value* TestingPrefServiceBase<
+const base::Value* TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::GetUserPref(
const char* path) const {
return GetPref(user_prefs_.get(), path);
@@ -139,7 +141,7 @@ const Value* TestingPrefServiceBase<
template<class SuperPrefService, class ConstructionPrefRegistry>
void TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::SetUserPref(
- const char* path, Value* value) {
+ const char* path, base::Value* value) {
SetPref(user_prefs_.get(), path, value);
}
@@ -151,7 +153,7 @@ void TestingPrefServiceBase<
}
template<class SuperPrefService, class ConstructionPrefRegistry>
-const Value* TestingPrefServiceBase<
+const base::Value* TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::GetRecommendedPref(
const char* path) const {
return GetPref(recommended_prefs_, path);
@@ -160,7 +162,7 @@ const Value* TestingPrefServiceBase<
template<class SuperPrefService, class ConstructionPrefRegistry>
void TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::SetRecommendedPref(
- const char* path, Value* value) {
+ const char* path, base::Value* value) {
SetPref(recommended_prefs_.get(), path, value);
}
@@ -172,17 +174,17 @@ void TestingPrefServiceBase<
}
template<class SuperPrefService, class ConstructionPrefRegistry>
-const Value* TestingPrefServiceBase<
+const base::Value* TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::GetPref(
TestingPrefStore* pref_store, const char* path) const {
- const Value* res;
+ const base::Value* res;
return pref_store->GetValue(path, &res) ? res : NULL;
}
template<class SuperPrefService, class ConstructionPrefRegistry>
void TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::SetPref(
- TestingPrefStore* pref_store, const char* path, Value* value) {
+ TestingPrefStore* pref_store, const char* path, base::Value* value) {
pref_store->SetValue(path, value);
}

Powered by Google App Engine
This is Rietveld 408576698