| Index: base/message_pump_default.cc
|
| ===================================================================
|
| --- base/message_pump_default.cc (revision 65315)
|
| +++ base/message_pump_default.cc (working copy)
|
| @@ -41,13 +41,13 @@
|
| if (delayed_work_time_.is_null()) {
|
| event_.Wait();
|
| } else {
|
| - TimeDelta delay = delayed_work_time_ - Time::Now();
|
| + TimeDelta delay = delayed_work_time_ - TimeTicks::Now();
|
| if (delay > TimeDelta()) {
|
| event_.TimedWait(delay);
|
| } else {
|
| // It looks like delayed_work_time_ indicates a time in the past, so we
|
| // need to call DoDelayedWork now.
|
| - delayed_work_time_ = Time();
|
| + delayed_work_time_ = TimeTicks();
|
| }
|
| }
|
| // Since event_ is auto-reset, we don't need to do anything special here
|
| @@ -67,7 +67,8 @@
|
| event_.Signal();
|
| }
|
|
|
| -void MessagePumpDefault::ScheduleDelayedWork(const Time& delayed_work_time) {
|
| +void MessagePumpDefault::ScheduleDelayedWork(
|
| + const TimeTicks& delayed_work_time) {
|
| // We know that we can't be blocked on Wait right now since this method can
|
| // only be called on the same thread as Run, so we only need to update our
|
| // record of how long to sleep when we do sleep.
|
|
|