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

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

Issue 10826225: Clean-up inline members of nested classes (chrome/browser/chromeos/) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgotten files Created 8 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
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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 255
256 typedef std::map<std::string, Network*> NetworkMap; 256 typedef std::map<std::string, Network*> NetworkMap;
257 typedef std::map<std::string, int> PriorityMap; 257 typedef std::map<std::string, int> PriorityMap;
258 typedef std::map<std::string, NetworkDevice*> NetworkDeviceMap; 258 typedef std::map<std::string, NetworkDevice*> NetworkDeviceMap;
259 typedef std::map<std::string, CellularDataPlanVector*> CellularDataPlanMap; 259 typedef std::map<std::string, CellularDataPlanVector*> CellularDataPlanMap;
260 typedef std::map<std::string, const base::DictionaryValue*> NetworkOncMap; 260 typedef std::map<std::string, const base::DictionaryValue*> NetworkOncMap;
261 typedef std::map<NetworkUIData::ONCSource, 261 typedef std::map<NetworkUIData::ONCSource,
262 std::set<std::string> > NetworkSourceMap; 262 std::set<std::string> > NetworkSourceMap;
263 263
264 struct NetworkProfile { 264 struct NetworkProfile {
265 NetworkProfile(const std::string& p, NetworkProfileType t) 265 NetworkProfile(const std::string& p, NetworkProfileType t);
266 : path(p), type(t) {} 266 ~NetworkProfile();
267 ~NetworkProfile() {}
268 std::string path; 267 std::string path;
269 NetworkProfileType type; 268 NetworkProfileType type;
270 typedef std::set<std::string> ServiceList; 269 typedef std::set<std::string> ServiceList;
271 ServiceList services; 270 ServiceList services;
272 }; 271 };
273 typedef std::list<NetworkProfile> NetworkProfileList; 272 typedef std::list<NetworkProfile> NetworkProfileList;
274 273
275 struct ConnectData { 274 struct ConnectData {
276 ConnectData() : 275 ConnectData();
277 security(SECURITY_NONE), 276 ~ConnectData();
278 eap_method(EAP_METHOD_UNKNOWN),
279 eap_auth(EAP_PHASE_2_AUTH_AUTO),
280 eap_use_system_cas(false),
281 save_credentials(false),
282 profile_type(PROFILE_NONE) {}
283 ~ConnectData() {}
284 ConnectionSecurity security; 277 ConnectionSecurity security;
285 std::string service_name; // For example, SSID. 278 std::string service_name; // For example, SSID.
286 std::string username; 279 std::string username;
287 std::string passphrase; 280 std::string passphrase;
288 std::string otp; 281 std::string otp;
289 std::string group_name; 282 std::string group_name;
290 std::string server_hostname; 283 std::string server_hostname;
291 std::string server_ca_cert_nss_nickname; 284 std::string server_ca_cert_nss_nickname;
292 std::string client_cert_pkcs11_id; 285 std::string client_cert_pkcs11_id;
293 EAPMethod eap_method; 286 EAPMethod eap_method;
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 // stray networks that flimflam still has on file, but are not known on the 509 // stray networks that flimflam still has on file, but are not known on the
517 // Chrome side. 510 // Chrome side.
518 NetworkSourceMap network_source_map_; 511 NetworkSourceMap network_source_map_;
519 512
520 DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase); 513 DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase);
521 }; 514 };
522 515
523 } // namespace chromeos 516 } // namespace chromeos
524 517
525 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_ 518 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/cros/network_library_impl_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698