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

Unified Diff: chrome/browser/download/download_util.cc

Issue 6324020: Tweak the auto-open algorithm to permit JNLP to auto-open iff the user has... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
« no previous file with comments | « chrome/browser/download/download_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_util.cc
===================================================================
--- chrome/browser/download/download_util.cc (revision 72765)
+++ chrome/browser/download/download_util.cc (working copy)
@@ -762,24 +762,25 @@
}
// TODO(erikkay,phajdan.jr): This is apparently not being exercised in tests.
-bool IsDangerous(DownloadCreateInfo* info, Profile* profile) {
+bool IsDangerous(DownloadCreateInfo* info, Profile* profile, bool auto_open) {
DownloadDangerLevel danger_level = GetFileDangerLevel(
info->suggested_path.BaseName());
+ bool ret = false;
if (danger_level == Dangerous) {
- return true;
+ ret = !(auto_open && info->has_user_gesture);
} else if (danger_level == AllowOnUserGesture && !info->has_user_gesture) {
- return true;
+ ret = true;
} else if (info->is_extension_install) {
ExtensionService* service = profile->GetExtensionService();
if (!service ||
!service->IsDownloadFromGallery(info->url, info->referrer_url)) {
// Extensions that are not from the gallery are considered dangerous.
- return true;
+ ret = true;
}
}
- return false;
+ return ret;
}
} // namespace download_util
« no previous file with comments | « chrome/browser/download/download_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698