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

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.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: Fix display unit test 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/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 5da7a8b0d6cac59ea1ebbb6751c970d42a7b99f9..5c97df74ee1efa1955916ef000cb491faaedee1a 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -56,6 +56,7 @@ const char* const kKnownSettings[] = {
kAccountsPrefTransferSAMLCookies,
kAccountsPrefUsers,
kAccountsPrefLoginScreenDomainAutoComplete,
+ kAllowBluetooth,
kAllowRedeemChromeOsRegistrationOffers,
kAllowedConnectionTypesForUpdate,
kAttestationForContentProtectionEnabled,
@@ -63,7 +64,7 @@ const char* const kKnownSettings[] = {
kDeviceDisabled,
kDeviceDisabledMessage,
kDeviceOwner,
- kAllowBluetooth,
+ kDeviceQuirksDownloadEnabled,
kDisplayRotationDefault,
kExtensionCacheSize,
kHeartbeatEnabled,
@@ -459,6 +460,13 @@ void DecodeGenericPolicies(
kAllowBluetooth, policy.has_allow_bluetooth() &&
policy.allow_bluetooth().has_allow_bluetooth() &&
policy.allow_bluetooth().allow_bluetooth());
+
+ if (policy.has_quirks_download_enabled() &&
+ policy.quirks_download_enabled().has_quirks_download_enabled()) {
+ new_values_cache->SetBoolean(
+ kDeviceQuirksDownloadEnabled,
+ policy.quirks_download_enabled().quirks_download_enabled());
+ }
}
void DecodeLogUploadPolicies(const em::ChromeDeviceSettingsProto& policy,

Powered by Google App Engine
This is Rietveld 408576698