| Index: base/time.h
|
| diff --git a/base/time.h b/base/time.h
|
| index 79e30b45e32d5599d7f19b649dc9890043a66300..e1fbf965e141e2716210f87f287a89fc98e69afe 100644
|
| --- a/base/time.h
|
| +++ b/base/time.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -385,6 +385,9 @@ class Time {
|
| private:
|
| friend class TimeDelta;
|
|
|
| + explicit Time(int64 us) : us_(us) {
|
| + }
|
| +
|
| // Explodes the given time to either local time |is_local = true| or UTC
|
| // |is_local = false|.
|
| void Explode(bool is_local, Exploded* exploded) const;
|
| @@ -393,9 +396,6 @@ class Time {
|
| // |is_local = true| or UTC |is_local = false|.
|
| static Time FromExploded(bool is_local, const Exploded& exploded);
|
|
|
| - explicit Time(int64 us) : us_(us) {
|
| - }
|
| -
|
| // The representation of Jan 1, 1970 UTC in microseconds since the
|
| // platform-dependent epoch.
|
| static const int64 kTimeTToMicrosecondsOffset;
|
|
|