diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 19:07:08 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 19:07:08 +0000 |
| commit | 916654128e5925ae80ebf38c2a24851b5334b570 (patch) | |
| tree | 46d55299998752d2d7e880da87c3c6f1763661b4 /base/time.h | |
| parent | 7295a426ac4e6f7f72c3b0730644fc2dd8fd540f (diff) | |
| download | chromium_src-916654128e5925ae80ebf38c2a24851b5334b570.zip chromium_src-916654128e5925ae80ebf38c2a24851b5334b570.tar.gz chromium_src-916654128e5925ae80ebf38c2a24851b5334b570.tar.bz2 | |
Revert r83048 "Removed wchar_t from Time::FromString."
This causes regression on KeywordProviderTest.Edit on clang produced executable.
TBR=shinyak
BUG=
TEST=
Review URL: http://codereview.chromium.org/6893031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time.h')
| -rw-r--r-- | base/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/time.h b/base/time.h index d0b072a..cc99faa 100644 --- a/base/time.h +++ b/base/time.h @@ -313,7 +313,7 @@ class BASE_API Time { // in the input string, we assume local time. // TODO(iyengar) Move the FromString/FromTimeT/ToTimeT/FromFileTime to // a new time converter class. - static bool FromString(const char* time_string, Time* parsed_time); + static bool FromString(const wchar_t* time_string, Time* parsed_time); // For serializing, use FromInternalValue to reconstitute. Please don't use // this and do arithmetic on it, as it is more error prone than using the |