| 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..31d62d2459ee91d00c4380f8c67460d5162a120d 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -49,6 +49,7 @@ const char* kKnownSettings[] = {
|
| kAccountsPrefUsers,
|
| kAllowRedeemChromeOsRegistrationOffers,
|
| kAppPack,
|
| + kDeviceAttestationEnabled,
|
| kDeviceOwner,
|
| kIdleLogoutTimeout,
|
| kIdleLogoutWarningDuration,
|
| @@ -63,10 +64,10 @@ const char* kKnownSettings[] = {
|
| kScreenSaverTimeout,
|
| kSettingProxyEverywhere,
|
| kSignedDataRoamingEnabled,
|
| + kStartUpFlags,
|
| kStartUpUrls,
|
| kStatsReportingPref,
|
| kSystemTimezonePolicy,
|
| - kStartUpFlags,
|
| };
|
|
|
| // 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(
|
|
|