Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: chromeos/network/network_handler.cc

Issue 22611005: Switch over MobileActivator to use Network*Handler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ws Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/network_state.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/worker_pool.h" 7 #include "base/threading/worker_pool.h"
8 #include "chromeos/dbus/dbus_thread_manager.h" 8 #include "chromeos/dbus/dbus_thread_manager.h"
9 #include "chromeos/network/client_cert_resolver.h" 9 #include "chromeos/network/client_cert_resolver.h"
10 #include "chromeos/network/geolocation_handler.h" 10 #include "chromeos/network/geolocation_handler.h"
11 #include "chromeos/network/managed_network_configuration_handler_impl.h" 11 #include "chromeos/network/managed_network_configuration_handler_impl.h"
12 #include "chromeos/network/network_activation_handler.h"
12 #include "chromeos/network/network_cert_migrator.h" 13 #include "chromeos/network/network_cert_migrator.h"
13 #include "chromeos/network/network_configuration_handler.h" 14 #include "chromeos/network/network_configuration_handler.h"
14 #include "chromeos/network/network_connection_handler.h" 15 #include "chromeos/network/network_connection_handler.h"
15 #include "chromeos/network/network_device_handler.h" 16 #include "chromeos/network/network_device_handler.h"
16 #include "chromeos/network/network_event_log.h" 17 #include "chromeos/network/network_event_log.h"
17 #include "chromeos/network/network_profile_handler.h" 18 #include "chromeos/network/network_profile_handler.h"
18 #include "chromeos/network/network_profile_observer.h" 19 #include "chromeos/network/network_profile_observer.h"
19 #include "chromeos/network/network_sms_handler.h" 20 #include "chromeos/network/network_sms_handler.h"
20 #include "chromeos/network/network_state_handler.h" 21 #include "chromeos/network/network_state_handler.h"
21 #include "chromeos/network/network_state_handler_observer.h" 22 #include "chromeos/network/network_state_handler_observer.h"
(...skipping 11 matching lines...) Expand all
33 network_state_handler_.reset(new NetworkStateHandler()); 34 network_state_handler_.reset(new NetworkStateHandler());
34 network_device_handler_.reset(new NetworkDeviceHandler()); 35 network_device_handler_.reset(new NetworkDeviceHandler());
35 network_profile_handler_.reset(new NetworkProfileHandler()); 36 network_profile_handler_.reset(new NetworkProfileHandler());
36 network_configuration_handler_.reset(new NetworkConfigurationHandler()); 37 network_configuration_handler_.reset(new NetworkConfigurationHandler());
37 managed_network_configuration_handler_.reset( 38 managed_network_configuration_handler_.reset(
38 new ManagedNetworkConfigurationHandlerImpl()); 39 new ManagedNetworkConfigurationHandlerImpl());
39 if (CertLoader::IsInitialized()) { 40 if (CertLoader::IsInitialized()) {
40 network_cert_migrator_.reset(new NetworkCertMigrator()); 41 network_cert_migrator_.reset(new NetworkCertMigrator());
41 client_cert_resolver_.reset(new ClientCertResolver()); 42 client_cert_resolver_.reset(new ClientCertResolver());
42 } 43 }
44 network_activation_handler_.reset(new NetworkActivationHandler());
43 network_connection_handler_.reset(new NetworkConnectionHandler()); 45 network_connection_handler_.reset(new NetworkConnectionHandler());
44 network_sms_handler_.reset(new NetworkSmsHandler()); 46 network_sms_handler_.reset(new NetworkSmsHandler());
45 geolocation_handler_.reset(new GeolocationHandler()); 47 geolocation_handler_.reset(new GeolocationHandler());
46 } 48 }
47 49
48 NetworkHandler::~NetworkHandler() { 50 NetworkHandler::~NetworkHandler() {
49 network_event_log::Shutdown(); 51 network_event_log::Shutdown();
50 } 52 }
51 53
52 void NetworkHandler::Init() { 54 void NetworkHandler::Init() {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 111
110 NetworkConfigurationHandler* NetworkHandler::network_configuration_handler() { 112 NetworkConfigurationHandler* NetworkHandler::network_configuration_handler() {
111 return network_configuration_handler_.get(); 113 return network_configuration_handler_.get();
112 } 114 }
113 115
114 ManagedNetworkConfigurationHandler* 116 ManagedNetworkConfigurationHandler*
115 NetworkHandler::managed_network_configuration_handler() { 117 NetworkHandler::managed_network_configuration_handler() {
116 return managed_network_configuration_handler_.get(); 118 return managed_network_configuration_handler_.get();
117 } 119 }
118 120
121 NetworkActivationHandler* NetworkHandler::network_activation_handler() {
122 return network_activation_handler_.get();
123 }
124
119 NetworkConnectionHandler* NetworkHandler::network_connection_handler() { 125 NetworkConnectionHandler* NetworkHandler::network_connection_handler() {
120 return network_connection_handler_.get(); 126 return network_connection_handler_.get();
121 } 127 }
122 128
123 NetworkSmsHandler* NetworkHandler::network_sms_handler() { 129 NetworkSmsHandler* NetworkHandler::network_sms_handler() {
124 return network_sms_handler_.get(); 130 return network_sms_handler_.get();
125 } 131 }
126 132
127 GeolocationHandler* NetworkHandler::geolocation_handler() { 133 GeolocationHandler* NetworkHandler::geolocation_handler() {
128 return geolocation_handler_.get(); 134 return geolocation_handler_.get();
129 } 135 }
130 136
131 } // namespace chromeos 137 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/network_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698