| Index: chrome/browser/extensions/extension_prefs.cc
|
| diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
|
| index 1612243fc70fdb06234e3cff3d841314767fc2be..7c81209682559155b3f0457561f19107d06cd3f3 100644
|
| --- a/chrome/browser/extensions/extension_prefs.cc
|
| +++ b/chrome/browser/extensions/extension_prefs.cc
|
| @@ -2235,47 +2235,51 @@ bool ExtensionPrefs::NeedsStorageGarbageCollection() {
|
| }
|
|
|
| // static
|
| -void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
|
| - prefs->RegisterDictionaryPref(kExtensionsPref, PrefService::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(kExtensionToolbar, PrefService::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(kExtensionActionBox, PrefService::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(kExtensionActionBoxBar, PrefService::UNSYNCABLE_PREF);
|
| +void ExtensionPrefs::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| + prefs->RegisterDictionaryPref(kExtensionsPref,
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterListPref(kExtensionToolbar,
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterListPref(kExtensionActionBox,
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterListPref(kExtensionActionBoxBar,
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize,
|
| -1, // default value
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kExtensionInstallAllowList,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kExtensionInstallDenyList,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kExtensionInstallForceList,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kExtensionAllowedTypes,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterStringPref(kWebStoreLogin,
|
| std::string(), // default value
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion,
|
| "0", // default value
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterBooleanPref(prefs::kExtensionStorageGarbageCollect,
|
| false, // default value
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterInt64Pref(prefs::kLastExtensionsUpdateCheck,
|
| 0, // default value
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterInt64Pref(prefs::kNextExtensionsUpdateCheck,
|
| 0, // default value
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kExtensionAllowedInstallSites,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterStringPref(kExtensionsLastChromeVersion,
|
| std::string(), // default value
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterBooleanPref(kSideloadWipeoutDone,
|
| false,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| ExtensionIdList ExtensionPrefs::GetExtensionPrefAsVector(
|
|
|