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

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: Rename undo/stop to cancel 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 883a35ba129a2d76bbf579f26d26d94ad3a55b39..a055cc385e403a1cffb70e4e2011314acbb99490 100644
--- a/base/time_mac.cc
+++ b/base/time_mac.cc
@@ -99,6 +99,8 @@ const int64 Time::kTimeTToMicrosecondsOffset = kWindowsEpochDeltaMicroseconds;
// static
Time Time::Now() {
+ if (TimeFactory::instance())
+ return TimeFactory::instance()->TimeNow();
return FromCFAbsoluteTime(CFAbsoluteTimeGetCurrent());
}
@@ -183,6 +185,8 @@ void Time::Explode(bool is_local, Exploded* exploded) const {
// static
TimeTicks TimeTicks::Now() {
+ if (TimeFactory::instance())
+ return TimeFactory::instance()->TimeTicksNow();
return TimeTicks(ComputeCurrentTicks());
}
« base/test/scoped_time_controller.cc ('K') | « base/time.cc ('k') | base/time_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698