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

Side by Side Diff: content/browser/loader/resource_loader.cc

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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 "content/browser/loader/resource_loader.h" 5 #include "content/browser/loader/resource_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 net::URLRequest* unused, 292 net::URLRequest* unused,
293 net::SSLCertRequestInfo* cert_info) { 293 net::SSLCertRequestInfo* cert_info) {
294 DCHECK_EQ(request_.get(), unused); 294 DCHECK_EQ(request_.get(), unused);
295 295
296 if (!delegate_->AcceptSSLClientCertificateRequest(this, cert_info)) { 296 if (!delegate_->AcceptSSLClientCertificateRequest(this, cert_info)) {
297 request_->Cancel(); 297 request_->Cancel();
298 return; 298 return;
299 } 299 }
300 300
301 #if !defined(USE_OPENSSL) 301 #if !defined(USE_OPENSSL)
302 // XXX
302 client_cert_store_->GetClientCerts(*cert_info, &cert_info->client_certs); 303 client_cert_store_->GetClientCerts(*cert_info, &cert_info->client_certs);
303 if (cert_info->client_certs.empty()) { 304 if (cert_info->client_certs.empty()) {
304 // No need to query the user if there are no certs to choose from. 305 // No need to query the user if there are no certs to choose from.
305 request_->ContinueWithCertificate(NULL); 306 request_->ContinueWithCertificate(NULL);
306 return; 307 return;
307 } 308 }
308 #endif 309 #endif
309 310
310 DCHECK(!ssl_client_auth_handler_.get()) 311 DCHECK(!ssl_client_auth_handler_.get())
311 << "OnCertificateRequested called with ssl_client_auth_handler pending"; 312 << "OnCertificateRequested called with ssl_client_auth_handler pending";
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 // we resume. 654 // we resume.
654 deferred_stage_ = DEFERRED_FINISH; 655 deferred_stage_ = DEFERRED_FINISH;
655 } 656 }
656 } 657 }
657 658
658 void ResourceLoader::CallDidFinishLoading() { 659 void ResourceLoader::CallDidFinishLoading() {
659 delegate_->DidFinishLoading(this); 660 delegate_->DidFinishLoading(this);
660 } 661 }
661 662
662 } // namespace content 663 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698