summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-22 22:37:37 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-22 22:37:37 +0000
commitc79a0c090700d657001b9366ecbc0969739ddf75 (patch)
tree65329c54ebe608986fa8e0eec2015c0e5b4258b1
parent62cfbad7377b4db2497fec6e88821a36a1b767fe (diff)
downloadchromium_src-c79a0c090700d657001b9366ecbc0969739ddf75.zip
chromium_src-c79a0c090700d657001b9366ecbc0969739ddf75.tar.gz
chromium_src-c79a0c090700d657001b9366ecbc0969739ddf75.tar.bz2
Get rid of debug assert I accidently added in r97506, since ContentBrowserClient::GetResourceDispatcherHost should only be called on the UI thread.
BUG=82782 Review URL: http://codereview.chromium.org/7711012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97757 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/download/download_manager.cc20
1 files changed, 8 insertions, 12 deletions
diff --git a/content/browser/download/download_manager.cc b/content/browser/download/download_manager.cc
index 1e20f1a..dd856ef 100644
--- a/content/browser/download/download_manager.cc
+++ b/content/browser/download/download_manager.cc
@@ -15,7 +15,6 @@
#include "build/build_config.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/history/download_history_info.h"
-#include "chrome/browser/profiles/profile.h"
#include "content/browser/browser_context.h"
#include "content/browser/browser_thread.h"
#include "content/browser/content_browser_client.h"
@@ -37,19 +36,13 @@ void BeginDownload(
const GURL& url,
const GURL& referrer,
const DownloadSaveInfo& save_info,
- int render_process_host_id,
+ ResourceDispatcherHost* resource_dispatcher_host,
+ int render_process_id,
int render_view_id,
const content::ResourceContext* context) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
- content::GetContentClient()->browser()->GetResourceDispatcherHost()->
- BeginDownload(url,
- referrer,
- save_info,
- true, // Show "Save as" UI.
- render_process_host_id,
- render_view_id,
- *context);
+ resource_dispatcher_host->BeginDownload(
+ url, referrer, save_info, true, render_process_id, render_view_id,
+ *context);
}
} // namespace
@@ -684,6 +677,8 @@ void DownloadManager::DownloadUrlToFile(const GURL& url,
const DownloadSaveInfo& save_info,
TabContents* tab_contents) {
DCHECK(tab_contents);
+ ResourceDispatcherHost* resource_dispatcher_host =
+ content::GetContentClient()->browser()->GetResourceDispatcherHost();
// We send a pointer to content::ResourceContext, instead of the usual
// reference, so that a copy of the object isn't made.
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
@@ -691,6 +686,7 @@ void DownloadManager::DownloadUrlToFile(const GURL& url,
url,
referrer,
save_info,
+ resource_dispatcher_host,
tab_contents->GetRenderProcessHost()->id(),
tab_contents->render_view_host()->routing_id(),
&tab_contents->browser_context()->