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

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

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 5 years 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
« no previous file with comments | « chrome/test/data/ssl/page_with_unsafe_image.html ('k') | content/browser/ssl/ssl_manager.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) 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/location.h" 8 #include "base/location.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/profiler/scoped_tracker.h" 10 #include "base/profiler/scoped_tracker.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 request, &response->head.appcache_id, 108 request, &response->head.appcache_id,
109 &response->head.appcache_manifest_url); 109 &response->head.appcache_manifest_url);
110 if (info->is_load_timing_enabled()) 110 if (info->is_load_timing_enabled())
111 request->GetLoadTimingInfo(&response->head.load_timing); 111 request->GetLoadTimingInfo(&response->head.load_timing);
112 112
113 if (request->ssl_info().cert.get()) { 113 if (request->ssl_info().cert.get()) {
114 SSLStatus ssl_status; 114 SSLStatus ssl_status;
115 GetSSLStatusForRequest(request->url(), request->ssl_info(), 115 GetSSLStatusForRequest(request->url(), request->ssl_info(),
116 info->GetChildID(), &ssl_status); 116 info->GetChildID(), &ssl_status);
117 response->head.security_info = SerializeSecurityInfo(ssl_status); 117 response->head.security_info = SerializeSecurityInfo(ssl_status);
118 response->head.has_major_certificate_errors =
119 net::IsCertStatusError(ssl_status.cert_status) &&
120 !net::IsCertStatusMinorError(ssl_status.cert_status);
121 } else { 118 } else {
122 // We should not have any SSL state. 119 // We should not have any SSL state.
123 DCHECK(!request->ssl_info().cert_status); 120 DCHECK(!request->ssl_info().cert_status);
124 DCHECK_EQ(request->ssl_info().security_bits, -1); 121 DCHECK_EQ(request->ssl_info().security_bits, -1);
125 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); 122 DCHECK_EQ(request->ssl_info().key_exchange_info, 0);
126 DCHECK(!request->ssl_info().connection_status); 123 DCHECK(!request->ssl_info().connection_status);
127 } 124 }
128 } 125 }
129 126
130 } // namespace 127 } // namespace
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 case net::URLRequestStatus::FAILED: 705 case net::URLRequestStatus::FAILED:
709 status = STATUS_UNDEFINED; 706 status = STATUS_UNDEFINED;
710 break; 707 break;
711 } 708 }
712 709
713 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); 710 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
714 } 711 }
715 } 712 }
716 713
717 } // namespace content 714 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/data/ssl/page_with_unsafe_image.html ('k') | content/browser/ssl/ssl_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698