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

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

Powered by Google App Engine
This is Rietveld 408576698