mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Allow emitting 'done' event when user cancel the download saving dialog.

Browse source
This commit is contained in:
Haojian Wu 2015-09-21 14:03:36 +08:00
parent 57bf0cb615
commit 22168bc6d8
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/atom_download_manager_delegate.cc
View file

@ -75,20 +75,24 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
window = relay->window.get();
file_dialog::Filters filters;
base::FilePath path = default_path;
if (open_download_dialog_ &&
!file_dialog::ShowSaveDialog(window, item->GetURL().spec(), default_path,
filters, &path)) {
return;
base::FilePath path;
if (!open_download_dialog_) {
// Use default_path if download dialog is disabled.
path = default_path;
} else {
if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(), default_path,
filters, &path)) {
// Remember the last selected download directory.
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
download_manager_->GetBrowserContext());
browser_context->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
path.DirName());
}
}
if (open_download_dialog_) {
// Remeber the last selected download directory.
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
download_manager_->GetBrowserContext());
browser_context->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
path.DirName());
}
// Running the DownloadTargetCallback with an empty FilePath signals that the
// download should be cancelled.
// If user cancels the file save dialog, run the callback with empty FilePath.
callback.Run(path,
content::DownloadItem::TARGET_DISPOSITION_PROMPT,
content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path);