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

net::FtpProtocolHandler has changed its constructor

Browse source
This commit is contained in:
Cheng Zhao 2017-01-24 14:33:21 +09:00 committed by Kevin Sawicki
parent 5162905fe4
commit 5cf2873b77
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,7 +255,7 @@ class ResolveProxyHelper {
// Start the request. // Start the request.
int result = proxy_service->ResolveProxy( int result = proxy_service->ResolveProxy(
url, "GET", &proxy_info_, completion_callback, &pac_req_, nullptr, url, "GET", &proxy_info_, completion_callback, &pac_req_, nullptr,
net::BoundNetLog()); net::NetLogWithSource());
// Completed synchronously. // Completed synchronously.
if (result != net::ERR_IO_PENDING) if (result != net::ERR_IO_PENDING)

3
atom/browser/atom_browser_context.cc
View file

@ -155,8 +155,7 @@ AtomBrowserContext::CreateURLRequestJobFactory(
url_request_context_getter()->GetURLRequestContext()->host_resolver(); url_request_context_getter()->GetURLRequestContext()->host_resolver();
job_factory->SetProtocolHandler( job_factory->SetProtocolHandler(
url::kFtpScheme, url::kFtpScheme,
base::WrapUnique(new net::FtpProtocolHandler( net::FtpProtocolHandler::Create(host_resolver));
new net::FtpNetworkLayer(host_resolver))));
return std::move(job_factory); return std::move(job_factory);
} }