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 "chrome/common/time_format.h" | 5 #include "chrome/common/time_format.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
| 9 #include "app/l10n_util.h" |
9 #include "base/logging.h" | 10 #include "base/logging.h" |
10 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
11 #include "base/singleton.h" | 12 #include "base/singleton.h" |
12 #include "base/stl_util-inl.h" | 13 #include "base/stl_util-inl.h" |
13 #include "base/string_util.h" | 14 #include "base/string_util.h" |
14 #include "base/time.h" | 15 #include "base/time.h" |
15 #include "base/time_format.h" | 16 #include "base/time_format.h" |
16 #include "chrome/common/l10n_util.h" | |
17 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
18 #include "unicode/datefmt.h" | 18 #include "unicode/datefmt.h" |
19 #include "unicode/locid.h" | 19 #include "unicode/locid.h" |
20 #include "unicode/plurfmt.h" | 20 #include "unicode/plurfmt.h" |
21 #include "unicode/plurrule.h" | 21 #include "unicode/plurrule.h" |
22 #include "unicode/smpdtfmt.h" | 22 #include "unicode/smpdtfmt.h" |
23 | 23 |
24 using base::Time; | 24 using base::Time; |
25 using base::TimeDelta; | 25 using base::TimeDelta; |
26 | 26 |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 | 334 |
335 // Filter out "today" and "yesterday" | 335 // Filter out "today" and "yesterday" |
336 if (time >= midnight_today) | 336 if (time >= midnight_today) |
337 return l10n_util::GetString(IDS_PAST_TIME_TODAY); | 337 return l10n_util::GetString(IDS_PAST_TIME_TODAY); |
338 else if (time >= midnight_today - | 338 else if (time >= midnight_today - |
339 TimeDelta::FromMicroseconds(Time::kMicrosecondsPerDay)) | 339 TimeDelta::FromMicroseconds(Time::kMicrosecondsPerDay)) |
340 return l10n_util::GetString(IDS_PAST_TIME_YESTERDAY); | 340 return l10n_util::GetString(IDS_PAST_TIME_YESTERDAY); |
341 | 341 |
342 return std::wstring(); | 342 return std::wstring(); |
343 } | 343 } |
OLD | NEW |