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

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

Issue 1843523002: ChromeOS: Add SystemTimezoneAutomaticDetection policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@596690--Implement-better-timezone-detection--refactoring-before-policy
Patch Set: Update after review. 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3bc77ada84d748b2e57f02efe20948564a47cd02..278f63dc55436adc38d0affc8f7254614f26e60d 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -706,6 +706,20 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
policy.system_timezone().timezone()),
NULL);
}
+
+ if (policy.system_timezone().has_timezone_detection_type()) {
+ scoped_ptr<base::Value> value(DecodeIntegerValue(
+ policy.system_timezone().timezone_detection_type()));
+ if (value) {
+ policies->Set(
+ key::kSystemTimezoneAutomaticDetection,
stevenjb 2016/03/31 16:12:03 nit: move to prev line
Alexander Alekseev 2016/03/31 21:34:29 Done.
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
+ value.release(),
+ nullptr);
+ }
+ }
}
if (policy.has_use_24hour_clock()) {
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698