diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 21:03:06 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 21:03:06 +0000 |
| commit | c74c7cfdc0d7ee23bcd171fb17e2d9302fd7e7c7 (patch) | |
| tree | 6b5ddada0cf8cf22163e23641cf2505980dc87dc /base | |
| parent | d20c041de976e2f78072ab1b6274c2bed6b13c15 (diff) | |
| download | chromium_src-c74c7cfdc0d7ee23bcd171fb17e2d9302fd7e7c7.zip chromium_src-c74c7cfdc0d7ee23bcd171fb17e2d9302fd7e7c7.tar.gz chromium_src-c74c7cfdc0d7ee23bcd171fb17e2d9302fd7e7c7.tar.bz2 | |
Add a using declaration for Timer::Start in BaseTimerMethodPointer.
This is to get around the fact that Timer::Start, which has a friendlier
base::Closure signature, is hidden by BaseTimerMethodPointer::Start.
BUG=148832
Review URL: https://chromiumcodereview.appspot.com/11144010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/timer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/base/timer.h b/base/timer.h index 28c0a10..95cae12 100644 --- a/base/timer.h +++ b/base/timer.h @@ -184,6 +184,13 @@ class BaseTimerMethodPointer : public Timer { public: typedef void (Receiver::*ReceiverMethod)(); + // This is here to work around the fact that Timer::Start is "hidden" by the + // Start definition below, rather than being overloaded. + // TODO(tim): We should remove uses of BaseTimerMethodPointer::Start below + // and convert callers to use the base::Closure version in Timer::Start, + // see bug 148832. + using Timer::Start; + BaseTimerMethodPointer() : Timer(kIsRepeating, kIsRepeating) {} // Start the timer to run at the given |delay| from now. If the timer is |