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)); |
} |