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

Side by Side Diff: net/url_request/url_request_job.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
« no previous file with comments | « net/url_request/url_request_job.h ('k') | net/url_request/url_request_test_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "net/url_request/url_request_job.h" 5 #include "net/url_request/url_request_job.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 void URLRequestJob::NotifyCertificateRequested( 223 void URLRequestJob::NotifyCertificateRequested(
224 SSLCertRequestInfo* cert_request_info) { 224 SSLCertRequestInfo* cert_request_info) {
225 if (!request_) 225 if (!request_)
226 return; // The request was destroyed, so there is no more work to do. 226 return; // The request was destroyed, so there is no more work to do.
227 227
228 request_->NotifyCertificateRequested(cert_request_info); 228 request_->NotifyCertificateRequested(cert_request_info);
229 } 229 }
230 230
231 void URLRequestJob::NotifySSLCertificateError(int cert_error, 231 void URLRequestJob::NotifySSLCertificateError(const SSLInfo& ssl_info,
232 X509Certificate* cert) { 232 bool is_hsts_host) {
233 if (!request_) 233 if (!request_)
234 return; // The request was destroyed, so there is no more work to do. 234 return; // The request was destroyed, so there is no more work to do.
235 235
236 request_->NotifySSLCertificateError(cert_error, cert); 236 request_->NotifySSLCertificateError(ssl_info, is_hsts_host);
237 } 237 }
238 238
239 bool URLRequestJob::CanGetCookies(const CookieList& cookie_list) const { 239 bool URLRequestJob::CanGetCookies(const CookieList& cookie_list) const {
240 if (!request_) 240 if (!request_)
241 return false; // The request was destroyed, so there is no more work to do. 241 return false; // The request was destroyed, so there is no more work to do.
242 242
243 return request_->CanGetCookies(cookie_list); 243 return request_->CanGetCookies(cookie_list);
244 } 244 }
245 245
246 bool URLRequestJob::CanSetCookie(const std::string& cookie_line, 246 bool URLRequestJob::CanSetCookie(const std::string& cookie_line,
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 } 696 }
697 697
698 bool URLRequestJob::FilterHasData() { 698 bool URLRequestJob::FilterHasData() {
699 return filter_.get() && filter_->stream_data_len(); 699 return filter_.get() && filter_->stream_data_len();
700 } 700 }
701 701
702 void URLRequestJob::UpdatePacketReadTimes() { 702 void URLRequestJob::UpdatePacketReadTimes() {
703 } 703 }
704 704
705 } // namespace net 705 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_job.h ('k') | net/url_request/url_request_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698