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

Side by Side Diff: content/browser/renderer_host/resource_dispatcher_host.cc

Issue 7976036: net: make HSTS hosts use the normal SSL interstitials (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/renderer_host/resource_dispatcher_host.h" 7 #include "content/browser/renderer_host/resource_dispatcher_host.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 ResourceDispatcherHostRequestInfo* info = InfoForRequest(request); 1299 ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
1300 DCHECK(!info->ssl_client_auth_handler()) << 1300 DCHECK(!info->ssl_client_auth_handler()) <<
1301 "OnCertificateRequested called with ssl_client_auth_handler pending"; 1301 "OnCertificateRequested called with ssl_client_auth_handler pending";
1302 info->set_ssl_client_auth_handler( 1302 info->set_ssl_client_auth_handler(
1303 new SSLClientAuthHandler(request, cert_request_info)); 1303 new SSLClientAuthHandler(request, cert_request_info));
1304 info->ssl_client_auth_handler()->SelectCertificate(); 1304 info->ssl_client_auth_handler()->SelectCertificate();
1305 } 1305 }
1306 1306
1307 void ResourceDispatcherHost::OnSSLCertificateError( 1307 void ResourceDispatcherHost::OnSSLCertificateError(
1308 net::URLRequest* request, 1308 net::URLRequest* request,
1309 int cert_error, 1309 const net::SSLInfo& ssl_info,
1310 net::X509Certificate* cert) { 1310 bool is_hsts_host) {
1311 DCHECK(request); 1311 DCHECK(request);
1312 SSLManager::OnSSLCertificateError(this, request, cert_error, cert); 1312 SSLManager::OnSSLCertificateError(this, request, ssl_info, is_hsts_host);
1313 } 1313 }
1314 1314
1315 bool ResourceDispatcherHost::CanGetCookies( 1315 bool ResourceDispatcherHost::CanGetCookies(
1316 const net::URLRequest* request, 1316 const net::URLRequest* request,
1317 const net::CookieList& cookie_list) const { 1317 const net::CookieList& cookie_list) const {
1318 VLOG(1) << "OnGetCookies: " << request->url().spec(); 1318 VLOG(1) << "OnGetCookies: " << request->url().spec();
1319 int render_process_id, render_view_id; 1319 int render_process_id, render_view_id;
1320 if (!RenderViewForRequest(request, &render_process_id, &render_view_id)) 1320 if (!RenderViewForRequest(request, &render_process_id, &render_view_id))
1321 return false; 1321 return false;
1322 1322
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 return HTTP_AUTH_RESOURCE_BLOCKED_CROSS; 2148 return HTTP_AUTH_RESOURCE_BLOCKED_CROSS;
2149 } 2149 }
2150 2150
2151 bool ResourceDispatcherHost::allow_cross_origin_auth_prompt() { 2151 bool ResourceDispatcherHost::allow_cross_origin_auth_prompt() {
2152 return allow_cross_origin_auth_prompt_; 2152 return allow_cross_origin_auth_prompt_;
2153 } 2153 }
2154 2154
2155 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) { 2155 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) {
2156 allow_cross_origin_auth_prompt_ = value; 2156 allow_cross_origin_auth_prompt_ = value;
2157 } 2157 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/resource_dispatcher_host.h ('k') | content/browser/ssl/ssl_cert_error_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698