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

refactor: track downloads by guid (#45718)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2025-02-20 08:17:18 +01:00 • committed by GitHub
parent b63be7b5c7
commit 8ea1f5b604
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/electron_download_manager_delegate.cc
View file

@ -218,13 +218,13 @@ void ElectronDownloadManagerDelegate::GetItemSaveDialogOptions(
} }
void ElectronDownloadManagerDelegate::OnDownloadPathGenerated( void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
uint32_t download_id, const std::string& download_guid,
download::DownloadTargetCallback callback, download::DownloadTargetCallback callback,
const base::FilePath& default_path) { const base::FilePath& default_path) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
ScopedAllowBlockingForElectron allow_blocking; ScopedAllowBlockingForElectron allow_blocking;
auto* item = download_manager_->GetDownload(download_id); auto* item = download_manager_->GetDownloadByGuid(download_guid);
if (!item) if (!item)
return; return;
@ -269,7 +269,7 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
gin_helper::Promise<gin_helper::Dictionary> dialog_promise(isolate); gin_helper::Promise<gin_helper::Dictionary> dialog_promise(isolate);
auto dialog_callback = base::BindOnce( auto dialog_callback = base::BindOnce(
&ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone, &ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone,
base::Unretained(this), download_id, std::move(callback)); base::Unretained(this), download_guid, std::move(callback));
std::ignore = dialog_promise.Then(std::move(dialog_callback)); std::ignore = dialog_promise.Then(std::move(dialog_callback));
file_dialog::ShowSaveDialog(settings, std::move(dialog_promise)); file_dialog::ShowSaveDialog(settings, std::move(dialog_promise));
@ -286,12 +286,12 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
} }
void ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone( void ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone(
uint32_t download_id, const std::string& download_guid,
download::DownloadTargetCallback download_callback, download::DownloadTargetCallback download_callback,
gin_helper::Dictionary result) { gin_helper::Dictionary result) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
auto* item = download_manager_->GetDownload(download_id); auto* item = download_manager_->GetDownloadByGuid(download_guid);
if (!item) if (!item)
return; return;
@ -370,7 +370,7 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
download->GetSuggestedFilename(), download->GetMimeType(), download->GetSuggestedFilename(), download->GetMimeType(),
last_saved_directory_, default_download_path), last_saved_directory_, default_download_path),
base::BindOnce(&ElectronDownloadManagerDelegate::OnDownloadPathGenerated, base::BindOnce(&ElectronDownloadManagerDelegate::OnDownloadPathGenerated,
weak_ptr_factory_.GetWeakPtr(), download->GetId(), weak_ptr_factory_.GetWeakPtr(), download->GetGuid(),
std::move(*callback))); std::move(*callback)));
return true; return true;
} }

4
shell/browser/electron_download_manager_delegate.h
View file

@ -48,12 +48,12 @@ class ElectronDownloadManagerDelegate
void GetItemSaveDialogOptions(download::DownloadItem* item, void GetItemSaveDialogOptions(download::DownloadItem* item,
file_dialog::DialogSettings* options); file_dialog::DialogSettings* options);
void OnDownloadPathGenerated(uint32_t download_id, void OnDownloadPathGenerated(const std::string& download_guid,
download::DownloadTargetCallback callback, download::DownloadTargetCallback callback,
const base::FilePath& default_path); const base::FilePath& default_path);
void OnDownloadSaveDialogDone( void OnDownloadSaveDialogDone(
uint32_t download_id, const std::string& download_guid,
download::DownloadTargetCallback download_callback, download::DownloadTargetCallback download_callback,
gin_helper::Dictionary result); gin_helper::Dictionary result);