| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/time_format.h" | 5 #include "base/time_format.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| 11 #include "unicode/datefmt.h" | 11 #include "unicode/datefmt.h" |
| 12 | 12 |
| 13 using base::Time; | 13 using base::Time; |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 std::wstring TimeFormat(const DateFormat* formatter, | 17 std::wstring TimeFormat(const icu::DateFormat* formatter, |
| 18 const Time& time) { | 18 const Time& time) { |
| 19 DCHECK(formatter); | 19 DCHECK(formatter); |
| 20 UnicodeString date_string; | 20 icu::UnicodeString date_string; |
| 21 | 21 |
| 22 formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string); | 22 formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string); |
| 23 std::wstring output; | 23 std::wstring output; |
| 24 bool success = UTF16ToWide(date_string.getBuffer(), date_string.length(), | 24 bool success = UTF16ToWide(date_string.getBuffer(), date_string.length(), |
| 25 &output); | 25 &output); |
| 26 DCHECK(success); | 26 DCHECK(success); |
| 27 return output; | 27 return output; |
| 28 } | 28 } |
| 29 | 29 |
| 30 } | 30 } |
| 31 | 31 |
| 32 namespace base { | 32 namespace base { |
| 33 | 33 |
| 34 std::wstring TimeFormatTimeOfDay(const Time& time) { | 34 std::wstring TimeFormatTimeOfDay(const Time& time) { |
| 35 // We can omit the locale parameter because the default should match | 35 // We can omit the locale parameter because the default should match |
| 36 // Chrome's application locale. | 36 // Chrome's application locale. |
| 37 scoped_ptr<DateFormat> formatter(DateFormat::createTimeInstance( | 37 scoped_ptr<icu::DateFormat> formatter( |
| 38 DateFormat::kShort)); | 38 icu::DateFormat::createTimeInstance(icu::DateFormat::kShort)); |
| 39 return TimeFormat(formatter.get(), time); | 39 return TimeFormat(formatter.get(), time); |
| 40 } | 40 } |
| 41 | 41 |
| 42 std::wstring TimeFormatShortDate(const Time& time) { | 42 std::wstring TimeFormatShortDate(const Time& time) { |
| 43 scoped_ptr<DateFormat> formatter(DateFormat::createDateInstance( | 43 scoped_ptr<icu::DateFormat> formatter( |
| 44 DateFormat::kMedium)); | 44 icu::DateFormat::createDateInstance(icu::DateFormat::kMedium)); |
| 45 return TimeFormat(formatter.get(), time); | 45 return TimeFormat(formatter.get(), time); |
| 46 } | 46 } |
| 47 | 47 |
| 48 std::wstring TimeFormatShortDateNumeric(const Time& time) { | 48 std::wstring TimeFormatShortDateNumeric(const Time& time) { |
| 49 scoped_ptr<DateFormat> formatter(DateFormat::createDateInstance( | 49 scoped_ptr<icu::DateFormat> formatter( |
| 50 DateFormat::kShort)); | 50 icu::DateFormat::createDateInstance(icu::DateFormat::kShort)); |
| 51 return TimeFormat(formatter.get(), time); | 51 return TimeFormat(formatter.get(), time); |
| 52 } | 52 } |
| 53 | 53 |
| 54 std::wstring TimeFormatShortDateAndTime(const Time& time) { | 54 std::wstring TimeFormatShortDateAndTime(const Time& time) { |
| 55 scoped_ptr<DateFormat> formatter(DateFormat::createDateTimeInstance( | 55 scoped_ptr<icu::DateFormat> formatter( |
| 56 DateFormat::kShort)); | 56 icu::DateFormat::createDateTimeInstance(icu::DateFormat::kShort)); |
| 57 return TimeFormat(formatter.get(), time); | 57 return TimeFormat(formatter.get(), time); |
| 58 } | 58 } |
| 59 | 59 |
| 60 std::wstring TimeFormatFriendlyDateAndTime(const Time& time) { | 60 std::wstring TimeFormatFriendlyDateAndTime(const Time& time) { |
| 61 scoped_ptr<DateFormat> formatter(DateFormat::createDateTimeInstance( | 61 scoped_ptr<icu::DateFormat> formatter( |
| 62 DateFormat::kFull)); | 62 icu::DateFormat::createDateTimeInstance(icu::DateFormat::kFull)); |
| 63 return TimeFormat(formatter.get(), time); | 63 return TimeFormat(formatter.get(), time); |
| 64 } | 64 } |
| 65 | 65 |
| 66 std::wstring TimeFormatFriendlyDate(const Time& time) { | 66 std::wstring TimeFormatFriendlyDate(const Time& time) { |
| 67 scoped_ptr<DateFormat> formatter(DateFormat::createDateInstance( | 67 scoped_ptr<icu::DateFormat> formatter(icu::DateFormat::createDateInstance( |
| 68 DateFormat::kFull)); | 68 icu::DateFormat::kFull)); |
| 69 return TimeFormat(formatter.get(), time); | 69 return TimeFormat(formatter.get(), time); |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace base | 72 } // namespace base |
| OLD | NEW |