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

Side by Side Diff: content/child/weburlresponse_extradata_impl.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/child/web_url_loader_impl.cc ('k') | content/common/resource_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 #ifndef CONTENT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_ 5 #ifndef CONTENT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_
6 #define CONTENT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_ 6 #define CONTENT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 17 matching lines...) Expand all
28 28
29 // Flag whether this request was loaded via an explicit proxy 29 // Flag whether this request was loaded via an explicit proxy
30 // (HTTP, SOCKS, etc). 30 // (HTTP, SOCKS, etc).
31 bool was_fetched_via_proxy() const { 31 bool was_fetched_via_proxy() const {
32 return was_fetched_via_proxy_; 32 return was_fetched_via_proxy_;
33 } 33 }
34 void set_was_fetched_via_proxy(bool was_fetched_via_proxy) { 34 void set_was_fetched_via_proxy(bool was_fetched_via_proxy) {
35 was_fetched_via_proxy_ = was_fetched_via_proxy; 35 was_fetched_via_proxy_ = was_fetched_via_proxy;
36 } 36 }
37 37
38 // The proxy server used if this request was loaded via an explicit proxy
39 // (HTTP, SOCKS, etc).
40 net::HostPortPair proxy_server() const {
41 return proxy_server_;
42 }
43 void set_proxy_server(net::HostPortPair proxy_server) {
44 proxy_server_ = proxy_server;
45 }
46
47 /// Flag whether this request was loaded via the SPDY protocol or not. 38 /// Flag whether this request was loaded via the SPDY protocol or not.
48 // SPDY is an experimental web protocol, see http://dev.chromium.org/spdy 39 // SPDY is an experimental web protocol, see http://dev.chromium.org/spdy
49 bool was_fetched_via_spdy() const { 40 bool was_fetched_via_spdy() const {
50 return was_fetched_via_spdy_; 41 return was_fetched_via_spdy_;
51 } 42 }
52 void set_was_fetched_via_spdy(bool was_fetched_via_spdy) { 43 void set_was_fetched_via_spdy(bool was_fetched_via_spdy) {
53 was_fetched_via_spdy_ = was_fetched_via_spdy; 44 was_fetched_via_spdy_ = was_fetched_via_spdy;
54 } 45 }
55 46
56 // Information about the type of connection used to fetch this response. 47 // Information about the type of connection used to fetch this response.
(...skipping 27 matching lines...) Expand all
84 75
85 bool is_ftp_directory_listing() const { return is_ftp_directory_listing_; } 76 bool is_ftp_directory_listing() const { return is_ftp_directory_listing_; }
86 void set_is_ftp_directory_listing(bool is_ftp_directory_listing) { 77 void set_is_ftp_directory_listing(bool is_ftp_directory_listing) {
87 is_ftp_directory_listing_ = is_ftp_directory_listing; 78 is_ftp_directory_listing_ = is_ftp_directory_listing;
88 } 79 }
89 80
90 private: 81 private:
91 std::string npn_negotiated_protocol_; 82 std::string npn_negotiated_protocol_;
92 bool is_ftp_directory_listing_; 83 bool is_ftp_directory_listing_;
93 bool was_fetched_via_proxy_; 84 bool was_fetched_via_proxy_;
94 net::HostPortPair proxy_server_;
95 bool was_fetched_via_spdy_; 85 bool was_fetched_via_spdy_;
96 bool was_npn_negotiated_; 86 bool was_npn_negotiated_;
97 net::HttpResponseInfo::ConnectionInfo connection_info_; 87 net::HttpResponseInfo::ConnectionInfo connection_info_;
98 bool was_alternate_protocol_available_; 88 bool was_alternate_protocol_available_;
99 89
100 DISALLOW_COPY_AND_ASSIGN(WebURLResponseExtraDataImpl); 90 DISALLOW_COPY_AND_ASSIGN(WebURLResponseExtraDataImpl);
101 }; 91 };
102 92
103 } // namespace content 93 } // namespace content
104 94
105 #endif // CONTENT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_ 95 #endif // CONTENT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_
OLDNEW
« no previous file with comments | « content/child/web_url_loader_impl.cc ('k') | content/common/resource_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698