diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 18:49:03 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 18:49:03 +0000 |
| commit | b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e (patch) | |
| tree | e00cd27155ea8fa615b85093d8ea2179cdf8d2c0 /base/time_win.cc | |
| parent | 96f960d08a15c3d125bd10b9ed60b69ea8ab0107 (diff) | |
| download | chromium_src-b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e.zip chromium_src-b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e.tar.gz chromium_src-b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e.tar.bz2 | |
Make int64 -> Time conversion explicit.
Landing Patch for Jacob Mandelson, original review: http://codereview.chromium.org/200093
BUG=none
TEST=base_unittests & app_unittests
Review URL: http://codereview.chromium.org/205003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time_win.cc')
| -rw-r--r-- | base/time_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/time_win.cc b/base/time_win.cc index d0c9702..c134a9e 100644 --- a/base/time_win.cc +++ b/base/time_win.cc @@ -189,7 +189,7 @@ Time Time::Now() { continue; } - return Time(elapsed + initial_time); + return Time(elapsed + Time(initial_time)); } } |