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

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, 8 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
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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_; 323 CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
324 324
325 // Helper to download the PAC script (wpad + custom) and apply fallback rules. 325 // Helper to download the PAC script (wpad + custom) and apply fallback rules.
326 // 326 //
327 // Note that the declaration is important here: |proxy_script_fetcher_| and 327 // Note that the declaration is important here: |proxy_script_fetcher_| and
328 // |proxy_resolver_| must outlive |init_proxy_resolver_|. 328 // |proxy_resolver_| must outlive |init_proxy_resolver_|.
329 scoped_ptr<InitProxyResolver> init_proxy_resolver_; 329 scoped_ptr<InitProxyResolver> init_proxy_resolver_;
330 330
331 State current_state_; 331 State current_state_;
332 332
333 // Either OK or an ERR_* value indicating that a permanent error (e.g.
334 // failed to fetch the PAC script) prevents proxy resolution.
335 int permanent_error_;
336
333 // This is the log where any events generated by |init_proxy_resolver_| are 337 // This is the log where any events generated by |init_proxy_resolver_| are
334 // sent to. 338 // sent to.
335 NetLog* net_log_; 339 NetLog* net_log_;
336 340
337 // The earliest time at which we should run any proxy auto-config. (Used to 341 // The earliest time at which we should run any proxy auto-config. (Used to
338 // stall re-configuration following an IP address change). 342 // stall re-configuration following an IP address change).
339 base::TimeTicks stall_proxy_autoconfig_until_; 343 base::TimeTicks stall_proxy_autoconfig_until_;
340 344
341 // The amount of time to stall requests following IP address changes. 345 // The amount of time to stall requests following IP address changes.
342 base::TimeDelta stall_proxy_auto_config_delay_; 346 base::TimeDelta stall_proxy_auto_config_delay_;
(...skipping 30 matching lines...) Expand all
373 377
374 base::WaitableEvent event_; 378 base::WaitableEvent event_;
375 CompletionCallbackImpl<SyncProxyServiceHelper> callback_; 379 CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
376 ProxyInfo proxy_info_; 380 ProxyInfo proxy_info_;
377 int result_; 381 int result_;
378 }; 382 };
379 383
380 } // namespace net 384 } // namespace net
381 385
382 #endif // NET_PROXY_PROXY_SERVICE_H_ 386 #endif // NET_PROXY_PROXY_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698