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

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

Issue 1273013004: Returning scoped_ptr<> instead of raw pointer in DhcpProxyScriptFetcherFactory::Create (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_factory.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) 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_SERVICE_H_ 5 #ifndef NET_PROXY_PROXY_SERVICE_H_
6 #define NET_PROXY_PROXY_SERVICE_H_ 6 #define NET_PROXY_PROXY_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 NetworkDelegate* network_delegate); 186 NetworkDelegate* network_delegate);
187 187
188 // Call this method with a non-null |pac_request| to cancel the PAC request. 188 // Call this method with a non-null |pac_request| to cancel the PAC request.
189 void CancelPacRequest(PacRequest* pac_request); 189 void CancelPacRequest(PacRequest* pac_request);
190 190
191 // Returns the LoadState for this |pac_request| which must be non-NULL. 191 // Returns the LoadState for this |pac_request| which must be non-NULL.
192 LoadState GetLoadState(const PacRequest* pac_request) const; 192 LoadState GetLoadState(const PacRequest* pac_request) const;
193 193
194 // Sets the ProxyScriptFetcher and DhcpProxyScriptFetcher dependencies. This 194 // Sets the ProxyScriptFetcher and DhcpProxyScriptFetcher dependencies. This
195 // is needed if the ProxyResolver is of type ProxyResolverWithoutFetch. 195 // is needed if the ProxyResolver is of type ProxyResolverWithoutFetch.
196 // ProxyService takes ownership of both objects. 196 // ProxyService takes ownership of proxy_script_fetcher.
197 void SetProxyScriptFetchers( 197 void SetProxyScriptFetchers(
198 ProxyScriptFetcher* proxy_script_fetcher, 198 ProxyScriptFetcher* proxy_script_fetcher,
199 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher); 199 scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher);
200 ProxyScriptFetcher* GetProxyScriptFetcher() const; 200 ProxyScriptFetcher* GetProxyScriptFetcher() const;
201 201
202 // Tells this ProxyService to start using a new ProxyConfigService to 202 // Tells this ProxyService to start using a new ProxyConfigService to
203 // retrieve its ProxyConfig from. The new ProxyConfigService will immediately 203 // retrieve its ProxyConfig from. The new ProxyConfigService will immediately
204 // be queried for new config info which will be used for all subsequent 204 // be queried for new config info which will be used for all subsequent
205 // ResolveProxy calls. ProxyService takes ownership of 205 // ResolveProxy calls. ProxyService takes ownership of
206 // |new_proxy_config_service|. 206 // |new_proxy_config_service|.
207 void ResetConfigService(ProxyConfigService* new_proxy_config_service); 207 void ResetConfigService(ProxyConfigService* new_proxy_config_service);
208 208
209 // Returns the last configuration fetched from ProxyConfigService. 209 // Returns the last configuration fetched from ProxyConfigService.
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 452
453 // Whether child ProxyScriptDeciders should use QuickCheck 453 // Whether child ProxyScriptDeciders should use QuickCheck
454 bool quick_check_enabled_; 454 bool quick_check_enabled_;
455 455
456 DISALLOW_COPY_AND_ASSIGN(ProxyService); 456 DISALLOW_COPY_AND_ASSIGN(ProxyService);
457 }; 457 };
458 458
459 } // namespace net 459 } // namespace net
460 460
461 #endif // NET_PROXY_PROXY_SERVICE_H_ 461 #endif // NET_PROXY_PROXY_SERVICE_H_
OLDNEW
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_factory.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698