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

Unified Diff: chrome/browser/policy/configuration_policy_handler_list.cc

Issue 13132004: Implement Enterprise Key API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 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/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 7465b76cdf77e09a7c39e10afd2397fda6eb8483..ad8bbb2226e027735be6b92cc062619fa9dcea9b 100644
--- a/chrome/browser/policy/configuration_policy_handler_list.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list.cc
@@ -374,6 +374,9 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
{ key::kRebootAfterUpdate,
prefs::kRebootAfterUpdate,
Value::TYPE_BOOLEAN },
+ { key::kAttestationEnabledForUser,
+ prefs::kAttestationEnabled,
+ Value::TYPE_BOOLEAN },
#endif // defined(OS_CHROMEOS)
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
@@ -511,6 +514,10 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
handlers_.push_back(new IntRangePolicyHandler(key::kUptimeLimit,
prefs::kUptimeLimit,
3600, INT_MAX, true));
+ handlers_.push_back(
+ new ExtensionListPolicyHandler(key::kAttestationExtensionWhitelist,
+ prefs::kAttestationExtensionWhitelist,
+ false));
Mattias Nissler (ping if slow) 2013/04/17 08:09:09 Please move to line 438 where the other extension-
davidyu 2013/04/17 08:24:19 Done.
#endif // defined(OS_CHROMEOS)
}

Powered by Google App Engine
This is Rietveld 408576698