Index: base/i18n/time_formatting.cc |
diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc |
index ea62a34f51618cd65db89a97db7ac1057dfa2b7d..f76b1585affeb7e84604da053be8707e5d7ffc6a 100644 |
--- a/base/i18n/time_formatting.cc |
+++ b/base/i18n/time_formatting.cc |
@@ -176,8 +176,10 @@ string16 TimeFormatWithPattern(const Time& time, const char* pattern) { |
return TimeFormat(&formatter, time); |
} |
-string16 TimeDurationFormat(const TimeDelta time, |
- const DurationFormatWidth width) { |
+bool TimeDurationFormat(const TimeDelta time, |
+ const DurationFormatWidth width, |
+ string16* out) { |
+ DCHECK(out); |
UErrorCode status = U_ZERO_ERROR; |
const int total_minutes = static_cast<int>(time.InSecondsF() / 60 + 0.5); |
const int hours = total_minutes / 60; |
@@ -191,11 +193,14 @@ string16 TimeDurationFormat(const TimeDelta time, |
icu::UnicodeString formatted; |
icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); |
measure_format.formatMeasures(measures, 2, formatted, ignore, status); |
Greg Levin
2017/03/06 21:40:06
if (U_FAILURE(status))
LOG(ERROR) << "formatMe
Daniel Erat
2017/03/06 23:19:34
sure, added temporary logging throughout.
|
- return base::string16(formatted.getBuffer(), formatted.length()); |
+ *out = base::string16(formatted.getBuffer(), formatted.length()); |
+ return U_SUCCESS(status); |
} |
-string16 TimeDurationFormatWithSeconds(const TimeDelta time, |
- const DurationFormatWidth width) { |
+bool TimeDurationFormatWithSeconds(const TimeDelta time, |
+ const DurationFormatWidth width, |
+ string16* out) { |
+ DCHECK(out); |
UErrorCode status = U_ZERO_ERROR; |
const int64_t total_seconds = static_cast<int>(time.InSecondsF() + 0.5); |
const int hours = total_seconds / 3600; |
@@ -211,7 +216,8 @@ string16 TimeDurationFormatWithSeconds(const TimeDelta time, |
icu::UnicodeString formatted; |
icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); |
measure_format.formatMeasures(measures, 3, formatted, ignore, status); |
- return base::string16(formatted.getBuffer(), formatted.length()); |
+ *out = base::string16(formatted.getBuffer(), formatted.length()); |
+ return U_SUCCESS(status); |
} |
string16 DateIntervalFormat(const Time& begin_time, |