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

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

Issue 8373014: Add new text for indicating we are resolving hosts during proxy resolution. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address eroman's nits. Created 9 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 | « net/proxy/proxy_resolver_winhttp.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
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/synchronization/waitable_event.h" 14 #include "base/synchronization/waitable_event.h"
15 #include "base/threading/non_thread_safe.h" 15 #include "base/threading/non_thread_safe.h"
16 #include "net/base/completion_callback.h" 16 #include "net/base/completion_callback.h"
17 #include "net/base/load_states.h"
17 #include "net/base/net_export.h" 18 #include "net/base/net_export.h"
18 #include "net/base/net_log.h" 19 #include "net/base/net_log.h"
19 #include "net/base/network_change_notifier.h" 20 #include "net/base/network_change_notifier.h"
20 #include "net/proxy/proxy_config_service.h" 21 #include "net/proxy/proxy_config_service.h"
21 #include "net/proxy/proxy_info.h" 22 #include "net/proxy/proxy_info.h"
22 #include "net/proxy/proxy_server.h" 23 #include "net/proxy/proxy_server.h"
23 24
24 class GURL; 25 class GURL;
25 class MessageLoop; 26 class MessageLoop;
26 27
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 const BoundNetLog& net_log); 99 const BoundNetLog& net_log);
99 100
100 // Called to report that the last proxy connection succeeded. If |proxy_info| 101 // Called to report that the last proxy connection succeeded. If |proxy_info|
101 // has a non empty proxy_retry_info map, the proxies that have been tried (and 102 // has a non empty proxy_retry_info map, the proxies that have been tried (and
102 // failed) for this request will be marked as bad. 103 // failed) for this request will be marked as bad.
103 void ReportSuccess(const ProxyInfo& proxy_info); 104 void ReportSuccess(const ProxyInfo& proxy_info);
104 105
105 // Call this method with a non-null |pac_request| to cancel the PAC request. 106 // Call this method with a non-null |pac_request| to cancel the PAC request.
106 void CancelPacRequest(PacRequest* pac_request); 107 void CancelPacRequest(PacRequest* pac_request);
107 108
109 // Returns the LoadState for this |pac_request| which must be non-NULL.
110 LoadState GetLoadState(const PacRequest* pac_request) const;
111
108 // Sets the ProxyScriptFetcher and DhcpProxyScriptFetcher dependencies. This 112 // Sets the ProxyScriptFetcher and DhcpProxyScriptFetcher dependencies. This
109 // is needed if the ProxyResolver is of type ProxyResolverWithoutFetch. 113 // is needed if the ProxyResolver is of type ProxyResolverWithoutFetch.
110 // ProxyService takes ownership of both objects. 114 // ProxyService takes ownership of both objects.
111 void SetProxyScriptFetchers( 115 void SetProxyScriptFetchers(
112 ProxyScriptFetcher* proxy_script_fetcher, 116 ProxyScriptFetcher* proxy_script_fetcher,
113 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher); 117 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher);
114 ProxyScriptFetcher* GetProxyScriptFetcher() const; 118 ProxyScriptFetcher* GetProxyScriptFetcher() const;
115 119
116 // Tells this ProxyService to start using a new ProxyConfigService to 120 // Tells this ProxyService to start using a new ProxyConfigService to
117 // retrieve its ProxyConfig from. The new ProxyConfigService will immediately 121 // retrieve its ProxyConfig from. The new ProxyConfigService will immediately
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 399
396 base::WaitableEvent event_; 400 base::WaitableEvent event_;
397 OldCompletionCallbackImpl<SyncProxyServiceHelper> callback_; 401 OldCompletionCallbackImpl<SyncProxyServiceHelper> callback_;
398 ProxyInfo proxy_info_; 402 ProxyInfo proxy_info_;
399 int result_; 403 int result_;
400 }; 404 };
401 405
402 } // namespace net 406 } // namespace net
403 407
404 #endif // NET_PROXY_PROXY_SERVICE_H_ 408 #endif // NET_PROXY_PROXY_SERVICE_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_winhttp.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698