diff options
author | raymes <raymes@chromium.org> | 2015-04-26 20:00:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-27 03:00:34 +0000 |
commit | aa60872e346eaf354bb15dbd698546b1bdddd132 (patch) | |
tree | e50fc508527b8776881858d1068a2262516b1792 /extensions/browser/extension_prefs.cc | |
parent | a1b45c39dbf749704b4fd6e3aabcb6d8405cd6d9 (diff) | |
download | chromium_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 'extensions/browser/extension_prefs.cc')
-rw-r--r-- | extensions/browser/extension_prefs.cc | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc index c7409b3..88c32ea 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc @@ -1895,27 +1895,18 @@ bool ExtensionPrefs::NeedsStorageGarbageCollection() { // static void ExtensionPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterDictionaryPref( - pref_names::kExtensions, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); + registry->RegisterDictionaryPref(pref_names::kExtensions); registry->RegisterListPref(pref_names::kToolbar, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( pref_names::kToolbarSize, -1, // default value user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterDictionaryPref( - kExtensionsBlacklistUpdate, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterListPref(pref_names::kInstallAllowList, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterListPref(pref_names::kInstallDenyList, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterDictionaryPref( - pref_names::kInstallForceList, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterListPref(pref_names::kAllowedTypes, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); + registry->RegisterDictionaryPref(kExtensionsBlacklistUpdate); + registry->RegisterListPref(pref_names::kInstallAllowList); + registry->RegisterListPref(pref_names::kInstallDenyList); + registry->RegisterDictionaryPref(pref_names::kInstallForceList); + registry->RegisterListPref(pref_names::kAllowedTypes); registry->RegisterBooleanPref( pref_names::kStorageGarbageCollect, false, // default value @@ -1928,20 +1919,15 @@ void ExtensionPrefs::RegisterProfilePrefs( pref_names::kNextUpdateCheck, 0, // default value user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterListPref(pref_names::kAllowedInstallSites, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); + registry->RegisterListPref(pref_names::kAllowedInstallSites); registry->RegisterStringPref( pref_names::kLastChromeVersion, std::string(), // default value user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterDictionaryPref( - kInstallSignature, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); + registry->RegisterDictionaryPref(kInstallSignature); - registry->RegisterListPref(pref_names::kNativeMessagingBlacklist, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - registry->RegisterListPref(pref_names::kNativeMessagingWhitelist, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); + registry->RegisterListPref(pref_names::kNativeMessagingBlacklist); + registry->RegisterListPref(pref_names::kNativeMessagingWhitelist); registry->RegisterBooleanPref( pref_names::kNativeMessagingUserLevelHosts, true, // default value @@ -1952,9 +1938,7 @@ void ExtensionPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); #if !defined(OS_MACOSX) - registry->RegisterBooleanPref( - pref_names::kAppFullscreenAllowed, true, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); + registry->RegisterBooleanPref(pref_names::kAppFullscreenAllowed, true); #endif } |