summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorkinaba@google.com <kinaba@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-30 11:45:43 +0000
committerkinaba@google.com <kinaba@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-30 11:45:43 +0000
commit60e6c849cc943fa60ed599709d26051347b5abe6 (patch)
treee818adad4a2ce3184bfb4b1c35aaa6b26245449a /base/base.gyp
parentec3941bbe38e397d72d255fff2b0cf5100065ae4 (diff)
downloadchromium_src-60e6c849cc943fa60ed599709d26051347b5abe6.zip
chromium_src-60e6c849cc943fa60ed599709d26051347b5abe6.tar.gz
chromium_src-60e6c849cc943fa60ed599709d26051347b5abe6.tar.bz2
Fix ChromeOS clock menu so that it can show 12-hour clock in all locales.
BUG=chromium-os:15183 TEST=Set "OS Language" to "Japanese" and open "System" setting. Click the check box of "Use 24-hour clock". Verify the top-right menu clock toggles (12 <--> 24). The cause of the issue was that, the 12/24h setting is not referred at all when time strings are formatted with AM/PM sign dropped. Review URL: http://codereview.chromium.org/7054032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 8c3dfce..db1cd99 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -133,6 +133,7 @@
'i18n/file_util_icu_unittest.cc',
'i18n/icu_string_conversions_unittest.cc',
'i18n/rtl_unittest.cc',
+ 'i18n/time_formatting_unittest.cc',
'json/json_reader_unittest.cc',
'json/json_writer_unittest.cc',
'json/string_escape_unittest.cc',
@@ -233,6 +234,8 @@
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
],
'conditions': [
['toolkit_uses_gtk==1', {