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..876ea115d4e194d511b6d9d268b56d0f44171c80 100644 |
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
@@ -882,6 +882,19 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, |
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, whitelist, |
nullptr); |
} |
+ |
+ if (policy.has_system_timezone_automatic_detection()) { |
+ if (policy.system_timezone_automatic_detection() |
+ .has_timezone_detection_type()) { |
stevenjb
2016/03/28 23:23:17
Combine ifs
Alexander Alekseev
2016/03/29 00:29:25
Done.
|
+ policies->Set(key::kSystemTimezoneAutomaticDetection, |
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
+ POLICY_SOURCE_CLOUD, |
+ new base::FundamentalValue( |
+ policy.system_timezone_automatic_detection() |
+ .timezone_detection_type()), |
+ nullptr); |
+ } |
+ } |
} |
} // namespace |