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 #include "chromeos/network/network_handler.h" | 5 #include "chromeos/network/network_handler.h" |
6 | 6 |
7 #include "base/threading/thread_task_runner_handle.h" | 7 #include "base/threading/thread_task_runner_handle.h" |
8 #include "base/threading/worker_pool.h" | 8 #include "base/threading/worker_pool.h" |
9 #include "chromeos/dbus/dbus_thread_manager.h" | 9 #include "chromeos/dbus/dbus_thread_manager.h" |
10 #include "chromeos/network/auto_connect_handler.h" | 10 #include "chromeos/network/auto_connect_handler.h" |
(...skipping 27 matching lines...) Expand all Loading... | |
38 network_configuration_handler_.reset(new NetworkConfigurationHandler()); | 38 network_configuration_handler_.reset(new NetworkConfigurationHandler()); |
39 managed_network_configuration_handler_.reset( | 39 managed_network_configuration_handler_.reset( |
40 new ManagedNetworkConfigurationHandlerImpl()); | 40 new ManagedNetworkConfigurationHandlerImpl()); |
41 prohibited_technologies_handler_.reset(new ProhibitedTechnologiesHandler()); | 41 prohibited_technologies_handler_.reset(new ProhibitedTechnologiesHandler()); |
42 if (CertLoader::IsInitialized()) { | 42 if (CertLoader::IsInitialized()) { |
43 auto_connect_handler_.reset(new AutoConnectHandler()); | 43 auto_connect_handler_.reset(new AutoConnectHandler()); |
44 network_cert_migrator_.reset(new NetworkCertMigrator()); | 44 network_cert_migrator_.reset(new NetworkCertMigrator()); |
45 client_cert_resolver_.reset(new ClientCertResolver()); | 45 client_cert_resolver_.reset(new ClientCertResolver()); |
46 } | 46 } |
47 network_activation_handler_.reset(new NetworkActivationHandler()); | 47 network_activation_handler_.reset(new NetworkActivationHandler()); |
48 network_connection_handler_.reset(new NetworkConnectionHandler()); | 48 network_connection_handler_ = NetworkConnectionHandler::Create(); |
stevenjb
2017/05/03 22:05:38
same here
Kyle Horimoto
2017/05/03 22:38:30
Done.
| |
49 network_sms_handler_.reset(new NetworkSmsHandler()); | 49 network_sms_handler_.reset(new NetworkSmsHandler()); |
50 geolocation_handler_.reset(new GeolocationHandler()); | 50 geolocation_handler_.reset(new GeolocationHandler()); |
51 } | 51 } |
52 | 52 |
53 NetworkHandler::~NetworkHandler() { | 53 NetworkHandler::~NetworkHandler() { |
54 network_state_handler_->Shutdown(); | 54 network_state_handler_->Shutdown(); |
55 } | 55 } |
56 | 56 |
57 void NetworkHandler::Init() { | 57 void NetworkHandler::Init() { |
58 network_state_handler_->InitShillPropertyHandler(); | 58 network_state_handler_->InitShillPropertyHandler(); |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
165 NetworkHandler::prohibited_technologies_handler() { | 165 NetworkHandler::prohibited_technologies_handler() { |
166 return prohibited_technologies_handler_.get(); | 166 return prohibited_technologies_handler_.get(); |
167 } | 167 } |
168 | 168 |
169 UIProxyConfigService* NetworkHandler::ui_proxy_config_service() { | 169 UIProxyConfigService* NetworkHandler::ui_proxy_config_service() { |
170 CHECK(ui_proxy_config_service_.get()); | 170 CHECK(ui_proxy_config_service_.get()); |
171 return ui_proxy_config_service_.get(); | 171 return ui_proxy_config_service_.get(); |
172 } | 172 } |
173 | 173 |
174 } // namespace chromeos | 174 } // namespace chromeos |
OLD | NEW |