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

Side by Side Diff: ios/chrome/browser/net/proxy_service_factory.h

Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: proper namespacing Created 5 years, 2 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
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 IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 5 #ifndef IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
6 #define IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 6 #define IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 25 matching lines...) Expand all
36 // Creates a PrefProxyConfigTracker that tracks local state only. This tracker 36 // Creates a PrefProxyConfigTracker that tracks local state only. This tracker
37 // should be used for the system request context. 37 // should be used for the system request context.
38 static scoped_ptr<PrefProxyConfigTracker> 38 static scoped_ptr<PrefProxyConfigTracker>
39 CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs); 39 CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs);
40 40
41 // Create a proxy service. 41 // Create a proxy service.
42 static scoped_ptr<net::ProxyService> CreateProxyService( 42 static scoped_ptr<net::ProxyService> CreateProxyService(
43 net::NetLog* net_log, 43 net::NetLog* net_log,
44 net::URLRequestContext* context, 44 net::URLRequestContext* context,
45 net::NetworkDelegate* network_delegate, 45 net::NetworkDelegate* network_delegate,
46 net::ProxyConfigService* proxy_config_service, 46 scoped_ptr<net::ProxyConfigService> proxy_config_service,
47 bool quick_check_enabled); 47 bool quick_check_enabled);
48 48
49 private: 49 private:
50 DISALLOW_COPY_AND_ASSIGN(ProxyServiceFactory); 50 DISALLOW_COPY_AND_ASSIGN(ProxyServiceFactory);
51 }; 51 };
52 52
53 } // namespace ios 53 } // namespace ios
54 54
55 #endif // IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 55 #endif // IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
OLDNEW
« no previous file with comments | « content/shell/browser/shell_url_request_context_getter.cc ('k') | ios/chrome/browser/net/proxy_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698