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

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

Issue 1415923015: Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove console message; see comment to mike 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 | « content/browser/bad_message.h ('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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 request, &response->head.appcache_id, 106 request, &response->head.appcache_id,
107 &response->head.appcache_manifest_url); 107 &response->head.appcache_manifest_url);
108 if (info->is_load_timing_enabled()) 108 if (info->is_load_timing_enabled())
109 request->GetLoadTimingInfo(&response->head.load_timing); 109 request->GetLoadTimingInfo(&response->head.load_timing);
110 110
111 if (request->ssl_info().cert.get()) { 111 if (request->ssl_info().cert.get()) {
112 SSLStatus ssl_status; 112 SSLStatus ssl_status;
113 GetSSLStatusForRequest(request->url(), request->ssl_info(), 113 GetSSLStatusForRequest(request->url(), request->ssl_info(),
114 info->GetChildID(), &ssl_status); 114 info->GetChildID(), &ssl_status);
115 response->head.security_info = SerializeSecurityInfo(ssl_status); 115 response->head.security_info = SerializeSecurityInfo(ssl_status);
116 response->head.has_major_certificate_errors =
117 net::IsCertStatusError(ssl_status.cert_status) &&
118 !net::IsCertStatusMinorError(ssl_status.cert_status);
116 } else { 119 } else {
117 // We should not have any SSL state. 120 // We should not have any SSL state.
118 DCHECK(!request->ssl_info().cert_status); 121 DCHECK(!request->ssl_info().cert_status);
119 DCHECK_EQ(request->ssl_info().security_bits, -1); 122 DCHECK_EQ(request->ssl_info().security_bits, -1);
120 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); 123 DCHECK_EQ(request->ssl_info().key_exchange_info, 0);
121 DCHECK(!request->ssl_info().connection_status); 124 DCHECK(!request->ssl_info().connection_status);
122 } 125 }
123 } 126 }
124 127
125 } // namespace 128 } // namespace
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 case net::URLRequestStatus::FAILED: 710 case net::URLRequestStatus::FAILED:
708 status = STATUS_UNDEFINED; 711 status = STATUS_UNDEFINED;
709 break; 712 break;
710 } 713 }
711 714
712 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); 715 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
713 } 716 }
714 } 717 }
715 718
716 } // namespace content 719 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/bad_message.h ('k') | content/browser/ssl/ssl_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698