summaryrefslogtreecommitdiffstats
path: root/components/sync_driver/sync_prefs.cc
diff options
context:
space:
mode:
authorraymes <raymes@chromium.org>2015-04-26 20:00:25 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-27 03:00:34 +0000
commitaa60872e346eaf354bb15dbd698546b1bdddd132 (patch)
treee50fc508527b8776881858d1068a2262516b1792 /components/sync_driver/sync_prefs.cc
parenta1b45c39dbf749704b4fd6e3aabcb6d8405cd6d9 (diff)
downloadchromium_src-aa60872e346eaf354bb15dbd698546b1bdddd132.zip
chromium_src-aa60872e346eaf354bb15dbd698546b1bdddd132.tar.gz
chromium_src-aa60872e346eaf354bb15dbd698546b1bdddd132.tar.bz2
Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF
Now that we have added PrefRegistry registration functions that do not need to accept a flags argument, passing PrefRegistrySyncable::UNSYNCABLE_PREF is redundant and we can remove it altogether. Ran the following command: for x in $(git ls-files | grep -E "\.(cc|h|mm)$") ; do perl -0777 -i -pe 's/,[ \n]*(user_prefs::)+PrefRegistrySyncable::UNSYNCABLE_PREF//igs' $x ; done && git cl format There are still some occurences that need to be manually fixed. BUG=476800 Review URL: https://codereview.chromium.org/1102733002 Cr-Commit-Position: refs/heads/master@{#326993}
Diffstat (limited to 'components/sync_driver/sync_prefs.cc')
-rw-r--r--components/sync_driver/sync_prefs.cc66
1 files changed, 15 insertions, 51 deletions
diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc
index 4f1b27f..c28a213 100644
--- a/components/sync_driver/sync_prefs.cc
+++ b/components/sync_driver/sync_prefs.cc
@@ -35,30 +35,15 @@ SyncPrefs::~SyncPrefs() { DCHECK(CalledOnValidThread()); }
// static
void SyncPrefs::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(
- prefs::kSyncHasSetupCompleted,
- false,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterBooleanPref(
- prefs::kSyncSuppressStart,
- false,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterInt64Pref(
- prefs::kSyncLastSyncedTime,
- 0,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterInt64Pref(
- prefs::kSyncFirstSyncTime,
- 0,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, false);
+ registry->RegisterBooleanPref(prefs::kSyncSuppressStart, false);
+ registry->RegisterInt64Pref(prefs::kSyncLastSyncedTime, 0);
+ registry->RegisterInt64Pref(prefs::kSyncFirstSyncTime, 0);
// All datatypes are on by default, but this gets set explicitly
// when you configure sync (when turning it on), in
// ProfileSyncService::OnUserChoseDatatypes.
- registry->RegisterBooleanPref(
- prefs::kSyncKeepEverythingSynced,
- true,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kSyncKeepEverythingSynced, true);
syncer::ModelTypeSet user_types = syncer::UserTypes();
@@ -81,38 +66,20 @@ void SyncPrefs::RegisterProfilePrefs(
RegisterDataTypePreferredPref(registry, it.Get(), false);
}
- registry->RegisterBooleanPref(
- prefs::kSyncManaged,
- false,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterStringPref(
- prefs::kSyncEncryptionBootstrapToken,
- std::string(),
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterStringPref(
- prefs::kSyncKeystoreEncryptionBootstrapToken,
- std::string(),
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kSyncManaged, false);
+ registry->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
+ std::string());
+ registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken,
+ std::string());
#if defined(OS_CHROMEOS)
- registry->RegisterStringPref(
- prefs::kSyncSpareBootstrapToken,
- "",
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken, "");
#endif
- registry->RegisterBooleanPref(
- prefs::kSyncHasAuthError,
- false,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kSyncHasAuthError, false);
- registry->RegisterStringPref(
- prefs::kSyncSessionsGUID,
- std::string(),
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterStringPref(prefs::kSyncSessionsGUID, std::string());
- registry->RegisterIntegerPref(
- prefs::kSyncRemainingRollbackTries, 0,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterIntegerPref(prefs::kSyncRemainingRollbackTries, 0);
}
void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
@@ -394,10 +361,7 @@ void SyncPrefs::RegisterDataTypePreferredPref(
NOTREACHED();
return;
}
- registry->RegisterBooleanPref(
- pref_name,
- is_preferred,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(pref_name, is_preferred);
}
bool SyncPrefs::GetDataTypePreferred(syncer::ModelType type) const {