Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(361)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/loader/resource_loader.cc

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ssl/ssl_client_auth_observer.cc ('K') | « content/browser/loader/resource_loader.h ('k') | content/browser/loader/resource_loader_unittest.cc » ('j') | content/browser/loader/resource_loader_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 64f5e7b341ba6c365ebe3e2d7af950448fb0bd83..1b75cff2b03267481b9a185e69555a30a31bc3bb 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -416,10 +416,11 @@ void ResourceLoader::ContinueSSLRequest() {
request_->ContinueDespiteLastError();
}
-void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) {
+void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert,
+ net::SSLPrivateKey* pkey) {
DCHECK(ssl_client_auth_handler_);
ssl_client_auth_handler_.reset();
- request_->ContinueWithCertificate(cert);
+ request_->ContinueWithCertificate(cert, pkey);
}
void ResourceLoader::CancelCertificateSelection() {
« chrome/browser/ssl/ssl_client_auth_observer.cc ('K') | « content/browser/loader/resource_loader.h ('k') | content/browser/loader/resource_loader_unittest.cc » ('j') | content/browser/loader/resource_loader_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698