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

Side by Side Diff: chrome/browser/chromeos/policy/user_network_configuration_updater.h

Issue 580283005: Revert of Make ONCCertificateImporter async. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nss_util_deadcode
Patch Set: Created 6 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
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 CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 private: 88 private:
89 class CrosTrustAnchorProvider; 89 class CrosTrustAnchorProvider;
90 90
91 UserNetworkConfigurationUpdater( 91 UserNetworkConfigurationUpdater(
92 Profile* profile, 92 Profile* profile,
93 bool allow_trusted_certs_from_policy, 93 bool allow_trusted_certs_from_policy,
94 const user_manager::User& user, 94 const user_manager::User& user,
95 PolicyService* policy_service, 95 PolicyService* policy_service,
96 chromeos::ManagedNetworkConfigurationHandler* network_config_handler); 96 chromeos::ManagedNetworkConfigurationHandler* network_config_handler);
97 97
98 // Called by the CertificateImporter when an import finished.
99 void OnCertificatesImported(
100 bool success,
101 const net::CertificateList& onc_trusted_certificates);
102
103 // NetworkConfigurationUpdater: 98 // NetworkConfigurationUpdater:
104 virtual void ImportCertificates( 99 virtual void ImportCertificates(
105 const base::ListValue& certificates_onc) OVERRIDE; 100 const base::ListValue& certificates_onc) OVERRIDE;
106 virtual void ApplyNetworkPolicy( 101 virtual void ApplyNetworkPolicy(
107 base::ListValue* network_configs_onc, 102 base::ListValue* network_configs_onc,
108 base::DictionaryValue* global_network_config) OVERRIDE; 103 base::DictionaryValue* global_network_config) OVERRIDE;
109 104
110 // content::NotificationObserver implementation. Observes the profile to which 105 // content::NotificationObserver implementation. Observes the profile to which
111 // |this| belongs to for PROFILE_ADDED notification. 106 // |this| belongs to for PROFILE_ADDED notification.
112 virtual void Observe(int type, 107 virtual void Observe(int type,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 content::NotificationRegistrar registrar_; 143 content::NotificationRegistrar registrar_;
149 144
150 base::WeakPtrFactory<UserNetworkConfigurationUpdater> weak_factory_; 145 base::WeakPtrFactory<UserNetworkConfigurationUpdater> weak_factory_;
151 146
152 DISALLOW_COPY_AND_ASSIGN(UserNetworkConfigurationUpdater); 147 DISALLOW_COPY_AND_ASSIGN(UserNetworkConfigurationUpdater);
153 }; 148 };
154 149
155 } // namespace policy 150 } // namespace policy
156 151
157 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_H_ 152 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698