Chromium Code Reviews| 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()) { |