chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc - Issue 1843523002: ChromeOS: Add SystemTimezoneAutomaticDetection policy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebased. Created 4 years, 8 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') | components/policy/resources/policy_templates.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 62d8f6a3c8a6a6ae7167c096b69564b13ca5a4bf..54901ac30460544eb0635be5c922bd8a03d3559f 100644

--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

@@ -706,6 +706,19 @@ 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,

+ POLICY_LEVEL_MANDATORY,

+ POLICY_SCOPE_MACHINE,

+ POLICY_SOURCE_CLOUD,

+ value.release(),

+ nullptr);

+ }

}

if (policy.has_use_24hour_clock()) {