summaryrefslogtreecommitdiffstats
path: root/base/timer.h
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-20 07:19:45 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-20 07:19:45 +0000
commite8a49b38cb47591c2bab646b7badb7c6a12bc80c (patch)
tree66f5b86040c41ae0083a83457ca9f1abc7e8bed9 /base/timer.h
parent724fffdbc7645d74c5b5a4f4bf2f6cc09dd7579b (diff)
downloadchromium_src-e8a49b38cb47591c2bab646b7badb7c6a12bc80c.zip
chromium_src-e8a49b38cb47591c2bab646b7badb7c6a12bc80c.tar.gz
chromium_src-e8a49b38cb47591c2bab646b7badb7c6a12bc80c.tar.bz2
Transition to TimeTicks from Time in timer module.
One use of Time::Now() etc. appears to have not been migrated to using of TimeTicks::Now(). BUG=None TEST=None R=eroman@chromium.org Review URL: http://codereview.chromium.org/6714005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/timer.h')
-rw-r--r--base/timer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/timer.h b/base/timer.h
index 0de7c79..ff14427 100644
--- a/base/timer.h
+++ b/base/timer.h
@@ -232,7 +232,7 @@ class DelayTimer {
private:
void DelayFor(TimeDelta delay) {
- trigger_time_ = Time::Now() + delay;
+ trigger_time_ = TimeTicks::Now() + delay;
// If we already have a timer that will expire at or before the given delay,
// then we have nothing more to do now.
@@ -249,7 +249,7 @@ class DelayTimer {
return;
// If we have not waited long enough, then wait some more.
- const Time now = Time::Now();
+ const TimeTicks now = TimeTicks::Now();
if (now < trigger_time_) {
DelayFor(trigger_time_ - now);
return;
@@ -263,7 +263,7 @@ class DelayTimer {
const TimeDelta delay_;
OneShotTimer<DelayTimer<Receiver> > timer_;
- Time trigger_time_;
+ TimeTicks trigger_time_;
};
} // namespace base