| Index: chrome/browser/plugins/plugin_prefs_factory.cc
|
| diff --git a/chrome/browser/plugins/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc
|
| index ee6dc8a0c07ab0fcb703dc5d751e5f59b04c5b57..17adf8220ab0387eaa4a0bf8e421bc791de3dc76 100644
|
| --- a/chrome/browser/plugins/plugin_prefs_factory.cc
|
| +++ b/chrome/browser/plugins/plugin_prefs_factory.cc
|
| @@ -51,33 +51,38 @@ PluginPrefsFactory::BuildServiceInstanceFor(
|
| return plugin_prefs;
|
| }
|
|
|
| -void PluginPrefsFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
| +void PluginPrefsFactory::RegisterUserPrefs(
|
| + user_prefs::PrefRegistrySyncable* registry) {
|
| base::FilePath internal_dir;
|
| PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
|
| - registry->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
|
| - internal_dir,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
|
| - false,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,
|
| - false,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash,
|
| - false,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterFilePathPref(
|
| + prefs::kPluginsLastInternalDirectory,
|
| + internal_dir,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kPluginsEnabledInternalPDF,
|
| + false,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kPluginsEnabledNaCl,
|
| + false,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kPluginsMigratedToPepperFlash,
|
| + false,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterBooleanPref(
|
| prefs::kPluginsRemovedOldComponentPepperFlashSettings,
|
| false,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterListPref(prefs::kPluginsPluginsList,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterListPref(prefs::kPluginsDisabledPlugins,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterListPref(prefs::kPluginsEnabledPlugins,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse(
|
|
|