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

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

Issue 6871019: Enable (optional) blocking of webrequests in case a PAC script cannot be fetched or is invalid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 9 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_config.cc ('k') | net/proxy/proxy_service.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_SERVICE_H_ 5 #ifndef NET_PROXY_PROXY_SERVICE_H_
6 #define NET_PROXY_PROXY_SERVICE_H_ 6 #define NET_PROXY_PROXY_SERVICE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_; 321 CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
322 322
323 // Helper to download the PAC script (wpad + custom) and apply fallback rules. 323 // Helper to download the PAC script (wpad + custom) and apply fallback rules.
324 // 324 //
325 // Note that the declaration is important here: |proxy_script_fetcher_| and 325 // Note that the declaration is important here: |proxy_script_fetcher_| and
326 // |proxy_resolver_| must outlive |init_proxy_resolver_|. 326 // |proxy_resolver_| must outlive |init_proxy_resolver_|.
327 scoped_ptr<InitProxyResolver> init_proxy_resolver_; 327 scoped_ptr<InitProxyResolver> init_proxy_resolver_;
328 328
329 State current_state_; 329 State current_state_;
330 330
331 // Either OK or an ERR_* value indicating that a permanent error (e.g.
332 // failed to fetch the PAC script) prevents proxy resolution.
333 int permanent_error_;
334
331 // This is the log where any events generated by |init_proxy_resolver_| are 335 // This is the log where any events generated by |init_proxy_resolver_| are
332 // sent to. 336 // sent to.
333 NetLog* net_log_; 337 NetLog* net_log_;
334 338
335 // The earliest time at which we should run any proxy auto-config. (Used to 339 // The earliest time at which we should run any proxy auto-config. (Used to
336 // stall re-configuration following an IP address change). 340 // stall re-configuration following an IP address change).
337 base::TimeTicks stall_proxy_autoconfig_until_; 341 base::TimeTicks stall_proxy_autoconfig_until_;
338 342
339 // The amount of time to stall requests following IP address changes. 343 // The amount of time to stall requests following IP address changes.
340 base::TimeDelta stall_proxy_auto_config_delay_; 344 base::TimeDelta stall_proxy_auto_config_delay_;
(...skipping 30 matching lines...) Expand all
371 375
372 base::WaitableEvent event_; 376 base::WaitableEvent event_;
373 CompletionCallbackImpl<SyncProxyServiceHelper> callback_; 377 CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
374 ProxyInfo proxy_info_; 378 ProxyInfo proxy_info_;
375 int result_; 379 int result_;
376 }; 380 };
377 381
378 } // namespace net 382 } // namespace net
379 383
380 #endif // NET_PROXY_PROXY_SERVICE_H_ 384 #endif // NET_PROXY_PROXY_SERVICE_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_config.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698