summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_file_manager.cc4
-rw-r--r--chrome/browser/download/download_manager.cc8
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/download/download_file_manager.cc b/chrome/browser/download/download_file_manager.cc
index 16a0ac7..37640ba 100644
--- a/chrome/browser/download/download_file_manager.cc
+++ b/chrome/browser/download/download_file_manager.cc
@@ -144,8 +144,12 @@ void DownloadFileManager::StartDownload(DownloadCreateInfo* info) {
manager->CreateDownloadItem(info);
+#if defined(ENABLE_SAFE_BROWSING)
bool hash_needed = g_browser_process->safe_browsing_service()->
DownloadBinHashNeeded();
+#else
+ bool hash_needed = false;
+#endif
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
NewRunnableMethod(this, &DownloadFileManager::CreateDownloadFile,
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 01a0e69..c61912a 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -266,12 +266,16 @@ void DownloadManager::StartDownload(int32 download_id) {
if (!download)
return;
+#if defined(ENABLE_SAFE_BROWSING)
// Create a client to verify download URL with safebrowsing.
// It deletes itself after the callback.
scoped_refptr<DownloadSBClient> sb_client = new DownloadSBClient(
download_id, download->url_chain(), download->referrer_url());
sb_client->CheckDownloadUrl(
NewCallback(this, &DownloadManager::CheckDownloadUrlDone));
+#else
+ CheckDownloadUrlDone(download_id, false);
+#endif
}
void DownloadManager::CheckForHistoryFilesRemoval() {
@@ -665,12 +669,16 @@ void DownloadManager::OnAllDataSaved(int32 download_id,
// or there is error while it is calculated. We will skip the download hash
// check in that case.
if (!hash.empty()) {
+#if defined(ENABLE_SAFE_BROWSING)
scoped_refptr<DownloadSBClient> sb_client =
new DownloadSBClient(download_id,
download->url_chain(),
download->referrer_url());
sb_client->CheckDownloadHash(
hash, NewCallback(this, &DownloadManager::CheckDownloadHashDone));
+#else
+ CheckDownloadHashDone(download_id, false);
+#endif
}
MaybeCompleteDownload(download);
}