Chromium Code Reviews| 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..40cf2725d1c7a523e23aa15d669a7caa88bc6333 100644 |
| --- a/base/prefs/public/pref_member.h |
| +++ b/base/prefs/public/pref_member.h |
| @@ -288,7 +288,7 @@ class PrefMember : public subtle::PrefMemberBase { |
| // specifically for each specialization (rather than just once above) |
| // or at least one of our compilers won't be happy in all cases. |
| // Specifically, it was failing on ChromeOS with a complaint about |
| -// PrefMember<FilePath>::UpdateValueInternal not being defined when |
| +// PrefMember<base::FilePath>::UpdateValueInternal not being defined when |
|
Mattias Nissler (ping if slow)
2013/02/06 17:53:33
unrelated changes?
Jói
2013/02/07 14:52:32
These were to fix a compilation snafu after a merg
|
| // built in a chroot with the following parameters: |
| // |
| // FEATURES="noclean nostrip" USE="-chrome_debug -chrome_remoting |
| @@ -326,10 +326,12 @@ BASE_PREFS_EXPORT bool PrefMember<std::string>::Internal::UpdateValueInternal( |
| const 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( |
| +BASE_PREFS_EXPORT bool |
| +PrefMember<base::FilePath>::Internal::UpdateValueInternal( |
| const Value& value) const; |
| template <> |
| @@ -345,7 +347,7 @@ 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; |