Index: base/time/time.h |
diff --git a/base/time/time.h b/base/time/time.h |
index a02fbeb01ffb7e82761d524fd8c8bcacb9f618eb..0dcf9e1defc7191ac49624599a51eecbf4b8c30f 100644 |
--- a/base/time/time.h |
+++ b/base/time/time.h |
@@ -75,12 +75,6 @@ |
#include <sys/time.h> |
#endif |
-#if defined(OS_WIN) |
-// For FILETIME in FromFileTime, until it moves to a new converter class. |
-// See TODO(iyengar) below. |
-#include <windows.h> |
-#endif |
- |
#include <limits> |
namespace base { |
@@ -119,9 +113,6 @@ class BASE_EXPORT TimeDelta { |
static TimeDelta FromSecondsD(double secs); |
static TimeDelta FromMillisecondsD(double ms); |
static TimeDelta FromMicroseconds(int64 us); |
-#if defined(OS_WIN) |
- static TimeDelta FromQPCValue(LONGLONG qpc_value); |
-#endif |
// Converts an integer value representing TimeDelta to a class. This is used |
// when deserializing a |TimeDelta| structure, using a value known to be |
@@ -405,19 +396,12 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> { |
// platform-dependent epoch. |
static const int64 kTimeTToMicrosecondsOffset; |
-#if !defined(OS_WIN) |
// On Mac & Linux, this value is the delta from the Windows epoch of 1601 to |
// the Posix delta of 1970. This is used for migrating between the old |
// 1970-based epochs to the new 1601-based ones. It should be removed from |
// this global header and put in the platform-specific ones when we remove the |
// migration code. |
static const int64 kWindowsEpochDeltaMicroseconds; |
-#else |
- // To avoid overflow in QPC to Microseconds calculations, since we multiply |
- // by kMicrosecondsPerSecond, then the QPC value should not exceed |
- // (2^63 - 1) / 1E6. If it exceeds that threshold, we divide then multiply. |
- static const int64 kQPCOverflowThreshold = 0x8637BD05AF7; |
-#endif |
// Represents an exploded time that can be formatted nicely. This is kind of |
// like the Win32 SYSTEMTIME structure or the Unix "struct tm" with a few |
@@ -503,33 +487,6 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> { |
CFAbsoluteTime ToCFAbsoluteTime() const; |
#endif |
-#if defined(OS_WIN) |
- static Time FromFileTime(FILETIME ft); |
- FILETIME ToFileTime() const; |
- |
- // The minimum time of a low resolution timer. This is basically a windows |
- // constant of ~15.6ms. While it does vary on some older OS versions, we'll |
- // treat it as static across all windows versions. |
- static const int kMinLowResolutionThresholdMs = 16; |
- |
- // Enable or disable Windows high resolution timer. |
- static void EnableHighResolutionTimer(bool enable); |
- |
- // Activates or deactivates the high resolution timer based on the |activate| |
- // flag. If the HighResolutionTimer is not Enabled (see |
- // EnableHighResolutionTimer), this function will return false. Otherwise |
- // returns true. Each successful activate call must be paired with a |
- // subsequent deactivate call. |
- // All callers to activate the high resolution timer must eventually call |
- // this function to deactivate the high resolution timer. |
- static bool ActivateHighResolutionTimer(bool activate); |
- |
- // Returns true if the high resolution timer is both enabled and activated. |
- // This is provided for testing only, and is not tracked in a thread-safe |
- // way. |
- static bool IsHighResolutionTimerInUse(); |
-#endif |
- |
// Converts an exploded structure representing either the local time or UTC |
// into a Time class. |
static Time FromUTCExploded(const Exploded& exploded) { |
@@ -682,13 +639,6 @@ class BASE_EXPORT TimeTicks : public time_internal::TimeBase<TimeTicks> { |
// clock will be used instead. |
static bool IsHighResolution(); |
-#if defined(OS_WIN) |
- // Translates an absolute QPC timestamp into a TimeTicks value. The returned |
- // value has the same origin as Now(). Do NOT attempt to use this if |
- // IsHighResolution() returns false. |
- static TimeTicks FromQPCValue(LONGLONG qpc_value); |
-#endif |
- |
// Get the TimeTick value at the time of the UnixEpoch. This is useful when |
// you need to relate the value of TimeTicks to a real time and date. |
// Note: Upon first invocation, this function takes a snapshot of the realtime |
@@ -703,12 +653,6 @@ class BASE_EXPORT TimeTicks : public time_internal::TimeBase<TimeTicks> { |
TimeTicks SnappedToNextTick(TimeTicks tick_phase, |
TimeDelta tick_interval) const; |
-#if defined(OS_WIN) |
- protected: |
- typedef DWORD (*TickFunctionType)(void); |
- static TickFunctionType SetMockTickFunction(TickFunctionType ticker); |
-#endif |
- |
private: |
friend class time_internal::TimeBase<TimeTicks>; |