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/thread_task_runner_handle.h" | 7 #include "base/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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 network_cert_migrator_.reset(new NetworkCertMigrator()); | 43 network_cert_migrator_.reset(new NetworkCertMigrator()); |
44 client_cert_resolver_.reset(new ClientCertResolver()); | 44 client_cert_resolver_.reset(new ClientCertResolver()); |
45 } | 45 } |
46 network_activation_handler_.reset(new NetworkActivationHandler()); | 46 network_activation_handler_.reset(new NetworkActivationHandler()); |
47 network_connection_handler_.reset(new NetworkConnectionHandler()); | 47 network_connection_handler_.reset(new NetworkConnectionHandler()); |
48 network_sms_handler_.reset(new NetworkSmsHandler()); | 48 network_sms_handler_.reset(new NetworkSmsHandler()); |
49 geolocation_handler_.reset(new GeolocationHandler()); | 49 geolocation_handler_.reset(new GeolocationHandler()); |
50 } | 50 } |
51 | 51 |
52 NetworkHandler::~NetworkHandler() { | 52 NetworkHandler::~NetworkHandler() { |
| 53 network_state_handler_->Shutdown(); |
53 } | 54 } |
54 | 55 |
55 void NetworkHandler::Init() { | 56 void NetworkHandler::Init() { |
56 network_state_handler_->InitShillPropertyHandler(); | 57 network_state_handler_->InitShillPropertyHandler(); |
57 network_device_handler_->Init(network_state_handler_.get()); | 58 network_device_handler_->Init(network_state_handler_.get()); |
58 network_profile_handler_->Init(); | 59 network_profile_handler_->Init(); |
59 network_configuration_handler_->Init(network_state_handler_.get(), | 60 network_configuration_handler_->Init(network_state_handler_.get(), |
60 network_device_handler_.get()); | 61 network_device_handler_.get()); |
61 managed_network_configuration_handler_->Init( | 62 managed_network_configuration_handler_->Init( |
62 network_state_handler_.get(), network_profile_handler_.get(), | 63 network_state_handler_.get(), network_profile_handler_.get(), |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 GeolocationHandler* NetworkHandler::geolocation_handler() { | 148 GeolocationHandler* NetworkHandler::geolocation_handler() { |
148 return geolocation_handler_.get(); | 149 return geolocation_handler_.get(); |
149 } | 150 } |
150 | 151 |
151 ProhibitedTechnologiesHandler* | 152 ProhibitedTechnologiesHandler* |
152 NetworkHandler::prohibited_technologies_handler() { | 153 NetworkHandler::prohibited_technologies_handler() { |
153 return prohibited_technologies_handler_.get(); | 154 return prohibited_technologies_handler_.get(); |
154 } | 155 } |
155 | 156 |
156 } // namespace chromeos | 157 } // namespace chromeos |
OLD | NEW |