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