| Index: ui/base/l10n/time_format.h
|
| diff --git a/ui/base/l10n/time_format.h b/ui/base/l10n/time_format.h
|
| index 075b6989cef94caf0aeff271ae1d787558db4936..0b3a1be353101f324f993470ef806ca5ff041b85 100644
|
| --- a/ui/base/l10n/time_format.h
|
| +++ b/ui/base/l10n/time_format.h
|
| @@ -25,21 +25,21 @@ class UI_EXPORT TimeFormat {
|
| // in-progress operations and users have different expectations of units.
|
|
|
| // Returns times in elapsed-format: "3 mins ago", "2 days ago".
|
| - static string16 TimeElapsed(const base::TimeDelta& delta);
|
| + static base::string16 TimeElapsed(const base::TimeDelta& delta);
|
|
|
| // Returns times in remaining-format: "3 mins left", "2 days left".
|
| - static string16 TimeRemaining(const base::TimeDelta& delta);
|
| + static base::string16 TimeRemaining(const base::TimeDelta& delta);
|
|
|
| // Returns times in remaining-long-format: "3 minutes left", "2 days left".
|
| // Currently, this only affects the minutes in long format, the rest
|
| // of the time units are formatted the same as TimeRemaining does.
|
| - static string16 TimeRemainingLong(const base::TimeDelta& delta);
|
| + static base::string16 TimeRemainingLong(const base::TimeDelta& delta);
|
|
|
| // Returns times in short-format: "3 mins", "2 days".
|
| - static string16 TimeRemainingShort(const base::TimeDelta& delta);
|
| + static base::string16 TimeRemainingShort(const base::TimeDelta& delta);
|
|
|
| // Return times in long-format: "2 hours", "25 minutes".
|
| - static string16 TimeDurationLong(const base::TimeDelta& delta);
|
| + static base::string16 TimeDurationLong(const base::TimeDelta& delta);
|
|
|
| // For displaying a relative time in the past. This method returns either
|
| // "Today", "Yesterday", or an empty string if it's older than that. Returns
|
| @@ -55,8 +55,8 @@ class UI_EXPORT TimeFormat {
|
| // If NULL, the current day's midnight will be retrieved, which can be
|
| // slow. If many items are being processed, it is best to get the current
|
| // time once at the beginning and pass it for each computation.
|
| - static string16 RelativeDate(const base::Time& time,
|
| - const base::Time* optional_midnight_today);
|
| + static base::string16 RelativeDate(const base::Time& time,
|
| + const base::Time* optional_midnight_today);
|
|
|
| private:
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(TimeFormat);
|
|
|