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

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

Issue 68213018: ONC policy: Support SSID and Security change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 7 years, 1 month 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/policy_applicator.cc ('k') | chromeos/network/shill_property_util.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_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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 void SetUIData(const NetworkUIData& ui_data, 52 void SetUIData(const NetworkUIData& ui_data,
53 base::DictionaryValue* shill_dictionary); 53 base::DictionaryValue* shill_dictionary);
54 54
55 // Copy configuration properties required by Shill to identify a network. 55 // Copy configuration properties required by Shill to identify a network.
56 // Only WiFi, VPN, Ethernet and EthernetEAP are supported. WiMax and Cellular 56 // Only WiFi, VPN, Ethernet and EthernetEAP are supported. WiMax and Cellular
57 // are not supported. Returns true only if all required properties could be 57 // are not supported. Returns true only if all required properties could be
58 // copied. 58 // copied.
59 bool CopyIdentifyingProperties(const base::DictionaryValue& service_properties, 59 bool CopyIdentifyingProperties(const base::DictionaryValue& service_properties,
60 base::DictionaryValue* dest); 60 base::DictionaryValue* dest);
61 61
62 // Compares the identifying configuration properties of |properties_a| and
63 // |properties_b|, returns true if they are identical. See also
64 // CopyIdentifyingProperties. Only WiFi, VPN, Ethernet and EthernetEAP are
65 // supported. WiMax and Cellular are not supported.
66 bool DoIdentifyingPropertiesMatch(const base::DictionaryValue& properties_a,
67 const base::DictionaryValue& properties_b);
68
62 } // namespace shill_property_util 69 } // namespace shill_property_util
63 70
64 class CHROMEOS_EXPORT NetworkTypePattern { 71 class CHROMEOS_EXPORT NetworkTypePattern {
65 public: 72 public:
66 // Matches any network. 73 // Matches any network.
67 static NetworkTypePattern Default(); 74 static NetworkTypePattern Default();
68 75
69 // Matches wireless networks 76 // Matches wireless networks
70 static NetworkTypePattern Wireless(); 77 static NetworkTypePattern Wireless();
71 78
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 113
107 // The bit array of the matching network types. 114 // The bit array of the matching network types.
108 int pattern_; 115 int pattern_;
109 116
110 DISALLOW_ASSIGN(NetworkTypePattern); 117 DISALLOW_ASSIGN(NetworkTypePattern);
111 }; 118 };
112 119
113 } // namespace chromeos 120 } // namespace chromeos
114 121
115 #endif // CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_ 122 #endif // CHROMEOS_NETWORK_SHILL_PROPERTY_UTIL_H_
OLDNEW
« no previous file with comments | « chromeos/network/policy_applicator.cc ('k') | chromeos/network/shill_property_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698