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

Side by Side Diff: chrome/browser/chromeos/net/proxy_config_handler.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_
6 #define CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include <memory>
9
9 #include "components/onc/onc_constants.h" 10 #include "components/onc/onc_constants.h"
10 11
11 class PrefRegistrySimple; 12 class PrefRegistrySimple;
12 class PrefService; 13 class PrefService;
13 class ProxyConfigDictionary; 14 class ProxyConfigDictionary;
14 15
15 namespace user_prefs { 16 namespace user_prefs {
16 class PrefRegistrySyncable; 17 class PrefRegistrySyncable;
17 } 18 }
18 19
19 namespace chromeos { 20 namespace chromeos {
20 21
21 class NetworkState; 22 class NetworkState;
22 23
23 namespace proxy_config { 24 namespace proxy_config {
24 25
25 // Get the proxy configuration including per-network policies for network 26 // Get the proxy configuration including per-network policies for network
26 // |network|. If |profile_prefs| is NULL, then only shared settings (and device 27 // |network|. If |profile_prefs| is NULL, then only shared settings (and device
27 // policy) are respected. This is e.g. the case for the signin screen and the 28 // policy) are respected. This is e.g. the case for the signin screen and the
28 // system request context. 29 // system request context.
29 scoped_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork( 30 std::unique_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork(
30 const PrefService* profile_prefs, 31 const PrefService* profile_prefs,
31 const PrefService* local_state_prefs, 32 const PrefService* local_state_prefs,
32 const NetworkState& network, 33 const NetworkState& network,
33 onc::ONCSource* onc_source); 34 onc::ONCSource* onc_source);
34 35
35 void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config, 36 void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config,
36 const NetworkState& network); 37 const NetworkState& network);
37 38
38 void RegisterPrefs(PrefRegistrySimple* registry); 39 void RegisterPrefs(PrefRegistrySimple* registry);
39 40
40 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 41 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
41 42
42 } // namespace proxy_config 43 } // namespace proxy_config
43 44
44 } // namespace chromeos 45 } // namespace chromeos
45 46
46 #endif // CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_ 47 #endif // CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.cc ('k') | chrome/browser/chromeos/net/proxy_config_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698