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

Side by Side Diff: net/proxy/proxy_script_decider.h

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 months 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
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 NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 5 #ifndef NET_PROXY_PROXY_SCRIPT_DECIDER_H_
6 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 6 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 // Flag indicating whether the caller requested a mandatory pac script 175 // Flag indicating whether the caller requested a mandatory pac script
176 // (i.e. fallback to direct connections are prohibited). 176 // (i.e. fallback to direct connections are prohibited).
177 bool pac_mandatory_; 177 bool pac_mandatory_;
178 178
179 // Whether we have an existing custom PAC URL. 179 // Whether we have an existing custom PAC URL.
180 bool have_custom_pac_url_; 180 bool have_custom_pac_url_;
181 181
182 PacSourceList pac_sources_; 182 PacSourceList pac_sources_;
183 State next_state_; 183 State next_state_;
184 184
185 BoundNetLog net_log_; 185 NetLogWithSource net_log_;
186 186
187 bool fetch_pac_bytes_; 187 bool fetch_pac_bytes_;
188 188
189 base::TimeDelta wait_delay_; 189 base::TimeDelta wait_delay_;
190 base::OneShotTimer wait_timer_; 190 base::OneShotTimer wait_timer_;
191 191
192 // Whether to do DNS quick check 192 // Whether to do DNS quick check
193 bool quick_check_enabled_; 193 bool quick_check_enabled_;
194 194
195 // Results. 195 // Results.
196 ProxyConfig effective_config_; 196 ProxyConfig effective_config_;
197 scoped_refptr<ProxyResolverScriptData> script_data_; 197 scoped_refptr<ProxyResolverScriptData> script_data_;
198 198
199 AddressList wpad_addresses_; 199 AddressList wpad_addresses_;
200 base::OneShotTimer quick_check_timer_; 200 base::OneShotTimer quick_check_timer_;
201 HostResolver* host_resolver_; 201 HostResolver* host_resolver_;
202 std::unique_ptr<HostResolver::Request> request_; 202 std::unique_ptr<HostResolver::Request> request_;
203 base::Time quick_check_start_time_; 203 base::Time quick_check_start_time_;
204 204
205 DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider); 205 DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider);
206 }; 206 };
207 207
208 } // namespace net 208 } // namespace net
209 209
210 #endif // NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 210 #endif // NET_PROXY_PROXY_SCRIPT_DECIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698