diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 06:30:58 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 06:30:58 +0000 |
| commit | b24250fc9857d219ad617e2a14e145b65724cb61 (patch) | |
| tree | 858c55a80b23d0e8e62d1f9d4c4b724c6c924860 /base/timer.h | |
| parent | 099cec761ad00232f5ce8483a163356b06065980 (diff) | |
| download | chromium_src-b24250fc9857d219ad617e2a14e145b65724cb61.zip chromium_src-b24250fc9857d219ad617e2a14e145b65724cb61.tar.gz chromium_src-b24250fc9857d219ad617e2a14e145b65724cb61.tar.bz2 | |
reland r1075 w/ tweak to fix test failures
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/timer.h')
| -rw-r--r-- | base/timer.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/base/timer.h b/base/timer.h index c23f725..74fe27b 100644 --- a/base/timer.h +++ b/base/timer.h @@ -59,9 +59,6 @@ class Timer { Task* task() const { return task_; } void set_task(Task* task) { task_ = task; } - // Returns the time in msec relative to now that the timer should fire. - int GetCurrentDelay() const; - // Returns the absolute time at which the timer should fire. const Time &fire_time() const { return fire_time_; } @@ -177,9 +174,10 @@ class TimerManager { // Returns true if it runs a task, false otherwise. bool RunSomePendingTimers(); - // The number of milliseconds remaining until the pending timer (top of the - // pqueue) needs to be fired. Returns -1 if no timers are pending. - int GetCurrentDelay(); + // The absolute time at which the next timer is to fire. If there is not a + // next timer to run, then the is_null property of the returned Time object + // will be true. NOTE: This could be a time in the past! + Time GetNextFireTime() const; #ifdef UNIT_TEST // For testing only, used to simulate broken early-firing WM_TIMER |