diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
| commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
| tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/base/timer/timer.h | |
| parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
| download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz | |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/base/timer/timer.h')
| -rw-r--r-- | chromium/base/timer/timer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/base/timer/timer.h b/chromium/base/timer/timer.h index 7e2c1d41f13..1ef58a3ea0b 100644 --- a/chromium/base/timer/timer.h +++ b/chromium/base/timer/timer.h @@ -89,7 +89,8 @@ class BASE_EXPORT Timer { virtual TimeDelta GetCurrentDelay() const; // Set the task runner on which the task should be scheduled. This method can - // only be called before any tasks have been scheduled. + // only be called before any tasks have been scheduled. The task runner must + // run tasks on the same thread the timer is used on. virtual void SetTaskRunner(scoped_refptr<SingleThreadTaskRunner> task_runner); // Start the timer to run at the given |delay| from now. If the timer is @@ -259,7 +260,7 @@ class DelayTimer : protected Timer { base::Bind(method, base::Unretained(receiver)), false) {} - void Reset() { Timer::Reset(); } + void Reset() override { Timer::Reset(); } }; } // namespace base |