Chromium Code Reviews| Index: chrome/browser/chromeos/settings/device_settings_provider.cc |
| diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc |
| index 3427ee22bf9d30eb150422b37ae58e84b11c9d56..cc5fe38a76d06b3044df6463bf924e7edba7f00f 100644 |
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc |
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc |
| @@ -67,6 +67,7 @@ const char* kKnownSettings[] = { |
| kStatsReportingPref, |
| kSystemTimezonePolicy, |
| kStartUpFlags, |
| + kVariationsRestrictParameter, |
| }; |
| // Legacy policy file location. Used to detect migration from pre v12 ChromeOS. |
| @@ -352,6 +353,7 @@ void DeviceSettingsProvider::SetInPolicy() { |
| // kScreenSaverTimeout |
| // kStartUpUrls |
| // kSystemTimezonePolicy |
| + // kVariationsRestrictParameter |
| LOG(FATAL) << "Device setting " << prop << " is read-only."; |
| } |
| @@ -618,6 +620,15 @@ void DeviceSettingsProvider::DecodeGenericPolicies( |
| kAllowRedeemChromeOsRegistrationOffers, |
| !g_browser_process->browser_policy_connector()->IsEnterpriseManaged()); |
| } |
| + |
| + if (policy.has_variations_restrict_parameter() && |
| + policy.variations_restrict_parameter().has_parameter()) { |
| + new_values_cache->SetString( |
| + kVariationsRestrictParameter, |
| + policy.variations_restrict_parameter().parameter()); |
| + } else { |
| + new_values_cache->SetString(kVariationsRestrictParameter, ""); |
|
Mattias Nissler (ping if slow)
2013/04/17 17:36:50
The default value is an empty string, so you can s
Mathieu
2013/04/17 20:04:58
Done.
|
| + } |
| } |
| void DeviceSettingsProvider::UpdateValuesCache( |