Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(949)

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 10829235: Revert r150536 - "Added a timezone policy and pyauto tests for it." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
Index: chrome/browser/chromeos/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index b8f0e0eaecaeba5081dd2482c2982a359c0e2212..0c1432e6b672076dcff911d2466be77d6768a1d4 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -61,7 +61,6 @@ const char* kKnownSettings[] = {
kSignedDataRoamingEnabled,
kStartUpUrls,
kStatsReportingPref,
- kSystemTimezonePolicy,
};
// Upper bound for number of retries to fetch a signed setting.
@@ -299,7 +298,6 @@ void DeviceSettingsProvider::SetInPolicy() {
// kScreenSaverExtensionId
// kScreenSaverTimeout
// kStartUpUrls
- // kSystemTimezonePolicy
NOTREACHED();
}
@@ -528,14 +526,6 @@ void DeviceSettingsProvider::DecodeGenericPolicies(
policy.has_release_channel() &&
policy.release_channel().has_release_channel_delegated() &&
policy.release_channel().release_channel_delegated());
-
- if (policy.has_system_timezone()) {
- if (policy.system_timezone().has_timezone()) {
- new_values_cache->SetString(
- kSystemTimezonePolicy,
- policy.system_timezone().timezone());
- }
- }
}
void DeviceSettingsProvider::UpdateValuesCache() {
« no previous file with comments | « chrome/browser/chromeos/settings/cros_settings_names.cc ('k') | chrome/browser/policy/browser_policy_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698