| Index: chromeos/network/network_handler.cc
|
| diff --git a/chromeos/network/network_handler.cc b/chromeos/network/network_handler.cc
|
| index ae2671046c0c35981dc4200bdba16d0ad0fae0c5..e54c9351717f6f68ec376deff462ae956f97bdb6 100644
|
| --- a/chromeos/network/network_handler.cc
|
| +++ b/chromeos/network/network_handler.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/threading/worker_pool.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| +#include "chromeos/network/auto_connect_handler.h"
|
| #include "chromeos/network/client_cert_resolver.h"
|
| #include "chromeos/network/geolocation_handler.h"
|
| #include "chromeos/network/managed_network_configuration_handler_impl.h"
|
| @@ -38,6 +39,7 @@ NetworkHandler::NetworkHandler()
|
| managed_network_configuration_handler_.reset(
|
| new ManagedNetworkConfigurationHandlerImpl());
|
| if (CertLoader::IsInitialized()) {
|
| + auto_connect_handler_.reset(new AutoConnectHandler());
|
| network_cert_migrator_.reset(new NetworkCertMigrator());
|
| client_cert_resolver_.reset(new ClientCertResolver());
|
| }
|
| @@ -71,6 +73,12 @@ void NetworkHandler::Init() {
|
| client_cert_resolver_->Init(network_state_handler_.get(),
|
| managed_network_configuration_handler_.get());
|
| }
|
| + if (auto_connect_handler_) {
|
| + auto_connect_handler_->Init(client_cert_resolver_.get(),
|
| + network_connection_handler_.get(),
|
| + network_state_handler_.get(),
|
| + managed_network_configuration_handler_.get());
|
| + }
|
| network_sms_handler_->Init();
|
| geolocation_handler_->Init();
|
| }
|
|
|