Chromium Code Reviews| Index: chromeos/network/network_handler.h |
| diff --git a/chromeos/network/network_handler.h b/chromeos/network/network_handler.h |
| index b2eea05c0519e88f7fdeece0bdfca77b090a5dc9..d81a56befccba1feceeae26e7e1cba55c302ae05 100644 |
| --- a/chromeos/network/network_handler.h |
| +++ b/chromeos/network/network_handler.h |
| @@ -12,6 +12,8 @@ |
| #include "base/single_thread_task_runner.h" |
| #include "chromeos/chromeos_export.h" |
| +class PrefService; |
| + |
| namespace chromeos { |
| class AutoConnectHandler; |
| @@ -29,6 +31,7 @@ class NetworkProfileHandler; |
| class NetworkStateHandler; |
| class NetworkSmsHandler; |
| class ProhibitedTechnologiesHandler; |
| +class UIProxyConfigService; |
| // Class for handling initialization and access to chromeos network handlers. |
| // This class should NOT be used in unit tests. Instead, construct individual |
| @@ -47,6 +50,11 @@ class CHROMEOS_EXPORT NetworkHandler { |
| // Returns true if the global instance has been initialized. |
| static bool IsInitialized(); |
| + // Called whenever the pref services change, e.g. on login. Initializes |
| + // services with PrefService dependencies (i.e. ui_proxy_config_service). |
| + void InitializePrefServices(PrefService* device_prefs, |
| + PrefService* profile_prefs); |
| + |
| // Returns the task runner for posting NetworkHandler calls from other |
| // threads. |
| base::SingleThreadTaskRunner* task_runner() { return task_runner_.get(); } |
| @@ -65,6 +73,9 @@ class CHROMEOS_EXPORT NetworkHandler { |
| GeolocationHandler* geolocation_handler(); |
| ProhibitedTechnologiesHandler* prohibited_technologies_handler(); |
| + // Global network configuration services. |
| + UIProxyConfigService* ui_proxy_config_service(); |
|
michaelpg
2016/11/02 05:34:51
update CL title/description
stevenjb
2016/11/02 18:03:41
Done.
|
| + |
| private: |
| NetworkHandler(); |
| virtual ~NetworkHandler(); |
| @@ -88,6 +99,7 @@ class CHROMEOS_EXPORT NetworkHandler { |
| std::unique_ptr<GeolocationHandler> geolocation_handler_; |
| std::unique_ptr<ProhibitedTechnologiesHandler> |
| prohibited_technologies_handler_; |
| + std::unique_ptr<UIProxyConfigService> ui_proxy_config_service_; |
| DISALLOW_COPY_AND_ASSIGN(NetworkHandler); |
| }; |