chrome/browser/policy/browser_policy_connector.cc - Issue 12300016: Ignoring the timezone policy if it is set to an empty string.

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/policy/browser_policy_connector.cc

Issue 12300016: Ignoring the timezone policy if it is set to an empty string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Initial patch. Created 7 years, 10 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:

Index: chrome/browser/policy/browser_policy_connector.cc

diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc

index c66516f9dbe6d99cd88aa58f5107d2d5e5197b6d..2a7182d80f14e35d9e3bebc87902a0ed5f938453 100644

--- a/chrome/browser/policy/browser_policy_connector.cc

+++ b/chrome/browser/policy/browser_policy_connector.cc

@@ -474,8 +474,9 @@ void BrowserPolicyConnector::SetTimezoneIfPolicyAvailable() {

return;

std::string timezone;

- if (chromeos::CrosSettings::Get()->GetString(

- chromeos::kSystemTimezonePolicy, &timezone)) {

+ if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy,

+ &timezone) &&

+ !timezone.empty()) {

chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(

UTF8ToUTF16(timezone));

}