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

Merge pull request #5315 from deepak1556/download_manager_patch

Browse source 
browser: fix some edge cases with download manager
This commit is contained in:
Cheng Zhao 2016-04-28 16:08:22 +09:00
commit 122652a368
4 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_session.cc
View file

@ -9,9 +9,7 @@
#include "atom/browser/api/atom_api_cookies.h" #include "atom/browser/api/atom_api_cookies.h"
#include "atom/browser/api/atom_api_download_item.h" #include "atom/browser/api/atom_api_download_item.h"
#include "atom/browser/api/atom_api_web_contents.h"
#include "atom/browser/api/atom_api_web_request.h" #include "atom/browser/api/atom_api_web_request.h"
#include "atom/browser/api/save_page_handler.h"
#include "atom/browser/atom_browser_context.h" #include "atom/browser/atom_browser_context.h"
#include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/atom_permission_manager.h" #include "atom/browser/atom_permission_manager.h"
@ -306,8 +304,7 @@ Session::~Session() {
void Session::OnDownloadCreated(content::DownloadManager* manager, void Session::OnDownloadCreated(content::DownloadManager* manager,
content::DownloadItem* item) { content::DownloadItem* item) {
auto web_contents = item->GetWebContents(); if (item->IsSavePackageDownload())
if (SavePageHandler::IsSavePageTypes(item->GetMimeType()))
return; return;
v8::Locker locker(isolate()); v8::Locker locker(isolate());
@ -315,7 +312,7 @@ void Session::OnDownloadCreated(content::DownloadManager* manager,
bool prevent_default = Emit( bool prevent_default = Emit(
"will-download", "will-download",
DownloadItem::Create(isolate(), item), DownloadItem::Create(isolate(), item),
api::WebContents::CreateFrom(isolate(), web_contents)); item->GetWebContents());
if (prevent_default) { if (prevent_default) {
item->Cancel(true); item->Cancel(true);
item->Remove(); item->Remove();

5
atom/browser/api/save_page_handler.cc
View file

@ -73,11 +73,6 @@ void SavePageHandler::Destroy(content::DownloadItem* item) {
delete this; delete this;
} }
// static
bool SavePageHandler::IsSavePageTypes(const std::string& type) {
return type == "multipart/related" || type == "text/html";
}
} // namespace api } // namespace api
} // namespace atom } // namespace atom

2
atom/browser/api/save_page_handler.h
View file

@ -37,8 +37,6 @@ class SavePageHandler : public content::DownloadManager::Observer,
bool Handle(const base::FilePath& full_path, bool Handle(const base::FilePath& full_path,
const content::SavePageType& save_type); const content::SavePageType& save_type);
static bool IsSavePageTypes(const std::string& type);
private: private:
void Destroy(content::DownloadItem* item); void Destroy(content::DownloadItem* item);

4
atom/browser/atom_download_manager_delegate.cc
View file

@ -70,7 +70,9 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
return; return;
NativeWindow* window = nullptr; NativeWindow* window = nullptr;
auto relay = NativeWindowRelay::FromWebContents(item->GetWebContents()); content::WebContents* web_contents = item->GetWebContents();
auto relay = web_contents ? NativeWindowRelay::FromWebContents(web_contents)
: nullptr;
if (relay) if (relay)
window = relay->window.get(); window = relay->window.get();