diff options
| author | alemate <alemate@chromium.org> | 2015-10-16 17:17:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-17 00:17:58 +0000 |
| commit | 1d239907ecf65bccb52fbcd114c59fec3928cd23 (patch) | |
| tree | e1cab8db1e7f00d4eecdfdad559b2e3e29b0dbb5 /chromeos | |
| parent | 23d6c8471b207d00a8cf65336067a0891c9a936a (diff) | |
| download | chromium_src-1d239907ecf65bccb52fbcd114c59fec3928cd23.zip chromium_src-1d239907ecf65bccb52fbcd114c59fec3928cd23.tar.gz chromium_src-1d239907ecf65bccb52fbcd114c59fec3928cd23.tar.bz2 | |
ChromeOS should have UTC timezone option.
BUG=463221
TEST=manual
Review URL: https://codereview.chromium.org/1237023002
Cr-Commit-Position: refs/heads/master@{#354651}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/settings/timezone_settings.cc | 7 | ||||
| -rw-r--r-- | chromeos/settings/timezone_settings.h | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc index ad6f179..adf04a8b 100644 --- a/chromeos/settings/timezone_settings.cc +++ b/chromeos/settings/timezone_settings.cc @@ -22,6 +22,12 @@ #include "base/threading/worker_pool.h" #include "chromeos/settings/timezone_settings_helper.h" +namespace chromeos { +namespace system { +const char kUTCTimezoneName[] = "Etc/GMT"; +} +} + namespace { // The filepath to the timezone file that symlinks to the actual timezone file. @@ -77,6 +83,7 @@ static const char* kTimeZones[] = { "America/Godthab", "Atlantic/South_Georgia", "Atlantic/Cape_Verde", + chromeos::system::kUTCTimezoneName, "Atlantic/Azores", "Atlantic/Reykjavik", "Atlantic/St_Helena", diff --git a/chromeos/settings/timezone_settings.h b/chromeos/settings/timezone_settings.h index 0fd7b3d..7ab0084 100644 --- a/chromeos/settings/timezone_settings.h +++ b/chromeos/settings/timezone_settings.h @@ -8,12 +8,16 @@ #include <vector> #include "base/strings/string16.h" +#include "chromeos/chromeos_export.h" #include "chromeos/settings/cros_settings_provider.h" #include "third_party/icu/source/i18n/unicode/timezone.h" namespace chromeos { namespace system { +// Canonical name of UTC timezone. +CHROMEOS_EXPORT extern const char kUTCTimezoneName[]; + // This interface provides access to Chrome OS timezone settings. class CHROMEOS_EXPORT TimezoneSettings { public: |