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

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

Issue 20087002: Add migration from CaCert NSS nicknames to PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests depending on NetworkHandler and not on CertLoader. Created 7 years, 4 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_cert_migrator_unittest.cc ('k') | chromeos/network/network_handler.cc » ('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 #ifndef CHROMEOS_NETWORK_NETWORK_HANDLER_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_HANDLER_H_
6 #define CHROMEOS_NETWORK_NETWORK_HANDLER_H_ 6 #define CHROMEOS_NETWORK_NETWORK_HANDLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chromeos/chromeos_export.h" 10 #include "chromeos/chromeos_export.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 13
14 class GeolocationHandler; 14 class GeolocationHandler;
15 class ManagedNetworkConfigurationHandler; 15 class ManagedNetworkConfigurationHandler;
16 class NetworkCertMigrator;
16 class NetworkConfigurationHandler; 17 class NetworkConfigurationHandler;
17 class NetworkConnectionHandler; 18 class NetworkConnectionHandler;
18 class NetworkDeviceHandler; 19 class NetworkDeviceHandler;
19 class NetworkProfileHandler; 20 class NetworkProfileHandler;
20 class NetworkStateHandler; 21 class NetworkStateHandler;
21 22
22 // Class for handling initialization and access to chromeos network handlers. 23 // Class for handling initialization and access to chromeos network handlers.
23 // This class should NOT be used in unit tests. Instead, construct individual 24 // This class should NOT be used in unit tests. Instead, construct individual
24 // classes independently. 25 // classes independently.
25 class CHROMEOS_EXPORT NetworkHandler { 26 class CHROMEOS_EXPORT NetworkHandler {
(...skipping 24 matching lines...) Expand all
50 private: 51 private:
51 NetworkHandler(); 52 NetworkHandler();
52 virtual ~NetworkHandler(); 53 virtual ~NetworkHandler();
53 54
54 void Init(); 55 void Init();
55 56
56 // The order of these determines the (inverse) destruction order. 57 // The order of these determines the (inverse) destruction order.
57 scoped_ptr<NetworkStateHandler> network_state_handler_; 58 scoped_ptr<NetworkStateHandler> network_state_handler_;
58 scoped_ptr<NetworkDeviceHandler> network_device_handler_; 59 scoped_ptr<NetworkDeviceHandler> network_device_handler_;
59 scoped_ptr<NetworkProfileHandler> network_profile_handler_; 60 scoped_ptr<NetworkProfileHandler> network_profile_handler_;
61 scoped_ptr<NetworkCertMigrator> network_cert_migrator_;
60 scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_; 62 scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_;
61 scoped_ptr<ManagedNetworkConfigurationHandler> 63 scoped_ptr<ManagedNetworkConfigurationHandler>
62 managed_network_configuration_handler_; 64 managed_network_configuration_handler_;
63 scoped_ptr<NetworkConnectionHandler> network_connection_handler_; 65 scoped_ptr<NetworkConnectionHandler> network_connection_handler_;
64 scoped_ptr<GeolocationHandler> geolocation_handler_; 66 scoped_ptr<GeolocationHandler> geolocation_handler_;
65 67
66 DISALLOW_COPY_AND_ASSIGN(NetworkHandler); 68 DISALLOW_COPY_AND_ASSIGN(NetworkHandler);
67 }; 69 };
68 70
69 } // namespace chromeos 71 } // namespace chromeos
70 72
71 #endif // CHROMEOS_NETWORK_NETWORK_HANDLER_H_ 73 #endif // CHROMEOS_NETWORK_NETWORK_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_cert_migrator_unittest.cc ('k') | chromeos/network/network_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698