Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3246)

Unified Diff: chrome/browser/ui/browser.cc

Issue 26938003: Don't prompt to save malicious downloads on exit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unneeded code Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 799f03cceb2eb21a405d876e139a27fe86ebb60c..e56c71d2a30a06fa29489ca505fd0d4d5d06f719 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -697,7 +697,8 @@ Browser::DownloadClosePreventionType Browser::OkToCloseWithInProgressDownloads(
if (!g_browser_process->profile_manager())
return DOWNLOAD_CLOSE_OK;
- int total_download_count = DownloadService::DownloadCountAllProfiles();
+ int total_download_count =
+ DownloadService::NonMaliciousDownloadCountAllProfiles();
if (total_download_count == 0)
return DOWNLOAD_CLOSE_OK; // No downloads; can definitely close.
@@ -731,9 +732,9 @@ Browser::DownloadClosePreventionType Browser::OkToCloseWithInProgressDownloads(
DownloadService* download_service =
DownloadServiceFactory::GetForBrowserContext(profile());
if ((profile_window_count == 0) &&
- (download_service->DownloadCount() > 0) &&
+ (download_service->NonMaliciousDownloadCount() > 0) &&
profile()->IsOffTheRecord()) {
- *num_downloads_blocking = download_service->DownloadCount();
+ *num_downloads_blocking = download_service->NonMaliciousDownloadCount();
return DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE;
}
« no previous file with comments | « chrome/browser/lifetime/browser_close_manager_browsertest.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698