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

Side by Side Diff: content/child/web_url_loader_impl.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/web_contents/web_contents_impl.cc ('k') | content/common/frame_messages.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/child/web_url_loader_impl.h" 5 #include "content/child/web_url_loader_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 void WebURLLoaderImpl::PopulateURLResponse(const GURL& url, 880 void WebURLLoaderImpl::PopulateURLResponse(const GURL& url,
881 const ResourceResponseInfo& info, 881 const ResourceResponseInfo& info,
882 WebURLResponse* response, 882 WebURLResponse* response,
883 bool report_security_info) { 883 bool report_security_info) {
884 response->setURL(url); 884 response->setURL(url);
885 response->setResponseTime(info.response_time.ToInternalValue()); 885 response->setResponseTime(info.response_time.ToInternalValue());
886 response->setMIMEType(WebString::fromUTF8(info.mime_type)); 886 response->setMIMEType(WebString::fromUTF8(info.mime_type));
887 response->setTextEncodingName(WebString::fromUTF8(info.charset)); 887 response->setTextEncodingName(WebString::fromUTF8(info.charset));
888 response->setExpectedContentLength(info.content_length); 888 response->setExpectedContentLength(info.content_length);
889 response->setSecurityInfo(info.security_info); 889 response->setSecurityInfo(info.security_info);
890 response->setHasMajorCertificateErrors(info.has_major_certificate_errors);
890 response->setAppCacheID(info.appcache_id); 891 response->setAppCacheID(info.appcache_id);
891 response->setAppCacheManifestURL(info.appcache_manifest_url); 892 response->setAppCacheManifestURL(info.appcache_manifest_url);
892 response->setWasCached(!info.load_timing.request_start_time.is_null() && 893 response->setWasCached(!info.load_timing.request_start_time.is_null() &&
893 info.response_time < info.load_timing.request_start_time); 894 info.response_time < info.load_timing.request_start_time);
894 response->setRemoteIPAddress( 895 response->setRemoteIPAddress(
895 WebString::fromUTF8(info.socket_address.host())); 896 WebString::fromUTF8(info.socket_address.host()));
896 response->setRemotePort(info.socket_address.port()); 897 response->setRemotePort(info.socket_address.port());
897 response->setConnectionID(info.load_timing.socket_log_id); 898 response->setConnectionID(info.load_timing.socket_log_id);
898 response->setConnectionReused(info.load_timing.socket_reused); 899 response->setConnectionReused(info.load_timing.socket_reused);
899 response->setDownloadFilePath(info.download_file_path.AsUTF16Unsafe()); 900 response->setDownloadFilePath(info.download_file_path.AsUTF16Unsafe());
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 } 1092 }
1092 1093
1093 void WebURLLoaderImpl::setLoadingTaskRunner( 1094 void WebURLLoaderImpl::setLoadingTaskRunner(
1094 blink::WebTaskRunner* loading_task_runner) { 1095 blink::WebTaskRunner* loading_task_runner) {
1095 // There's no guarantee on the lifetime of |loading_task_runner| so we take a 1096 // There's no guarantee on the lifetime of |loading_task_runner| so we take a
1096 // copy. 1097 // copy.
1097 context_->SetWebTaskRunner(make_scoped_ptr(loading_task_runner->clone())); 1098 context_->SetWebTaskRunner(make_scoped_ptr(loading_task_runner->clone()));
1098 } 1099 }
1099 1100
1100 } // namespace content 1101 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698