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

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

Issue 12147004: Disable/enable echo for enterprise device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add the missing SendResponse call to the async extension method. Created 7 years, 10 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/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/policy/device_policy_decoder_chromeos.cc b/chrome/browser/policy/device_policy_decoder_chromeos.cc
index 53d3d95b09739b222ab740bd907c680407427e8f..c6430c87039176c9c92eaf16ee5a106b23ea0b43 100644
--- a/chrome/browser/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/policy/device_policy_decoder_chromeos.cc
@@ -413,6 +413,18 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
policy.system_timezone().timezone()));
}
}
+
+ if (policy.has_allow_redeem_offers()) {
+ const em::AllowRedeemChromeOsRegistrationOffersProto& container(
+ policy.allow_redeem_offers());
+ if (container.has_allow_redeem_offers()) {
+ policies->Set(key::kDeviceAllowRedeemChromeOsRegistrationOffers,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ Value::CreateBooleanValue(
+ container.allow_redeem_offers()));
+ }
+ }
}
} // namespace
« no previous file with comments | « chrome/browser/extensions/extension_function_registry.cc ('k') | chrome/browser/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698