| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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_UI_PROXY_CONFIG_SERVICE_H_ | 5 #ifndef CHROMEOS_NETWORK_PROXY_UI_PROXY_CONFIG_SERVICE_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_UI_PROXY_CONFIG_SERVICE_H_ | 6 #define CHROMEOS_NETWORK_PROXY_UI_PROXY_CONFIG_SERVICE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "chrome/browser/chromeos/ui_proxy_config.h" | 11 #include "chromeos/chromeos_export.h" |
| 12 #include "chromeos/network/proxy/ui_proxy_config.h" |
| 12 | 13 |
| 13 class PrefService; | 14 class PrefService; |
| 14 | 15 |
| 15 namespace chromeos { | 16 namespace chromeos { |
| 16 | 17 |
| 17 class NetworkState; | 18 class NetworkState; |
| 18 | 19 |
| 19 // This class is only accessed from the UI via Profile::GetProxyConfigTracker to | 20 // This class is only accessed from the UI via Profile::GetProxyConfigTracker to |
| 20 // allow the user to read and modify the proxy configuration via | 21 // allow the user to read and modify the proxy configuration via |
| 21 // GetProxyConfig and SetProxyConfig. | 22 // GetProxyConfig and SetProxyConfig. |
| 22 // | 23 // |
| 23 // Before reading/setting a proxy config, a network has to be selected using | 24 // Before reading/setting a proxy config, a network has to be selected using |
| 24 // either SetCurrentNetwork (any remembered network) or | 25 // either SetCurrentNetwork (any remembered network) or |
| 25 // MakeActiveNetworkCurrent. | 26 // MakeActiveNetworkCurrent. |
| 26 class UIProxyConfigService { | 27 class CHROMEOS_EXPORT UIProxyConfigService { |
| 27 public: | 28 public: |
| 28 UIProxyConfigService(); | 29 UIProxyConfigService(); |
| 29 ~UIProxyConfigService(); | 30 ~UIProxyConfigService(); |
| 30 | 31 |
| 31 // After this call, proxy settings are read from |profile_prefs| and | 32 // After this call, proxy settings are read from |profile_prefs| and |
| 32 // |local_state_prefs|. In case of usage for the sign-in screen, | 33 // |local_state_prefs|. In case of usage for the sign-in screen, |
| 33 // |profile_prefs| must be NULL because sign-in screen should depend only on | 34 // |profile_prefs| must be NULL because sign-in screen should depend only on |
| 34 // shared settings. | 35 // shared settings. |
| 35 void SetPrefs(PrefService* profile_prefs, PrefService* local_state_prefs); | 36 void SetPrefs(PrefService* profile_prefs, PrefService* local_state_prefs); |
| 36 | 37 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 PrefService* profile_prefs_; | 69 PrefService* profile_prefs_; |
| 69 | 70 |
| 70 // Not owned. | 71 // Not owned. |
| 71 PrefService* local_state_prefs_; | 72 PrefService* local_state_prefs_; |
| 72 | 73 |
| 73 DISALLOW_COPY_AND_ASSIGN(UIProxyConfigService); | 74 DISALLOW_COPY_AND_ASSIGN(UIProxyConfigService); |
| 74 }; | 75 }; |
| 75 | 76 |
| 76 } // namespace chromeos | 77 } // namespace chromeos |
| 77 | 78 |
| 78 #endif // CHROME_BROWSER_CHROMEOS_UI_PROXY_CONFIG_SERVICE_H_ | 79 #endif // CHROMEOS_NETWORK_PROXY_UI_PROXY_CONFIG_SERVICE_H_ |
| OLD | NEW |