summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
commit6fd550bdd8d9ad83330bed01efa25d801379e9f9 (patch)
tree6e8031e453ffeb9e192f1eafbf18ea8d4c54657c /content/browser
parentdd8d12a86e01b35b76f4add67cf5e222a475662b (diff)
downloadchromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.zip
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.gz
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.bz2
Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location,
so the original code that created the delayed callback is lost." This reverts commit 4cf5cf73d319b69c32ad30af8954235755856455. (r99284) TBR=jbates@chromium.org Review URL: http://codereview.chromium.org/7825026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/download/download_file_manager.cc3
-rw-r--r--content/browser/download/download_item.cc3
-rw-r--r--content/browser/download/download_resource_handler.cc3
-rw-r--r--content/browser/net/url_request_slow_http_job.cc2
-rw-r--r--content/browser/renderer_host/browser_render_process_host.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host.cc2
-rw-r--r--content/browser/renderer_host/resource_dispatcher_host.cc2
7 files changed, 7 insertions, 10 deletions
diff --git a/content/browser/download/download_file_manager.cc b/content/browser/download/download_file_manager.cc
index 0df8a3f..f21c67b1 100644
--- a/content/browser/download/download_file_manager.cc
+++ b/content/browser/download/download_file_manager.cc
@@ -88,8 +88,7 @@ DownloadFile* DownloadFileManager::GetDownloadFile(int id) {
void DownloadFileManager::StartUpdateTimer() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
if (!update_timer_.IsRunning()) {
- update_timer_.Start(FROM_HERE,
- base::TimeDelta::FromMilliseconds(kUpdatePeriodMs),
+ update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdatePeriodMs),
this, &DownloadFileManager::UpdateInProgressDownloads);
}
}
diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc
index fa6c436..eefb8dd 100644
--- a/content/browser/download/download_item.cc
+++ b/content/browser/download/download_item.cc
@@ -325,8 +325,7 @@ void DownloadItem::StartProgressTimer() {
// TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- update_timer_.Start(FROM_HERE,
- base::TimeDelta::FromMilliseconds(kUpdateTimeMs), this,
+ update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdateTimeMs), this,
&DownloadItem::UpdateObservers);
}
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index 003a34e..5846c63 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -238,8 +238,7 @@ DownloadResourceHandler::~DownloadResourceHandler() {
void DownloadResourceHandler::StartPauseTimer() {
if (!pause_timer_.IsRunning())
- pause_timer_.Start(FROM_HERE,
- base::TimeDelta::FromMilliseconds(kThrottleTimeMs), this,
+ pause_timer_.Start(base::TimeDelta::FromMilliseconds(kThrottleTimeMs), this,
&DownloadResourceHandler::CheckWriteProgress);
}
diff --git a/content/browser/net/url_request_slow_http_job.cc b/content/browser/net/url_request_slow_http_job.cc
index 3f1a6b6..398298f 100644
--- a/content/browser/net/url_request_slow_http_job.cc
+++ b/content/browser/net/url_request_slow_http_job.cc
@@ -50,7 +50,7 @@ URLRequestSlowHTTPJob::URLRequestSlowHTTPJob(net::URLRequest* request,
: URLRequestMockHTTPJob(request, file_path) { }
void URLRequestSlowHTTPJob::Start() {
- delay_timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(kDelayMs), this,
+ delay_timer_.Start(TimeDelta::FromMilliseconds(kDelayMs), this,
&URLRequestSlowHTTPJob::RealStart);
}
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 29b3e86..51f7b5c 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -185,7 +185,7 @@ BrowserRenderProcessHost::BrowserRenderProcessHost(
visible_widgets_(0),
backgrounded_(true),
ALLOW_THIS_IN_INITIALIZER_LIST(cached_dibs_cleaner_(
- FROM_HERE, base::TimeDelta::FromSeconds(5),
+ base::TimeDelta::FromSeconds(5),
this, &BrowserRenderProcessHost::ClearTransportDIBCache)),
accessibility_enabled_(false),
is_initialized_(false) {
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index e370fe4..2a506d0 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -482,7 +482,7 @@ void RenderWidgetHost::StartHangMonitorTimeout(TimeDelta delay) {
// fire sooner.
time_when_considered_hung_ = Time::Now() + delay;
hung_renderer_timer_.Stop();
- hung_renderer_timer_.Start(FROM_HERE, delay, this,
+ hung_renderer_timer_.Start(delay, this,
&RenderWidgetHost::CheckRendererIsUnresponsive);
}
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index d845c8f..cccc121 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -1575,7 +1575,7 @@ void ResourceDispatcherHost::InsertIntoResourceQueue(
// Make sure we have the load state monitor running
if (!update_load_states_timer_.IsRunning()) {
- update_load_states_timer_.Start(FROM_HERE,
+ update_load_states_timer_.Start(
TimeDelta::FromMilliseconds(kUpdateLoadStatesIntervalMsec),
this, &ResourceDispatcherHost::UpdateLoadStates);
}