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

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, 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 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 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 ResourceDispatcherHostRequestInfo* info = InfoForRequest(request); 1302 ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
1303 DCHECK(!info->ssl_client_auth_handler()) << 1303 DCHECK(!info->ssl_client_auth_handler()) <<
1304 "OnCertificateRequested called with ssl_client_auth_handler pending"; 1304 "OnCertificateRequested called with ssl_client_auth_handler pending";
1305 info->set_ssl_client_auth_handler( 1305 info->set_ssl_client_auth_handler(
1306 new SSLClientAuthHandler(request, cert_request_info)); 1306 new SSLClientAuthHandler(request, cert_request_info));
1307 info->ssl_client_auth_handler()->SelectCertificate(); 1307 info->ssl_client_auth_handler()->SelectCertificate();
1308 } 1308 }
1309 1309
1310 void ResourceDispatcherHost::OnSSLCertificateError( 1310 void ResourceDispatcherHost::OnSSLCertificateError(
1311 net::URLRequest* request, 1311 net::URLRequest* request,
1312 int cert_error, 1312 const net::SSLInfo& ssl_info,
1313 net::X509Certificate* cert) { 1313 bool is_hsts_host) {
1314 DCHECK(request); 1314 DCHECK(request);
1315 SSLManager::OnSSLCertificateError(this, request, cert_error, cert); 1315 SSLManager::OnSSLCertificateError(this, request, ssl_info, is_hsts_host);
1316 } 1316 }
1317 1317
1318 bool ResourceDispatcherHost::CanGetCookies( 1318 bool ResourceDispatcherHost::CanGetCookies(
1319 const net::URLRequest* request, 1319 const net::URLRequest* request,
1320 const net::CookieList& cookie_list) const { 1320 const net::CookieList& cookie_list) const {
1321 VLOG(1) << "OnGetCookies: " << request->url().spec(); 1321 VLOG(1) << "OnGetCookies: " << request->url().spec();
1322 int render_process_id, render_view_id; 1322 int render_process_id, render_view_id;
1323 if (!RenderViewForRequest(request, &render_process_id, &render_view_id)) 1323 if (!RenderViewForRequest(request, &render_process_id, &render_view_id))
1324 return false; 1324 return false;
1325 1325
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
2151 return HTTP_AUTH_RESOURCE_BLOCKED_CROSS; 2151 return HTTP_AUTH_RESOURCE_BLOCKED_CROSS;
2152 } 2152 }
2153 2153
2154 bool ResourceDispatcherHost::allow_cross_origin_auth_prompt() { 2154 bool ResourceDispatcherHost::allow_cross_origin_auth_prompt() {
2155 return allow_cross_origin_auth_prompt_; 2155 return allow_cross_origin_auth_prompt_;
2156 } 2156 }
2157 2157
2158 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) { 2158 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) {
2159 allow_cross_origin_auth_prompt_ = value; 2159 allow_cross_origin_auth_prompt_ = value;
2160 } 2160 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698