Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 12556004: Created AttestationPolicyObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 89fa7a626babfcc7eb8fa0a6adf01f31401289c9..db5481093d56f344451a2e6a598112acc6b75283 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,
};
// 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
@@ -615,6 +617,12 @@ void DeviceSettingsProvider::DecodeGenericPolicies(
kAllowRedeemChromeOsRegistrationOffers,
!g_browser_process->browser_policy_connector()->IsEnterpriseManaged());
}
+
+ // Default to false, this feature requires explicit consent.
+ bool attestation_enabled = false;
+ if (policy.has_attestation_settings())
+ attestation_enabled = policy.attestation_settings().attestation_enabled();
+ new_values_cache->SetBoolean(kDeviceAttestationEnabled, attestation_enabled);
Mattias Nissler (ping if slow) 2013/03/27 14:16:34 you could just pass policy.attestation_settings().
dkrahn 2013/03/27 21:20:44 Done.
}
void DeviceSettingsProvider::UpdateValuesCache(

Powered by Google App Engine
This is Rietveld 408576698