summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-03 21:50:42 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-03 21:50:42 +0000
commitbe18e1585c52880ceb0a15a3260a579a2b06cbeb (patch)
tree719296a45edd1140171dd31b200d9e336215fabc /chrome/browser/download
parent51a0bb591440055191f7dd5ca1077238369b57bd (diff)
downloadchromium_src-be18e1585c52880ceb0a15a3260a579a2b06cbeb.zip
chromium_src-be18e1585c52880ceb0a15a3260a579a2b06cbeb.tar.gz
chromium_src-be18e1585c52880ceb0a15a3260a579a2b06cbeb.tar.bz2
Force web_origin to be present only on extension gallery installs. For
non-gallery installs, use the download URL as origin. BUG=40848 Review URL: http://codereview.chromium.org/2517001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_manager.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index dbc3a11..71b6ea6 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -1467,9 +1467,11 @@ void DownloadManager::OpenChromeExtension(const FilePath& full_path,
if (UserScript::HasUserScriptFileExtension(download_url)) {
installer->InstallUserScript(full_path, download_url);
} else {
+ bool is_gallery_download =
+ ExtensionsService::IsDownloadFromGallery(download_url, referrer_url);
installer->set_allow_privilege_increase(true);
installer->set_original_url(download_url);
- installer->set_force_web_origin_to_download_url(true);
+ installer->set_force_web_origin_to_download_url(!is_gallery_download);
installer->InstallCrx(full_path);
}
} else {