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

chore: bump chromium to b243c83a66a7fded00f3408107778 (master) (#21827)

Browse source 
Co-authored-by: Robo <hop2deep@gmail.com>
This commit is contained in:
Electron Bot 2020-01-21 09:39:37 -08:00 • committed by Jeremy Apthorp
parent 34baa02c28
commit dc97fe0640
29 changed files with 112 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

11
shell/browser/atom_download_manager_delegate.cc
View file

@ -134,7 +134,8 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
} else {
std::move(callback).Run(path,
download::DownloadItem::TARGET_DISPOSITION_PROMPT,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
item->GetMixedContentStatus(), path,
download::DOWNLOAD_INTERRUPT_REASON_NONE);
}
}
@ -180,8 +181,8 @@ void AtomDownloadManagerDelegate::OnDownloadSaveDialogDone(
: download::DOWNLOAD_INTERRUPT_REASON_NONE;
std::move(download_callback)
.Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
interrupt_reason);
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
item->GetMixedContentStatus(), path, interrupt_reason);
}
void AtomDownloadManagerDelegate::Shutdown() {
@ -199,6 +200,7 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
download->GetForcedFilePath(),
download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
download::DownloadItem::MixedContentStatus::UNKNOWN,
download->GetForcedFilePath(),
download::DOWNLOAD_INTERRUPT_REASON_NONE);
return true;
@ -210,7 +212,8 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
if (!save_path.empty()) {
std::move(*callback).Run(
save_path, download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, save_path,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
download::DownloadItem::MixedContentStatus::UNKNOWN, save_path,
download::DOWNLOAD_INTERRUPT_REASON_NONE);
return true;
}