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

Unified Diff: base/time_win.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_win.cc
diff --git a/base/time_win.cc b/base/time_win.cc
index 6d8e4328b3000b3bc3b04a3dbe6b16fe3606fc16..8a01b0ca509c7788d12265ea13b469d026c7dfc7 100644
--- a/base/time_win.cc
+++ b/base/time_win.cc
@@ -103,6 +103,9 @@ int Time::high_resolution_timer_activated_ = 0;
// static
Time Time::Now() {
+ if (TimeFactory::instance())
+ return TimeFactory::instance()->TimeNow();
+
if (initial_time == 0)
InitializeClock();
@@ -451,6 +454,9 @@ TimeTicks::TickFunctionType TimeTicks::SetMockTickFunction(
// static
TimeTicks TimeTicks::Now() {
+ if (TimeFactory::instance())
+ return TimeFactory::instance()->TimeTicksNow();
+
return TimeTicks() + RolloverProtectedNow();
}

Powered by Google App Engine
This is Rietveld 408576698