| 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 123126f25b8ca2ccd799f6225b9e4351b6610c88..6f4930732c4454608f426d74a5c4cd9feab54884 100644
|
| --- a/chrome/browser/plugins/plugin_prefs_factory.cc
|
| +++ b/chrome/browser/plugins/plugin_prefs_factory.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/path_service.h"
|
| #include "chrome/browser/plugins/plugin_prefs.h"
|
| +#include "chrome/browser/prefs/pref_registry_syncable.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_dependency_manager.h"
|
| @@ -47,29 +48,29 @@ PluginPrefsFactory::BuildServiceInstanceFor(Profile* profile) const {
|
| return plugin_prefs;
|
| }
|
|
|
| -void PluginPrefsFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| +void PluginPrefsFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
| base::FilePath internal_dir;
|
| PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
|
| - prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
|
| - internal_dir,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
|
| - false,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,
|
| - false,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash,
|
| - false,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(prefs::kPluginsPluginsList,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| + 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->RegisterListPref(prefs::kPluginsPluginsList,
|
| + PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterListPref(prefs::kPluginsDisabledPlugins,
|
| + PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
|
| + PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterListPref(prefs::kPluginsEnabledPlugins,
|
| + PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| bool PluginPrefsFactory::ServiceRedirectedInIncognito() const {
|
|
|