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

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

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try merging again... 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/proxy_service.cc ('k') | net/proxy/proxy_service_mojo.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MOJO_H_ 5 #ifndef NET_PROXY_PROXY_SERVICE_MOJO_H_
6 #define NET_PROXY_PROXY_SERVICE_MOJO_H_ 6 #define NET_PROXY_PROXY_SERVICE_MOJO_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 10
(...skipping 21 matching lines...) Expand all
32 // 32 //
33 // |dhcp_proxy_script_fetcher| specifies the dependency to use for attempting 33 // |dhcp_proxy_script_fetcher| specifies the dependency to use for attempting
34 // to retrieve the most appropriate PAC script configured in DHCP. The 34 // to retrieve the most appropriate PAC script configured in DHCP. The
35 // resulting ProxyService will take ownership of it. 35 // resulting ProxyService will take ownership of it.
36 // 36 //
37 // |host_resolver| points to the host resolving dependency the PAC script 37 // |host_resolver| points to the host resolving dependency the PAC script
38 // should use for any DNS queries. It must remain valid throughout the 38 // should use for any DNS queries. It must remain valid throughout the
39 // lifetime of the ProxyService. 39 // lifetime of the ProxyService.
40 scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory( 40 scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory(
41 MojoProxyResolverFactory* mojo_proxy_factory, 41 MojoProxyResolverFactory* mojo_proxy_factory,
42 ProxyConfigService* proxy_config_service, 42 scoped_ptr<ProxyConfigService> proxy_config_service,
43 ProxyScriptFetcher* proxy_script_fetcher, 43 ProxyScriptFetcher* proxy_script_fetcher,
44 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, 44 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
45 HostResolver* host_resolver, 45 HostResolver* host_resolver,
46 NetLog* net_log, 46 NetLog* net_log,
47 NetworkDelegate* network_delegate); 47 NetworkDelegate* network_delegate);
48 48
49 // Creates a proxy service that connects to an in-process Mojo proxy resolver 49 // Creates a proxy service that connects to an in-process Mojo proxy resolver
50 // service. See above for information about other arguments. 50 // service. See above for information about other arguments.
51 // 51 //
52 // ########################################################################## 52 // ##########################################################################
53 // # See the warnings in net/proxy/proxy_resolver_v8.h describing the 53 // # See the warnings in net/proxy/proxy_resolver_v8.h describing the
54 // # multi-threading model. In order for this to be safe to use, *ALL* the 54 // # multi-threading model. In order for this to be safe to use, *ALL* the
55 // # other V8's running in the process must use v8::Locker. 55 // # other V8's running in the process must use v8::Locker.
56 // ########################################################################## 56 // ##########################################################################
57 scoped_ptr<ProxyService> CreateProxyServiceUsingMojoInProcess( 57 scoped_ptr<ProxyService> CreateProxyServiceUsingMojoInProcess(
58 ProxyConfigService* proxy_config_service, 58 scoped_ptr<ProxyConfigService> proxy_config_service,
59 ProxyScriptFetcher* proxy_script_fetcher, 59 ProxyScriptFetcher* proxy_script_fetcher,
60 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, 60 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
61 HostResolver* host_resolver, 61 HostResolver* host_resolver,
62 NetLog* net_log, 62 NetLog* net_log,
63 NetworkDelegate* network_delegate); 63 NetworkDelegate* network_delegate);
64 64
65 } // namespace net 65 } // namespace net
66 66
67 #endif // NET_PROXY_PROXY_SERVICE_MOJO_H_ 67 #endif // NET_PROXY_PROXY_SERVICE_MOJO_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_service.cc ('k') | net/proxy/proxy_service_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698