Chromium Code Reviews| Index: chromeos/network/network_handler.cc |
| diff --git a/chromeos/network/network_handler.cc b/chromeos/network/network_handler.cc |
| index d1c1b51673ac0ddc8ceadfd6e41ff0bbf079c718..de11a4d09a827ec0708c95e85a07f174f42393f0 100644 |
| --- a/chromeos/network/network_handler.cc |
| +++ b/chromeos/network/network_handler.cc |
| @@ -22,6 +22,7 @@ |
| #include "chromeos/network/network_state_handler.h" |
| #include "chromeos/network/network_state_handler_observer.h" |
| #include "chromeos/network/prohibited_technologies_handler.h" |
| +#include "chromeos/network/proxy/ui_proxy_config_service.h" |
| namespace chromeos { |
| @@ -112,6 +113,12 @@ bool NetworkHandler::IsInitialized() { |
| return g_network_handler; |
| } |
| +void NetworkHandler::InitializePrefServices(PrefService* device_prefs, |
| + PrefService* profile_prefs) { |
| + ui_proxy_config_service_.reset( |
| + new UIProxyConfigService(profile_prefs, device_prefs)); |
|
James Cook
2016/11/01 23:02:04
It's confusing to me that InitializePrefServices()
stevenjb
2016/11/01 23:55:11
Agreed it's confusing. Was trying to minimize chur
|
| +} |
| + |
| NetworkStateHandler* NetworkHandler::network_state_handler() { |
| return network_state_handler_.get(); |
| } |
| @@ -154,4 +161,9 @@ NetworkHandler::prohibited_technologies_handler() { |
| return prohibited_technologies_handler_.get(); |
| } |
| +UIProxyConfigService* NetworkHandler::ui_proxy_config_service() { |
| + CHECK(ui_proxy_config_service_.get()); |
| + return ui_proxy_config_service_.get(); |
| +} |
| + |
| } // namespace chromeos |