chrome/browser/chromeos/preferences.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/preferences.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, 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

« chrome/browser/chromeos/policy/proto/chrome_device_policy.proto ('K') | « chrome/browser/chromeos/policy/proto/chrome_device_policy.proto ('k') | chrome/browser/chromeos/system/timezone_resolver_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index c2cb52ddb1f9a0d8be14eb026cd778417428b0c6..5d652d541c817a008de2b8a2d91769f9f5c00a2f 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

@@ -23,6 +23,7 @@

#include "chrome/browser/chromeos/input_method/input_method_syncer.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

#include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"

+#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

#include "chrome/browser/chromeos/system/input_device_settings.h"

#include "chrome/browser/chromeos/system/timezone_resolver_manager.h"

#include "chrome/browser/download/download_prefs.h"

@@ -96,6 +97,10 @@ void Preferences::RegisterPrefs(PrefRegistrySimple* registry) {

registry->RegisterStringPref(prefs::kLogoutStartedLast, std::string());

registry->RegisterBooleanPref(prefs::kResolveDeviceTimezoneByGeolocation,

true);

+ registry->RegisterIntegerPref(

+ prefs::kSystemTimezoneAutomaticDetectionPolicy,

+ enterprise_management::SystemTimezoneAutomaticDetectionProto::

+ USERS_DECIDE);

}

// static