summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 01:38:59 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 01:38:59 +0000
commit400d323d53525a13fbfc47efa8a95c4b13cbccb9 (patch)
treef647ecce497271c180d9e62d88a4fcfb73328dc9 /chrome/renderer
parent95d9e253aeb47ef0004edc29c9a8c442106b9488 (diff)
downloadchromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.zip
chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.gz
chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.bz2
Currently, base/timer.cc calls PostTask with FROM_HERE as the Location, so the original code that created the delayed callback is lost.
This change adds a tracked_objects::Location parameter to the APIs in base/timer.h so we can trace the PostTask callbacks. The other files are touched to add the FROM_HERE Location parameter. Review URL: http://codereview.chromium.org/7812036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/extensions/extension_dispatcher.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index a21cabf..d2f06ef 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -79,7 +79,7 @@ void ExtensionDispatcher::WebKitInitialized() {
// For extensions, we want to ensure we call the IdleHandler every so often,
// even if the extension keeps up activity.
if (is_extension_process_) {
- forced_idle_timer_.Start(
+ forced_idle_timer_.Start(FROM_HERE,
base::TimeDelta::FromSeconds(kMaxExtensionIdleHandlerDelayS),
RenderThread::current(), &RenderThread::IdleHandler);
}
@@ -118,7 +118,7 @@ void ExtensionDispatcher::IdleNotification() {
RenderThread::current()->idle_notification_delay_in_s()),
kMaxExtensionIdleHandlerDelayS);
forced_idle_timer_.Stop();
- forced_idle_timer_.Start(
+ forced_idle_timer_.Start(FROM_HERE,
base::TimeDelta::FromSeconds(forced_delay_s),
RenderThread::current(), &RenderThread::IdleHandler);
}