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

Side by Side Diff: chromeos/network/proxy/proxy_config_handler.h

Issue 2442313003: Move some proxy config code out of src/chrome (Closed)
Patch Set: Fix DEPS Created 4 years, 1 month 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 | « chromeos/network/onc/onc_utils.cc ('k') | chromeos/network/proxy/proxy_config_handler.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) 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 CHROMEOS_NETWORK_PROXY_PROXY_CONFIG_HANDLER_H_
6 #define CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_ 6 #define CHROMEOS_NETWORK_PROXY_PROXY_CONFIG_HANDLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "chromeos/chromeos_export.h"
10 #include "components/onc/onc_constants.h" 11 #include "components/onc/onc_constants.h"
11 12
12 class PrefRegistrySimple; 13 class PrefRegistrySimple;
13 class PrefService; 14 class PrefService;
14 class ProxyConfigDictionary; 15 class ProxyConfigDictionary;
15 16
16 namespace user_prefs { 17 namespace user_prefs {
17 class PrefRegistrySyncable; 18 class PrefRegistrySyncable;
18 } 19 }
19 20
20 namespace chromeos { 21 namespace chromeos {
21 22
22 class NetworkState; 23 class NetworkState;
23 24
24 namespace proxy_config { 25 namespace proxy_config {
25 26
26 // Get the proxy configuration including per-network policies for network 27 // Get the proxy configuration including per-network policies for network
27 // |network|. If |profile_prefs| is NULL, then only shared settings (and device 28 // |network|. If |profile_prefs| is NULL, then only shared settings (and device
28 // policy) are respected. This is e.g. the case for the signin screen and the 29 // policy) are respected. This is e.g. the case for the signin screen and the
29 // system request context. 30 // system request context.
30 std::unique_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork( 31 CHROMEOS_EXPORT std::unique_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork(
31 const PrefService* profile_prefs, 32 const PrefService* profile_prefs,
32 const PrefService* local_state_prefs, 33 const PrefService* local_state_prefs,
33 const NetworkState& network, 34 const NetworkState& network,
34 ::onc::ONCSource* onc_source); 35 ::onc::ONCSource* onc_source);
35 36
36 void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config, 37 CHROMEOS_EXPORT void SetProxyConfigForNetwork(
37 const NetworkState& network); 38 const ProxyConfigDictionary& proxy_config,
39 const NetworkState& network);
38 40
39 } // namespace proxy_config 41 } // namespace proxy_config
40 42
41 } // namespace chromeos 43 } // namespace chromeos
42 44
43 #endif // CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_ 45 #endif // CHROMEOS_NETWORK_PROXY_PROXY_CONFIG_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_utils.cc ('k') | chromeos/network/proxy/proxy_config_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698