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

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

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Lots of fixes driven by try jobs. Created 5 years, 4 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 (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 CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 5 #ifndef CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
6 #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 6 #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h"
9 10
10 class PrefProxyConfigTracker; 11 class PrefProxyConfigTracker;
11 class PrefService; 12 class PrefService;
12 13
13 namespace base { 14 namespace base {
14 class CommandLine; 15 class CommandLine;
15 } 16 }
16 17
17 namespace net { 18 namespace net {
18 class NetLog; 19 class NetLog;
(...skipping 18 matching lines...) Expand all
37 PrefService* profile_prefs, 38 PrefService* profile_prefs,
38 PrefService* local_state_prefs); 39 PrefService* local_state_prefs);
39 40
40 // Creates a PrefProxyConfigTracker that tracks local state only. This tracker 41 // Creates a PrefProxyConfigTracker that tracks local state only. This tracker
41 // should be used for the system request context and the signin screen 42 // should be used for the system request context and the signin screen
42 // (ChromeOS only). 43 // (ChromeOS only).
43 static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState( 44 static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState(
44 PrefService* local_state_prefs); 45 PrefService* local_state_prefs);
45 46
46 // Create a proxy service according to the options on command line. 47 // Create a proxy service according to the options on command line.
47 static net::ProxyService* CreateProxyService( 48 static scoped_ptr<net::ProxyService> CreateProxyService(
48 net::NetLog* net_log, 49 net::NetLog* net_log,
49 net::URLRequestContext* context, 50 net::URLRequestContext* context,
50 net::NetworkDelegate* network_delegate, 51 net::NetworkDelegate* network_delegate,
51 net::ProxyConfigService* proxy_config_service, 52 net::ProxyConfigService* proxy_config_service,
pauljensen 2015/08/28 13:38:02 This should be a scoped_ptr...dunno if you want to
Randy Smith (Not in Mondays) 2015/09/02 23:42:19 So the conversion of ProxyConfigService over to sc
52 const base::CommandLine& command_line, 53 const base::CommandLine& command_line,
53 bool quick_check_enabled); 54 bool quick_check_enabled);
54 55
55 private: 56 private:
56 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); 57 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory);
57 }; 58 };
58 59
59 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 60 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698