Index: base/timer.h |
diff --git a/base/timer.h b/base/timer.h |
index 30cb10900d8216f4e79fbe5b640c9a39bc171e66..2e21582a9a0ab8404bc981c6db2f120f6f31ed6b 100644 |
--- a/base/timer.h |
+++ b/base/timer.h |
@@ -87,14 +87,9 @@ class BASE_EXPORT BaseTimer_Helper { |
// We have access to the timer_ member so we can orphan this task. |
class TimerTask : public Task { |
public: |
- TimerTask(const tracked_objects::Location& posted_from, |
- TimeDelta delay) |
- : posted_from_(posted_from), |
- timer_(NULL), |
- delay_(delay) { |
+ explicit TimerTask(TimeDelta delay) : timer_(NULL), delay_(delay) { |
} |
virtual ~TimerTask() {} |
- tracked_objects::Location posted_from_; |
BaseTimer_Helper* timer_; |
TimeDelta delay_; |
}; |
@@ -121,12 +116,9 @@ class BaseTimer : public BaseTimer_Helper { |
// Call this method to start the timer. It is an error to call this method |
// while the timer is already running. |
- void Start(const tracked_objects::Location& posted_from, |
- TimeDelta delay, |
- Receiver* receiver, |
- ReceiverMethod method) { |
+ void Start(TimeDelta delay, Receiver* receiver, ReceiverMethod method) { |
DCHECK(!IsRunning()); |
- InitiateDelayedTask(new TimerTask(posted_from, delay, receiver, method)); |
+ InitiateDelayedTask(new TimerTask(delay, receiver, method)); |
} |
// Call this method to stop the timer. It is a no-op if the timer is not |
@@ -146,11 +138,8 @@ class BaseTimer : public BaseTimer_Helper { |
class TimerTask : public BaseTimer_Helper::TimerTask { |
public: |
- TimerTask(const tracked_objects::Location& posted_from, |
- TimeDelta delay, |
- Receiver* receiver, |
- ReceiverMethod method) |
- : BaseTimer_Helper::TimerTask(posted_from, delay), |
+ TimerTask(TimeDelta delay, Receiver* receiver, ReceiverMethod method) |
+ : BaseTimer_Helper::TimerTask(delay), |
receiver_(receiver), |
method_(method) { |
} |
@@ -173,7 +162,7 @@ class BaseTimer : public BaseTimer_Helper { |
} |
TimerTask* Clone() const { |
- return new TimerTask(posted_from_, delay_, receiver_, method_); |
+ return new TimerTask(delay_, receiver_, method_); |
} |
private: |
@@ -232,12 +221,8 @@ class DelayTimer { |
public: |
typedef void (Receiver::*ReceiverMethod)(); |
- DelayTimer(const tracked_objects::Location& posted_from, |
- TimeDelta delay, |
- Receiver* receiver, |
- ReceiverMethod method) |
- : posted_from_(posted_from), |
- receiver_(receiver), |
+ DelayTimer(TimeDelta delay, Receiver* receiver, ReceiverMethod method) |
+ : receiver_(receiver), |
method_(method), |
delay_(delay) { |
} |
@@ -257,7 +242,7 @@ class DelayTimer { |
// The timer isn't running, or will expire too late, so restart it. |
timer_.Stop(); |
- timer_.Start(posted_from_, delay, this, &DelayTimer<Receiver>::Check); |
+ timer_.Start(delay, this, &DelayTimer<Receiver>::Check); |
} |
void Check() { |
@@ -274,7 +259,6 @@ class DelayTimer { |
(receiver_->*method_)(); |
} |
- tracked_objects::Location posted_from_; |
Receiver *const receiver_; |
const ReceiverMethod method_; |
const TimeDelta delay_; |