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

Side by Side Diff: content/public/common/resource_response_info.h

Issue 691323002: Revert "Make the proxy server HostPortPair available in document_state so that" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/public/common/resource_response.cc ('k') | content/public/renderer/document_state.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 #ifndef CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_
6 #define CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_ 6 #define CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 // True if response could use alternate protocol. However, browser will 87 // True if response could use alternate protocol. However, browser will
88 // ignore the alternate protocol when spdy is not enabled on browser side. 88 // ignore the alternate protocol when spdy is not enabled on browser side.
89 bool was_alternate_protocol_available; 89 bool was_alternate_protocol_available;
90 90
91 // Information about the type of connection used to fetch this response. 91 // Information about the type of connection used to fetch this response.
92 net::HttpResponseInfo::ConnectionInfo connection_info; 92 net::HttpResponseInfo::ConnectionInfo connection_info;
93 93
94 // True if the response was fetched via an explicit proxy (as opposed to a 94 // True if the response was fetched via an explicit proxy (as opposed to a
95 // transparent proxy). The proxy could be any type of proxy, HTTP or SOCKS. 95 // transparent proxy). The proxy could be any type of proxy, HTTP or SOCKS.
96 // Note: we cannot tell if a transparent proxy may have been involved. If 96 // Note: we cannot tell if a transparent proxy may have been involved.
97 // true, |proxy_server| contains the name of the proxy server that was used.
98 bool was_fetched_via_proxy; 97 bool was_fetched_via_proxy;
99 net::HostPortPair proxy_server;
100 98
101 // NPN protocol negotiated with the server. 99 // NPN protocol negotiated with the server.
102 std::string npn_negotiated_protocol; 100 std::string npn_negotiated_protocol;
103 101
104 // Remote address of the socket which fetched this resource. 102 // Remote address of the socket which fetched this resource.
105 net::HostPortPair socket_address; 103 net::HostPortPair socket_address;
106 104
107 // True if the response was fetched by a ServiceWorker. 105 // True if the response was fetched by a ServiceWorker.
108 bool was_fetched_via_service_worker; 106 bool was_fetched_via_service_worker;
109 107
(...skipping 13 matching lines...) Expand all
123 // ServiceWorker Timing Information. These will be set if the response is 121 // ServiceWorker Timing Information. These will be set if the response is
124 // provided by the ServiceWorker, or kept empty. 122 // provided by the ServiceWorker, or kept empty.
125 base::TimeTicks service_worker_fetch_start; 123 base::TimeTicks service_worker_fetch_start;
126 base::TimeTicks service_worker_fetch_ready; 124 base::TimeTicks service_worker_fetch_ready;
127 base::TimeTicks service_worker_fetch_end; 125 base::TimeTicks service_worker_fetch_end;
128 }; 126 };
129 127
130 } // namespace content 128 } // namespace content
131 129
132 #endif // CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_ 130 #endif // CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_
OLDNEW
« no previous file with comments | « content/public/common/resource_response.cc ('k') | content/public/renderer/document_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698