diff options
author | Torne (Richard Coles) <torne@google.com> | 2013-10-22 16:41:35 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2013-10-22 16:41:35 +0100 |
commit | 8bcbed890bc3ce4d7a057a8f32cab53fa534672e (patch) | |
tree | 1390b6675d21328859f01f50203d9bde09105298 /content/browser/download/download_manager_impl.cc | |
parent | 116fa16b45c9efe30e785b9fc32f09780ca23bec (diff) | |
download | chromium_org-8bcbed890bc3ce4d7a057a8f32cab53fa534672e.tar.gz |
Merge from Chromium at DEPS revision 230120
This commit was generated by merge_to_master.py.
Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
Diffstat (limited to 'content/browser/download/download_manager_impl.cc')
-rw-r--r-- | content/browser/download/download_manager_impl.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index ad60f8660e..c5c3b367ee 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -673,6 +673,20 @@ int DownloadManagerImpl::InProgressCount() const { return count; } +int DownloadManagerImpl::NonMaliciousInProgressCount() const { + int count = 0; + for (DownloadMap::const_iterator it = downloads_.begin(); + it != downloads_.end(); ++it) { + if (it->second->GetState() == DownloadItem::IN_PROGRESS && + it->second->GetDangerType() != DOWNLOAD_DANGER_TYPE_DANGEROUS_URL && + it->second->GetDangerType() != DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT && + it->second->GetDangerType() != DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST) { + ++count; + } + } + return count; +} + DownloadItem* DownloadManagerImpl::GetDownload(uint32 download_id) { return ContainsKey(downloads_, download_id) ? downloads_[download_id] : NULL; } |