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

Side by Side Diff: chrome/browser/chromeos/cros/network_library_impl_base.h

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix trust update. Add a utils test. Remove X509 dependency from Shill parsing. Created 7 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CROS_NETWORK_LIBRARY_IMPL_BASE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_ 6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 10
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 virtual void ForgetNetwork(const std::string& service_path) OVERRIDE; 216 virtual void ForgetNetwork(const std::string& service_path) OVERRIDE;
217 virtual void EnableEthernetNetworkDevice(bool enable) OVERRIDE; 217 virtual void EnableEthernetNetworkDevice(bool enable) OVERRIDE;
218 virtual void EnableWifiNetworkDevice(bool enable) OVERRIDE; 218 virtual void EnableWifiNetworkDevice(bool enable) OVERRIDE;
219 virtual void EnableMobileNetworkDevice(bool enable) OVERRIDE; 219 virtual void EnableMobileNetworkDevice(bool enable) OVERRIDE;
220 virtual void EnableWimaxNetworkDevice(bool enable) OVERRIDE; 220 virtual void EnableWimaxNetworkDevice(bool enable) OVERRIDE;
221 virtual void EnableCellularNetworkDevice(bool enable) OVERRIDE; 221 virtual void EnableCellularNetworkDevice(bool enable) OVERRIDE;
222 // virtual EnableOfflineMode implemented in derived classes. 222 // virtual EnableOfflineMode implemented in derived classes.
223 // virtual GetIPConfigs implemented in derived classes. 223 // virtual GetIPConfigs implemented in derived classes.
224 // virtual SetIPConfig implemented in derived classes. 224 // virtual SetIPConfig implemented in derived classes.
225 virtual void SwitchToPreferredNetwork() OVERRIDE; 225 virtual void SwitchToPreferredNetwork() OVERRIDE;
226 virtual void LoadOncNetworks(const base::ListValue& network_configs, 226 virtual void LoadOncNetworks(
227 onc::ONCSource source) OVERRIDE; 227 const base::ListValue& network_configs,
228 onc::ONCSource source,
229 const base::Callback<std::string(const std::string&)>&
230 fingerprint_to_pem) OVERRIDE;
stevenjb 2013/06/27 16:50:04 Use typedef
pneubeck (no reviews) 2013/06/28 09:41:03 Done.
228 virtual bool SetActiveNetwork(ConnectionType type, 231 virtual bool SetActiveNetwork(ConnectionType type,
229 const std::string& service_path) OVERRIDE; 232 const std::string& service_path) OVERRIDE;
230 233
231 protected: 234 protected:
232 typedef ObserverList<NetworkObserver> NetworkObserverList; 235 typedef ObserverList<NetworkObserver> NetworkObserverList;
233 typedef std::map<std::string, NetworkObserverList*> NetworkObserverMap; 236 typedef std::map<std::string, NetworkObserverList*> NetworkObserverMap;
234 237
235 typedef ObserverList<NetworkDeviceObserver> NetworkDeviceObserverList; 238 typedef ObserverList<NetworkDeviceObserver> NetworkDeviceObserverList;
236 typedef std::map<std::string, NetworkDeviceObserverList*> 239 typedef std::map<std::string, NetworkDeviceObserverList*>
237 NetworkDeviceObserverMap; 240 NetworkDeviceObserverMap;
(...skipping 18 matching lines...) Expand all
256 struct ConnectData { 259 struct ConnectData {
257 ConnectData(); 260 ConnectData();
258 ~ConnectData(); 261 ~ConnectData();
259 ConnectionSecurity security; 262 ConnectionSecurity security;
260 std::string service_name; // For example, SSID. 263 std::string service_name; // For example, SSID.
261 std::string username; 264 std::string username;
262 std::string passphrase; 265 std::string passphrase;
263 std::string otp; 266 std::string otp;
264 std::string group_name; 267 std::string group_name;
265 std::string server_hostname; 268 std::string server_hostname;
266 std::string server_ca_cert_nss_nickname; 269 std::string server_ca_cert_fingerprint;
267 std::string client_cert_pkcs11_id; 270 std::string client_cert_pkcs11_id;
268 EAPMethod eap_method; 271 EAPMethod eap_method;
269 EAPPhase2Auth eap_auth; 272 EAPPhase2Auth eap_auth;
270 bool eap_use_system_cas; 273 bool eap_use_system_cas;
271 std::string eap_identity; 274 std::string eap_identity;
272 std::string eap_anonymous_identity; 275 std::string eap_anonymous_identity;
273 std::string psk_key; 276 std::string psk_key;
274 bool save_credentials; 277 bool save_credentials;
275 NetworkProfileType profile_type; 278 NetworkProfileType profile_type;
276 }; 279 };
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 // stray networks that shill still has on file, but are not known on the 478 // stray networks that shill still has on file, but are not known on the
476 // Chrome side. 479 // Chrome side.
477 NetworkSourceMap network_source_map_; 480 NetworkSourceMap network_source_map_;
478 481
479 DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase); 482 DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase);
480 }; 483 };
481 484
482 } // namespace chromeos 485 } // namespace chromeos
483 486
484 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_ 487 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698