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..b2a9841e9910760a58f86d7f98f08e01bd35a918 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, |
| + kDeviceAttestationEnabled, |
|
Mattias Nissler (ping if slow)
2013/04/10 17:31:03
Alphabetize (and fix kStartUpFlags if you like :D)
dkrahn
2013/04/12 01:17:29
Done.
|
| }; |
| // Legacy policy file location. Used to detect migration from pre v12 ChromeOS. |
| @@ -340,6 +341,7 @@ void DeviceSettingsProvider::SetInPolicy() { |
| // The remaining settings don't support Set(), since they are not |
| // intended to be customizable by the user: |
| // kAppPack |
| + // kDeviceAttestationEnabled |
| // kDeviceOwner |
| // kIdleLogoutTimeout |
| // kIdleLogoutWarningDuration |
| @@ -618,6 +620,10 @@ void DeviceSettingsProvider::DecodeGenericPolicies( |
| kAllowRedeemChromeOsRegistrationOffers, |
| !g_browser_process->browser_policy_connector()->IsEnterpriseManaged()); |
| } |
| + |
| + new_values_cache->SetBoolean( |
| + kDeviceAttestationEnabled, |
| + policy.attestation_settings().attestation_enabled()); |
| } |
| void DeviceSettingsProvider::UpdateValuesCache( |