diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-05 01:16:12 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-05 01:16:12 +0000 |
commit | 89ea2c981c728cee386b5353e78ab9a6d4077742 (patch) | |
tree | ba552bdc81b21e8f1ff47ddd0b38cb56c8b9770a | |
parent | 9e787427c670dce852a189de1c572c2d52a6db75 (diff) | |
download | chromium_src-89ea2c981c728cee386b5353e78ab9a6d4077742.zip chromium_src-89ea2c981c728cee386b5353e78ab9a6d4077742.tar.gz chromium_src-89ea2c981c728cee386b5353e78ab9a6d4077742.tar.bz2 |
Just return, don't use temps.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6611033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77011 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/download/download_util.cc | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 292362e..2c1ef77 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -822,22 +822,18 @@ FilePath GetCrDownloadPath(const FilePath& suggested_path) { bool IsDangerous(DownloadCreateInfo* info, Profile* profile, bool auto_open) { DownloadDangerLevel danger_level = GetFileDangerLevel( info->suggested_path.BaseName()); - - bool ret = false; - if (danger_level == Dangerous) { - ret = !(auto_open && info->has_user_gesture); - } else if (danger_level == AllowOnUserGesture && !info->has_user_gesture) { - ret = true; - } else if (info->is_extension_install) { + if (danger_level == Dangerous) + return !(auto_open && info->has_user_gesture); + if (danger_level == AllowOnUserGesture && !info->has_user_gesture) + return true; + if (info->is_extension_install) { + // Extensions that are not from the gallery are considered dangerous. ExtensionService* service = profile->GetExtensionService(); if (!service || - !service->IsDownloadFromGallery(info->url, info->referrer_url)) { - // Extensions that are not from the gallery are considered dangerous. - ret = true; - } + !service->IsDownloadFromGallery(info->url, info->referrer_url)) + return true; } - - return ret; + return false; } } // namespace download_util |