| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/time/time.h" | 5 #include "base/time/time.h" |
| 6 | 6 |
| 7 #include <CoreFoundation/CFDate.h> | 7 #include <CoreFoundation/CFDate.h> |
| 8 #include <CoreFoundation/CFTimeZone.h> | 8 #include <CoreFoundation/CFTimeZone.h> |
| 9 #include <mach/mach.h> | 9 #include <mach/mach.h> |
| 10 #include <mach/mach_time.h> | 10 #include <mach/mach_time.h> |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 return true; | 223 return true; |
| 224 } | 224 } |
| 225 | 225 |
| 226 // static | 226 // static |
| 227 TimeTicks TimeTicks::ThreadNow() { | 227 TimeTicks TimeTicks::ThreadNow() { |
| 228 return TimeTicks(ComputeThreadTicks()); | 228 return TimeTicks(ComputeThreadTicks()); |
| 229 } | 229 } |
| 230 | 230 |
| 231 // static | 231 // static |
| 232 TimeTicks TimeTicks::NowFromSystemTraceTime() { | 232 TimeTicks TimeTicks::NowFromSystemTraceTime() { |
| 233 return HighResNow(); | 233 return Now(); |
| 234 } | 234 } |
| 235 | 235 |
| 236 } // namespace base | 236 } // namespace base |
| OLD | NEW |