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

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

Issue 23872021: Use Name not SSID in CopyIdentifyingProperties (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Eliminate CopyIdentifyingProperties 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
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_SHILL_PROPERTY_UTIL_H_ 5 #ifndef CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_
6 #define CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_ 6 #define CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 24 matching lines...) Expand all
35 // |shill_dictionary|. If parsing fails or the field doesn't exist, returns 35 // |shill_dictionary|. If parsing fails or the field doesn't exist, returns
36 // NULL. 36 // NULL.
37 scoped_ptr<NetworkUIData> GetUIDataFromProperties( 37 scoped_ptr<NetworkUIData> GetUIDataFromProperties(
38 const base::DictionaryValue& shill_dictionary); 38 const base::DictionaryValue& shill_dictionary);
39 39
40 // Sets the UIData property in |shill_dictionary| to the serialization of 40 // Sets the UIData property in |shill_dictionary| to the serialization of
41 // |ui_data|. 41 // |ui_data|.
42 void SetUIData(const NetworkUIData& ui_data, 42 void SetUIData(const NetworkUIData& ui_data,
43 base::DictionaryValue* shill_dictionary); 43 base::DictionaryValue* shill_dictionary);
44 44
45 // Copy configuration properties required by Shill to identify a network.
46 // Only WiFi, VPN, Ethernet and EthernetEAP are supported. WiMax and Cellular
47 // are not supported. Returns true only if all required properties could be
48 // copied.
49 bool CopyIdentifyingProperties(const base::DictionaryValue& service_properties,
pneubeck (no reviews) 2013/09/14 16:04:25 please keep this function as it was. I made it vis
stevenjb 2013/09/16 16:29:49 OK, but let's make sure we use it soon or remove i
50 base::DictionaryValue* dest);
51
52 } // namespace shill_property_util 45 } // namespace shill_property_util
53 46
54 class CHROMEOS_EXPORT NetworkTypePattern { 47 class CHROMEOS_EXPORT NetworkTypePattern {
55 public: 48 public:
56 // Matches any network. 49 // Matches any network.
57 static NetworkTypePattern Default(); 50 static NetworkTypePattern Default();
58 51
59 // Matches wireless networks 52 // Matches wireless networks
60 static NetworkTypePattern Wireless(); 53 static NetworkTypePattern Wireless();
61 54
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 89
97 // The bit array of the matching network types. 90 // The bit array of the matching network types.
98 int pattern_; 91 int pattern_;
99 92
100 DISALLOW_ASSIGN(NetworkTypePattern); 93 DISALLOW_ASSIGN(NetworkTypePattern);
101 }; 94 };
102 95
103 } // namespace chromeos 96 } // namespace chromeos
104 97
105 #endif // CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_ 98 #endif // CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698