summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/webstore_installer.cc
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-06 21:18:12 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-06 21:18:12 +0000
commit49d812e82f892a7d93e43a667dc2cb40164bc21e (patch)
tree01a6094be3e3957fe7524cdc9776f93565f0b14d /chrome/browser/extensions/webstore_installer.cc
parentddf4216c55613f11562632bf91a10b665d9caecb (diff)
downloadchromium_src-49d812e82f892a7d93e43a667dc2cb40164bc21e.zip
chromium_src-49d812e82f892a7d93e43a667dc2cb40164bc21e.tar.gz
chromium_src-49d812e82f892a7d93e43a667dc2cb40164bc21e.tar.bz2
Merge most instances of DownloadSaveInfo into DownloadUrlParams.
This simplifies the programmatic interface for downloads. R=benjhayden@chromium.org Review URL: https://chromiumcodereview.appspot.com/11338045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/webstore_installer.cc')
-rw-r--r--chrome/browser/extensions/webstore_installer.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
index 9d79692..14b130b 100644
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -349,10 +349,6 @@ void WebstoreInstaller::StartDownload(const FilePath& file) {
return;
}
- scoped_ptr<content::DownloadSaveInfo> save_info(
- new content::DownloadSaveInfo());
- save_info->file_path = file;
-
// The download url for the given extension is contained in |download_url_|.
// We will navigate the current tab to this url to start the download. The
// download system will then pass the crx to the CrxInstaller.
@@ -360,7 +356,8 @@ void WebstoreInstaller::StartDownload(const FilePath& file) {
download_util::INITIATED_BY_WEBSTORE_INSTALLER);
scoped_ptr<DownloadUrlParameters> params(
DownloadUrlParameters::FromWebContents(
- controller_->GetWebContents(), download_url_, save_info.Pass()));
+ controller_->GetWebContents(), download_url_));
+ params->set_file_path(file);
if (controller_->GetActiveEntry())
params->set_referrer(
content::Referrer(controller_->GetActiveEntry()->GetURL(),