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 "chromeos/dbus/dbus_thread_manager.h" | 8 #include "chromeos/dbus/dbus_thread_manager.h" |
9 #include "chromeos/network/auto_connect_handler.h" | 9 #include "chromeos/network/auto_connect_handler.h" |
10 #include "chromeos/network/client_cert_resolver.h" | 10 #include "chromeos/network/client_cert_resolver.h" |
11 #include "chromeos/network/geolocation_handler.h" | 11 #include "chromeos/network/geolocation_handler.h" |
12 #include "chromeos/network/managed_network_configuration_handler_impl.h" | 12 #include "chromeos/network/managed_network_configuration_handler_impl.h" |
13 #include "chromeos/network/network_activation_handler.h" | 13 #include "chromeos/network/network_activation_handler.h" |
14 #include "chromeos/network/network_cert_migrator.h" | 14 #include "chromeos/network/network_cert_migrator.h" |
| 15 #include "chromeos/network/network_certificate_handler.h" |
15 #include "chromeos/network/network_configuration_handler.h" | 16 #include "chromeos/network/network_configuration_handler.h" |
16 #include "chromeos/network/network_connection_handler_impl.h" | 17 #include "chromeos/network/network_connection_handler_impl.h" |
17 #include "chromeos/network/network_device_handler_impl.h" | 18 #include "chromeos/network/network_device_handler_impl.h" |
18 #include "chromeos/network/network_profile_handler.h" | 19 #include "chromeos/network/network_profile_handler.h" |
19 #include "chromeos/network/network_profile_observer.h" | 20 #include "chromeos/network/network_profile_observer.h" |
20 #include "chromeos/network/network_sms_handler.h" | 21 #include "chromeos/network/network_sms_handler.h" |
21 #include "chromeos/network/network_state_handler.h" | 22 #include "chromeos/network/network_state_handler.h" |
22 #include "chromeos/network/network_state_handler_observer.h" | 23 #include "chromeos/network/network_state_handler_observer.h" |
23 #include "chromeos/network/prohibited_technologies_handler.h" | 24 #include "chromeos/network/prohibited_technologies_handler.h" |
24 #include "chromeos/network/proxy/ui_proxy_config_service.h" | 25 #include "chromeos/network/proxy/ui_proxy_config_service.h" |
25 | 26 |
26 namespace chromeos { | 27 namespace chromeos { |
27 | 28 |
28 static NetworkHandler* g_network_handler = NULL; | 29 static NetworkHandler* g_network_handler = NULL; |
29 | 30 |
30 NetworkHandler::NetworkHandler() | 31 NetworkHandler::NetworkHandler() |
31 : task_runner_(base::ThreadTaskRunnerHandle::Get()) { | 32 : task_runner_(base::ThreadTaskRunnerHandle::Get()) { |
32 CHECK(DBusThreadManager::IsInitialized()); | 33 CHECK(DBusThreadManager::IsInitialized()); |
33 | 34 |
34 network_state_handler_.reset(new NetworkStateHandler()); | 35 network_state_handler_.reset(new NetworkStateHandler()); |
35 network_device_handler_.reset(new NetworkDeviceHandlerImpl()); | 36 network_device_handler_.reset(new NetworkDeviceHandlerImpl()); |
36 network_profile_handler_.reset(new NetworkProfileHandler()); | 37 network_profile_handler_.reset(new NetworkProfileHandler()); |
37 network_configuration_handler_.reset(new NetworkConfigurationHandler()); | 38 network_configuration_handler_.reset(new NetworkConfigurationHandler()); |
38 managed_network_configuration_handler_.reset( | 39 managed_network_configuration_handler_.reset( |
39 new ManagedNetworkConfigurationHandlerImpl()); | 40 new ManagedNetworkConfigurationHandlerImpl()); |
40 prohibited_technologies_handler_.reset(new ProhibitedTechnologiesHandler()); | 41 prohibited_technologies_handler_.reset(new ProhibitedTechnologiesHandler()); |
41 if (CertLoader::IsInitialized()) { | 42 if (CertLoader::IsInitialized()) { |
42 auto_connect_handler_.reset(new AutoConnectHandler()); | 43 auto_connect_handler_.reset(new AutoConnectHandler()); |
43 network_cert_migrator_.reset(new NetworkCertMigrator()); | 44 network_cert_migrator_.reset(new NetworkCertMigrator()); |
| 45 network_certificate_handler_.reset(new NetworkCertificateHandler()); |
44 client_cert_resolver_.reset(new ClientCertResolver()); | 46 client_cert_resolver_.reset(new ClientCertResolver()); |
45 } | 47 } |
46 network_activation_handler_.reset(new NetworkActivationHandler()); | 48 network_activation_handler_.reset(new NetworkActivationHandler()); |
47 network_connection_handler_.reset(new NetworkConnectionHandlerImpl()); | 49 network_connection_handler_.reset(new NetworkConnectionHandlerImpl()); |
48 network_sms_handler_.reset(new NetworkSmsHandler()); | 50 network_sms_handler_.reset(new NetworkSmsHandler()); |
49 geolocation_handler_.reset(new GeolocationHandler()); | 51 geolocation_handler_.reset(new GeolocationHandler()); |
50 } | 52 } |
51 | 53 |
52 NetworkHandler::~NetworkHandler() { | 54 NetworkHandler::~NetworkHandler() { |
53 network_state_handler_->Shutdown(); | 55 network_state_handler_->Shutdown(); |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 | 143 |
142 ManagedNetworkConfigurationHandler* | 144 ManagedNetworkConfigurationHandler* |
143 NetworkHandler::managed_network_configuration_handler() { | 145 NetworkHandler::managed_network_configuration_handler() { |
144 return managed_network_configuration_handler_.get(); | 146 return managed_network_configuration_handler_.get(); |
145 } | 147 } |
146 | 148 |
147 NetworkActivationHandler* NetworkHandler::network_activation_handler() { | 149 NetworkActivationHandler* NetworkHandler::network_activation_handler() { |
148 return network_activation_handler_.get(); | 150 return network_activation_handler_.get(); |
149 } | 151 } |
150 | 152 |
| 153 NetworkCertificateHandler* NetworkHandler::network_certificate_handler() { |
| 154 return network_certificate_handler_.get(); |
| 155 } |
| 156 |
151 NetworkConnectionHandler* NetworkHandler::network_connection_handler() { | 157 NetworkConnectionHandler* NetworkHandler::network_connection_handler() { |
152 return network_connection_handler_.get(); | 158 return network_connection_handler_.get(); |
153 } | 159 } |
154 | 160 |
155 NetworkSmsHandler* NetworkHandler::network_sms_handler() { | 161 NetworkSmsHandler* NetworkHandler::network_sms_handler() { |
156 return network_sms_handler_.get(); | 162 return network_sms_handler_.get(); |
157 } | 163 } |
158 | 164 |
159 GeolocationHandler* NetworkHandler::geolocation_handler() { | 165 GeolocationHandler* NetworkHandler::geolocation_handler() { |
160 return geolocation_handler_.get(); | 166 return geolocation_handler_.get(); |
161 } | 167 } |
162 | 168 |
163 ProhibitedTechnologiesHandler* | 169 ProhibitedTechnologiesHandler* |
164 NetworkHandler::prohibited_technologies_handler() { | 170 NetworkHandler::prohibited_technologies_handler() { |
165 return prohibited_technologies_handler_.get(); | 171 return prohibited_technologies_handler_.get(); |
166 } | 172 } |
167 | 173 |
168 UIProxyConfigService* NetworkHandler::ui_proxy_config_service() { | 174 UIProxyConfigService* NetworkHandler::ui_proxy_config_service() { |
169 CHECK(ui_proxy_config_service_.get()); | 175 CHECK(ui_proxy_config_service_.get()); |
170 return ui_proxy_config_service_.get(); | 176 return ui_proxy_config_service_.get(); |
171 } | 177 } |
172 | 178 |
173 } // namespace chromeos | 179 } // namespace chromeos |
OLD | NEW |