| OLD | NEW |
| 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 <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "components/onc/onc_constants.h" | 10 #include "components/onc/onc_constants.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 namespace proxy_config { | 24 namespace proxy_config { |
| 25 | 25 |
| 26 // Get the proxy configuration including per-network policies for network | 26 // Get the proxy configuration including per-network policies for network |
| 27 // |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 |
| 28 // 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 |
| 29 // system request context. | 29 // system request context. |
| 30 std::unique_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork( | 30 std::unique_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork( |
| 31 const PrefService* profile_prefs, | 31 const PrefService* profile_prefs, |
| 32 const PrefService* local_state_prefs, | 32 const PrefService* local_state_prefs, |
| 33 const NetworkState& network, | 33 const NetworkState& network, |
| 34 onc::ONCSource* onc_source); | 34 ::onc::ONCSource* onc_source); |
| 35 | 35 |
| 36 void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config, | 36 void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config, |
| 37 const NetworkState& network); | 37 const NetworkState& network); |
| 38 | 38 |
| 39 void RegisterPrefs(PrefRegistrySimple* registry); | 39 void RegisterPrefs(PrefRegistrySimple* registry); |
| 40 | 40 |
| 41 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); | 41 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); |
| 42 | 42 |
| 43 } // namespace proxy_config | 43 } // namespace proxy_config |
| 44 | 44 |
| 45 } // namespace chromeos | 45 } // namespace chromeos |
| 46 | 46 |
| 47 #endif // CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_ | 47 #endif // CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_ |
| OLD | NEW |