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

Update DevtoolsNetworkTransaction

Browse source
This commit is contained in:
Paul Betts 2016-03-07 22:29:23 -08:00
parent 40c98381ab
commit d204febecf
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
brightray/browser/net/devtools_network_transaction.cc
View file

@ -106,10 +106,11 @@ int DevToolsNetworkTransaction::RestartIgnoringLastError(
int DevToolsNetworkTransaction::RestartWithCertificate( int DevToolsNetworkTransaction::RestartWithCertificate(
net::X509Certificate* client_certificate, net::X509Certificate* client_certificate,
net::SSLPrivateKey* client_private_key,
const net::CompletionCallback& callback) { const net::CompletionCallback& callback) {
if (failed_) if (failed_)
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
int rv = transaction_->RestartWithCertificate(client_certificate, proxy_callback_); int rv = transaction_->RestartWithCertificate(client_certificate, client_private_key, proxy_callback_);
return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE); return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE);
} }
@ -185,6 +186,11 @@ bool DevToolsNetworkTransaction::GetRemoteEndpoint(
return transaction_->GetRemoteEndpoint(endpoint); return transaction_->GetRemoteEndpoint(endpoint);
} }
void DevToolsNetworkTransaction::PopulateNetErrorDetails(
net::NetErrorDetails* details) const {
return transaction_->PopulateNetErrorDetails(details);
}
void DevToolsNetworkTransaction::SetPriority(net::RequestPriority priority) { void DevToolsNetworkTransaction::SetPriority(net::RequestPriority priority) {
transaction_->SetPriority(priority); transaction_->SetPriority(priority);
} }

2
brightray/browser/net/devtools_network_transaction.h
View file

@ -46,6 +46,7 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
int RestartIgnoringLastError( int RestartIgnoringLastError(
const net::CompletionCallback& callback) override; const net::CompletionCallback& callback) override;
int RestartWithCertificate(net::X509Certificate* client_cert, int RestartWithCertificate(net::X509Certificate* client_cert,
net::SSLPrivateKey* client_private_key,
const net::CompletionCallback& callback) override; const net::CompletionCallback& callback) override;
int RestartWithAuth(const net::AuthCredentials& credentials, int RestartWithAuth(const net::AuthCredentials& credentials,
const net::CompletionCallback& callback) override; const net::CompletionCallback& callback) override;
@ -65,6 +66,7 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
void SetQuicServerInfo(net::QuicServerInfo* quic_server_info) override; void SetQuicServerInfo(net::QuicServerInfo* quic_server_info) override;
bool GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override; bool GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override;
bool GetRemoteEndpoint(net::IPEndPoint* endpoint) const override; bool GetRemoteEndpoint(net::IPEndPoint* endpoint) const override;
void PopulateNetErrorDetails(net::NetErrorDetails* details) const override;
void SetPriority(net::RequestPriority priority) override; void SetPriority(net::RequestPriority priority) override;
void SetWebSocketHandshakeStreamCreateHelper( void SetWebSocketHandshakeStreamCreateHelper(
net::WebSocketHandshakeStreamBase::CreateHelper* create_helper) override; net::WebSocketHandshakeStreamBase::CreateHelper* create_helper) override;