summaryrefslogtreecommitdiffstats
path: root/extensions/renderer
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-09-24 00:53:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-24 07:53:38 +0000
commit8c3eb804c56b7173f00e58e040f47fe867dabda7 (patch)
tree3dee4211092c1942e4eaf24684f3255cfddd9e34 /extensions/renderer
parentf7033f79311149ae641bcaa3986c753f60f1db7e (diff)
downloadchromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.zip
chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.gz
chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.bz2
base: Template methods on Timer classes instead of the classes themselves.
The base class for OneShotTimer and DelayedTimer is templated but only the Start method needs to be (which has a TODO to make it go away entirely too). The DelayedTimer class is also templated but only its constructor needs to be, and the type can be inferred at the callsite, so less typing all around. R=thakis@chromium.org TBR=sky,brettw BUG=148832 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1355063004 Cr-Commit-Position: refs/heads/master@{#350496}
Diffstat (limited to 'extensions/renderer')
-rw-r--r--extensions/renderer/dispatcher.cc2
-rw-r--r--extensions/renderer/dispatcher.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index d69eb59..9530a8e 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -902,7 +902,7 @@ void Dispatcher::WebKitInitialized() {
// For extensions, we want to ensure we call the IdleHandler every so often,
// even if the extension keeps up activity.
if (set_idle_notifications_) {
- forced_idle_timer_.reset(new base::RepeatingTimer<RenderThread>);
+ forced_idle_timer_.reset(new base::RepeatingTimer);
forced_idle_timer_->Start(
FROM_HERE,
base::TimeDelta::FromMilliseconds(kMaxExtensionIdleHandlerDelayMs),
diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h
index 5d6bb6ad..43d7071 100644
--- a/extensions/renderer/dispatcher.h
+++ b/extensions/renderer/dispatcher.h
@@ -271,7 +271,7 @@ class Dispatcher : public content::RenderProcessObserver,
// Same as above, but on a longer timer and will run even if the process is
// not idle, to ensure that IdleHandle gets called eventually.
- scoped_ptr<base::RepeatingTimer<content::RenderThread> > forced_idle_timer_;
+ scoped_ptr<base::RepeatingTimer> forced_idle_timer_;
// The extensions and apps that are active in this process.
ExtensionIdSet active_extension_ids_;