summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 21:26:42 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 21:26:42 +0000
commit9840dd700990d0f5385e8320719d0fcba3a5c68a (patch)
treef9442642064b6fda9526d7853057b05e629e219e /chrome
parente0749fddf70f0edfa7363ceda0156be0d3c72b7e (diff)
downloadchromium_src-9840dd700990d0f5385e8320719d0fcba3a5c68a.zip
chromium_src-9840dd700990d0f5385e8320719d0fcba3a5c68a.tar.gz
chromium_src-9840dd700990d0f5385e8320719d0fcba3a5c68a.tar.bz2
Move extension install to after .crx download completes
This was resulting in some situations where we attempted to unpack the .crx while its file was still in use by the download manager. BUG=15881 R=mpcomplete Review URL: http://codereview.chromium.org/149161 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/download/download_manager.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 7cceb9e..2f3497e 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -820,8 +820,6 @@ void DownloadManager::DownloadFinished(int32 download_id, int64 size) {
void DownloadManager::DownloadRenamedToFinalName(int download_id,
const FilePath& full_path) {
- if (Extension::IsExtension(full_path))
- OpenChromeExtension(full_path);
}
void DownloadManager::ContinueDownloadFinished(DownloadItem* download) {
@@ -840,8 +838,7 @@ void DownloadManager::ContinueDownloadFinished(DownloadItem* download) {
// Handle chrome extensions explicitly and skip the shell execute.
if (Extension::IsExtension(download->full_path())) {
- // Skip the shell execute. This will be handled in
- // DownloadRenamedToFinalName
+ OpenChromeExtension(download->full_path());
return;
}