Chromium Code Reviews| Index: chrome/browser/policy/configuration_policy_handler_list.cc |
| diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc |
| index c5b33d7411d30318a18af8bb69dc467f2ff22cc4..f3664cf0a1b73e682f98344bfdf5f2c1d0cf0558 100644 |
| --- a/chrome/browser/policy/configuration_policy_handler_list.cc |
| +++ b/chrome/browser/policy/configuration_policy_handler_list.cc |
| @@ -78,12 +78,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { |
| { key::kApplicationLocaleValue, |
| prefs::kApplicationLocale, |
| Value::TYPE_STRING }, |
| - { key::kExtensionInstallWhitelist, |
| - prefs::kExtensionInstallAllowList, |
| - Value::TYPE_LIST }, |
| - { key::kExtensionInstallBlacklist, |
| - prefs::kExtensionInstallDenyList, |
| - Value::TYPE_LIST }, |
| { key::kExtensionInstallForcelist, |
|
Joao da Silva
2012/05/03 18:41:22
Why not this one too?
Mattias Nissler (ping if slow)
2012/05/03 20:13:04
Because its format is different: <ID>;<UpdateURL>
|
| prefs::kExtensionInstallForceList, |
| Value::TYPE_LIST }, |
| @@ -331,6 +325,15 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() { |
| handlers_.push_back(new RestoreOnStartupPolicyHandler()); |
| handlers_.push_back(new SyncPolicyHandler()); |
| + handlers_.push_back( |
| + new ExtensionListPolicyHandler(key::kExtensionInstallWhitelist, |
| + prefs::kExtensionInstallAllowList, |
| + false)); |
| + handlers_.push_back( |
| + new ExtensionListPolicyHandler(key::kExtensionInstallBlacklist, |
| + prefs::kExtensionInstallDenyList, |
| + true)); |
| + |
| #if !defined(OS_CHROMEOS) |
| handlers_.push_back(new DownloadDirPolicyHandler()); |
| #endif // !defined(OS_CHROMEOS) |
| @@ -344,6 +347,7 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() { |
| new NetworkConfigurationPolicyHandler( |
| key::kOpenNetworkConfiguration, |
| chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY)); |
| + handlers_.push_back(new PinnedLauncherAppsPolicyHandler()); |
| #endif // defined(OS_CHROMEOS) |
| } |