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

Side by Side Diff: content/public/renderer/document_state.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_info.h ('k') | content/renderer/render_frame_impl.cc » ('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 #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 5 #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
6 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 6 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 void set_connection_info( 154 void set_connection_info(
155 net::HttpResponseInfo::ConnectionInfo connection_info) { 155 net::HttpResponseInfo::ConnectionInfo connection_info) {
156 connection_info_ = connection_info; 156 connection_info_ = connection_info;
157 } 157 }
158 158
159 bool was_fetched_via_proxy() const { return was_fetched_via_proxy_; } 159 bool was_fetched_via_proxy() const { return was_fetched_via_proxy_; }
160 void set_was_fetched_via_proxy(bool value) { 160 void set_was_fetched_via_proxy(bool value) {
161 was_fetched_via_proxy_ = value; 161 was_fetched_via_proxy_ = value;
162 } 162 }
163 163
164 net::HostPortPair proxy_server() const { return proxy_server_; }
165 void set_proxy_server(net::HostPortPair proxy_server) {
166 proxy_server_ = proxy_server;
167 }
168
169 void set_was_prefetcher(bool value) { was_prefetcher_ = value; } 164 void set_was_prefetcher(bool value) { was_prefetcher_ = value; }
170 bool was_prefetcher() const { return was_prefetcher_; } 165 bool was_prefetcher() const { return was_prefetcher_; }
171 166
172 void set_was_referred_by_prefetcher(bool value) { 167 void set_was_referred_by_prefetcher(bool value) {
173 was_referred_by_prefetcher_ = value; 168 was_referred_by_prefetcher_ = value;
174 } 169 }
175 bool was_referred_by_prefetcher() const { 170 bool was_referred_by_prefetcher() const {
176 return was_referred_by_prefetcher_; 171 return was_referred_by_prefetcher_;
177 } 172 }
178 173
(...skipping 23 matching lines...) Expand all
202 base::Time first_paint_time_; 197 base::Time first_paint_time_;
203 base::Time first_paint_after_load_time_; 198 base::Time first_paint_after_load_time_;
204 bool load_histograms_recorded_; 199 bool load_histograms_recorded_;
205 bool web_timing_histograms_recorded_; 200 bool web_timing_histograms_recorded_;
206 bool was_fetched_via_spdy_; 201 bool was_fetched_via_spdy_;
207 bool was_npn_negotiated_; 202 bool was_npn_negotiated_;
208 std::string npn_negotiated_protocol_; 203 std::string npn_negotiated_protocol_;
209 bool was_alternate_protocol_available_; 204 bool was_alternate_protocol_available_;
210 net::HttpResponseInfo::ConnectionInfo connection_info_; 205 net::HttpResponseInfo::ConnectionInfo connection_info_;
211 bool was_fetched_via_proxy_; 206 bool was_fetched_via_proxy_;
212 net::HostPortPair proxy_server_;
213 207
214 // A prefetcher is a page that contains link rel=prefetch elements. 208 // A prefetcher is a page that contains link rel=prefetch elements.
215 bool was_prefetcher_; 209 bool was_prefetcher_;
216 bool was_referred_by_prefetcher_; 210 bool was_referred_by_prefetcher_;
217 bool was_after_preconnect_request_; 211 bool was_after_preconnect_request_;
218 212
219 LoadType load_type_; 213 LoadType load_type_;
220 214
221 scoped_ptr<NavigationState> navigation_state_; 215 scoped_ptr<NavigationState> navigation_state_;
222 216
223 bool can_load_local_resources_; 217 bool can_load_local_resources_;
224 }; 218 };
225 219
226 #endif // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 220 #endif // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
227 221
228 } // namespace content 222 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/resource_response_info.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698