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

Unified Diff: base/prefs/public/pref_member.h

Issue 12286020: Replace FilePath with base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « base/prefs/json_pref_store_unittest.cc ('k') | base/prefs/public/pref_member.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/public/pref_member.h
diff --git a/base/prefs/public/pref_member.h b/base/prefs/public/pref_member.h
index 52a91b5f3ed214dc50c9aa51b6f65c51bee3c089..9aa03d60e4ea9bae253770f6bd4033beb5096064 100644
--- a/base/prefs/public/pref_member.h
+++ b/base/prefs/public/pref_member.h
@@ -152,7 +152,7 @@ class BASE_PREFS_EXPORT PrefMemberBase : public PrefObserver {
// This function implements StringListPrefMember::UpdateValue().
// It is exposed here for testing purposes.
bool BASE_PREFS_EXPORT PrefMemberVectorStringUpdate(
- const Value& value,
+ const base::Value& value,
std::vector<std::string>* string_vector);
} // namespace subtle
@@ -323,14 +323,16 @@ BASE_PREFS_EXPORT void PrefMember<std::string>::UpdatePref(
template <>
BASE_PREFS_EXPORT bool PrefMember<std::string>::Internal::UpdateValueInternal(
- const Value& value) const;
+ const base::Value& value) const;
template <>
-BASE_PREFS_EXPORT void PrefMember<FilePath>::UpdatePref(const FilePath& value);
+BASE_PREFS_EXPORT void PrefMember<base::FilePath>::UpdatePref(
+ const base::FilePath& value);
template <>
-BASE_PREFS_EXPORT bool PrefMember<FilePath>::Internal::UpdateValueInternal(
- const Value& value) const;
+BASE_PREFS_EXPORT bool
+PrefMember<base::FilePath>::Internal::UpdateValueInternal(
+ const base::Value& value) const;
template <>
BASE_PREFS_EXPORT void PrefMember<std::vector<std::string> >::UpdatePref(
@@ -339,13 +341,13 @@ BASE_PREFS_EXPORT void PrefMember<std::vector<std::string> >::UpdatePref(
template <>
BASE_PREFS_EXPORT bool
PrefMember<std::vector<std::string> >::Internal::UpdateValueInternal(
- const Value& value) const;
+ const base::Value& value) const;
typedef PrefMember<bool> BooleanPrefMember;
typedef PrefMember<int> IntegerPrefMember;
typedef PrefMember<double> DoublePrefMember;
typedef PrefMember<std::string> StringPrefMember;
-typedef PrefMember<FilePath> FilePathPrefMember;
+typedef PrefMember<base::FilePath> FilePathPrefMember;
// This preference member is expensive for large string arrays.
typedef PrefMember<std::vector<std::string> > StringListPrefMember;
« no previous file with comments | « base/prefs/json_pref_store_unittest.cc ('k') | base/prefs/public/pref_member.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698