| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_PROXY_CONFIG_SERVICE_IMPL_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ | 6 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state, | 189 virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state, |
| 190 const net::ProxyConfig& config) OVERRIDE; | 190 const net::ProxyConfig& config) OVERRIDE; |
| 191 | 191 |
| 192 // NetworkLibrary::NetworkManagerObserver implementation. | 192 // NetworkLibrary::NetworkManagerObserver implementation. |
| 193 virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE; | 193 virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE; |
| 194 | 194 |
| 195 // NetworkLibrary::NetworkObserver implementation. | 195 // NetworkLibrary::NetworkObserver implementation. |
| 196 virtual void OnNetworkChanged(NetworkLibrary* cros, | 196 virtual void OnNetworkChanged(NetworkLibrary* cros, |
| 197 const Network* network) OVERRIDE; | 197 const Network* network) OVERRIDE; |
| 198 | 198 |
| 199 // Parse |network| proxy config and store result in |proxy_config|. | 199 // Parse |proxy_config_string| and store result in |proxy_config|. |
| 200 // Returns true if proxy config was successfully parsed. | 200 // Returns true if proxy config was successfully parsed. |
| 201 static bool ParseProxyConfig(const Network* network, | 201 static bool ParseProxyConfig(const std::string& proxy_config_string, |
| 202 net::ProxyConfig* proxy_config); | 202 net::ProxyConfig* proxy_config); |
| 203 | 203 |
| 204 // Register UseShardProxies preference. | 204 // Register UseShardProxies preference. |
| 205 static void RegisterPrefs(PrefRegistrySimple* registry); | 205 static void RegisterPrefs(PrefRegistrySimple* registry); |
| 206 static void RegisterUserPrefs(PrefRegistrySyncable* registry); | 206 static void RegisterUserPrefs(PrefRegistrySyncable* registry); |
| 207 | 207 |
| 208 #if defined(UNIT_TEST) | 208 #if defined(UNIT_TEST) |
| 209 void SetTesting(ProxyConfig* test_config) { | 209 void SetTesting(ProxyConfig* test_config) { |
| 210 UIMakeActiveNetworkCurrent(); | 210 UIMakeActiveNetworkCurrent(); |
| 211 if (test_config) { | 211 if (test_config) { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 std::vector<base::Closure> callbacks_; | 296 std::vector<base::Closure> callbacks_; |
| 297 | 297 |
| 298 base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_; | 298 base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_; |
| 299 | 299 |
| 300 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl); | 300 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl); |
| 301 }; | 301 }; |
| 302 | 302 |
| 303 } // namespace chromeos | 303 } // namespace chromeos |
| 304 | 304 |
| 305 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ | 305 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ |
| OLD | NEW |