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

Side by Side Diff: net/url_request/url_request.cc

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing unused function in Android. Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/url_request/url_request.h" 5 #include "net/url_request/url_request.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 job_->SetAuth(credentials); 841 job_->SetAuth(credentials);
842 } 842 }
843 843
844 void URLRequest::CancelAuth() { 844 void URLRequest::CancelAuth() {
845 DCHECK(job_.get()); 845 DCHECK(job_.get());
846 DCHECK(job_->NeedsAuth()); 846 DCHECK(job_->NeedsAuth());
847 847
848 job_->CancelAuth(); 848 job_->CancelAuth();
849 } 849 }
850 850
851 void URLRequest::ContinueWithCertificate(X509Certificate* client_cert) { 851 void URLRequest::ContinueWithCertificate(X509Certificate* client_cert,
852 SSLPrivateKey* client_private_key) {
852 DCHECK(job_.get()); 853 DCHECK(job_.get());
853 854
854 job_->ContinueWithCertificate(client_cert); 855 job_->ContinueWithCertificate(client_cert, client_private_key);
855 } 856 }
856 857
857 void URLRequest::ContinueDespiteLastError() { 858 void URLRequest::ContinueDespiteLastError() {
858 DCHECK(job_.get()); 859 DCHECK(job_.get());
859 860
860 job_->ContinueDespiteLastError(); 861 job_->ContinueDespiteLastError();
861 } 862 }
862 863
863 void URLRequest::PrepareToRestart() { 864 void URLRequest::PrepareToRestart() {
864 DCHECK(job_.get()); 865 DCHECK(job_.get());
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 } 1197 }
1197 1198
1198 void URLRequest::GetConnectionAttempts(ConnectionAttempts* out) const { 1199 void URLRequest::GetConnectionAttempts(ConnectionAttempts* out) const {
1199 if (job_) 1200 if (job_)
1200 job_->GetConnectionAttempts(out); 1201 job_->GetConnectionAttempts(out);
1201 else 1202 else
1202 out->clear(); 1203 out->clear();
1203 } 1204 }
1204 1205
1205 } // namespace net 1206 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698