diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 01:13:20 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 01:13:20 +0000 |
| commit | 26f34dd42f1af46a4c68e9082290c359706685db (patch) | |
| tree | 63891e5d7594b26a0b5b599618b560e154633e18 /base | |
| parent | eb6d7019c477673c57f1fbde224d5b8ae8919019 (diff) | |
| download | chromium_src-26f34dd42f1af46a4c68e9082290c359706685db.zip chromium_src-26f34dd42f1af46a4c68e9082290c359706685db.tar.gz chromium_src-26f34dd42f1af46a4c68e9082290c359706685db.tar.bz2 | |
Roll back Markus's CL ( http://codereview.chromium.org/196053)
BUG=none
TEST=UI test and valgrind test pass
TBR=markus
Review URL: http://codereview.chromium.org/222031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/time.cc | 5 | ||||
| -rw-r--r-- | base/time.h | 1 | ||||
| -rw-r--r-- | base/timer.cc | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/base/time.cc b/base/time.cc index 2c40d21..afe8c8f 100644 --- a/base/time.cc +++ b/base/time.cc @@ -41,11 +41,6 @@ int64 TimeDelta::InMilliseconds() const { return delta_ / Time::kMicrosecondsPerMillisecond; } -int64 TimeDelta::InMillisecondsRoundedUp() const { - return (delta_ + Time::kMicrosecondsPerMillisecond - 1) / - Time::kMicrosecondsPerMillisecond; -} - int64 TimeDelta::InMicroseconds() const { return delta_; } diff --git a/base/time.h b/base/time.h index eb990ef..6a181af 100644 --- a/base/time.h +++ b/base/time.h @@ -71,7 +71,6 @@ class TimeDelta { int64 InSeconds() const; double InMillisecondsF() const; int64 InMilliseconds() const; - int64 InMillisecondsRoundedUp() const; int64 InMicroseconds() const; TimeDelta& operator=(TimeDelta other) { diff --git a/base/timer.cc b/base/timer.cc index ce5fab6..2807606 100644 --- a/base/timer.cc +++ b/base/timer.cc @@ -22,7 +22,7 @@ void BaseTimer_Helper::InitiateDelayedTask(TimerTask* timer_task) { delayed_task_->timer_ = this; MessageLoop::current()->PostDelayedTask( FROM_HERE, timer_task, - static_cast<int>(timer_task->delay_.InMillisecondsRoundedUp())); + static_cast<int>(timer_task->delay_.InMilliseconds())); } } // namespace base |