Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(929)

Unified Diff: base/time_mac.cc

Issue 11453012: Fix black background when locking with fullscreen window: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Mock TimeTicks::Now() Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/time_mac.cc
diff --git a/base/time_mac.cc b/base/time_mac.cc
index ca10bc88662cc1c470bf34e68bca0634899f5e5c..0e562ccd928f1e03e668d6c94706151917b2322b 100644
--- a/base/time_mac.cc
+++ b/base/time_mac.cc
@@ -47,6 +47,8 @@ const int64 Time::kTimeTToMicrosecondsOffset = kWindowsEpochDeltaMicroseconds;
// static
Time Time::Now() {
+ if (TimeFactory::instance())
+ return TimeFactory::instance()->TimeNow();
return FromCFAbsoluteTime(CFAbsoluteTimeGetCurrent());
}
@@ -131,6 +133,9 @@ void Time::Explode(bool is_local, Exploded* exploded) const {
// static
TimeTicks TimeTicks::Now() {
+ if (TimeFactory::instance())
+ return TimeFactory::instance()->TimeTicksNow();
+
uint64_t absolute_micro;
static mach_timebase_info_data_t timebase_info;
@@ -162,6 +167,8 @@ TimeTicks TimeTicks::Now() {
// static
TimeTicks TimeTicks::HighResNow() {
+ if (TimeFactory::instance())
+ return TimeFactory::instance()->TimeTicksHighResNow();
return Now();
}

Powered by Google App Engine
This is Rietveld 408576698