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

Unified Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 1775023002: Enterprise policy to prevent queries to the Quirks Server (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 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/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index d6cf2388f622cf33fcb7234a3986ce20c941eacc..9e7019f5deeb5759f88f2e228000680245a3aef9 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -872,6 +872,20 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, whitelist,
nullptr);
}
+
+ if (policy.has_quirks_download_enabled()) {
+ const em::DeviceQuirksDownloadEnabledProto& container(
+ policy.quirks_download_enabled());
+ if (container.has_quirks_download_enabled()) {
+ policies->Set(
+ key::kDeviceQuirksDownloadEnabled,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
+ new base::FundamentalValue(container.quirks_download_enabled()),
+ NULL);
Thiemo Nagel 2016/03/23 14:53:24 Please use nullptr.
Greg Levin 2016/03/24 23:21:39 Done.
+ }
+ }
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698