OLD | NEW |
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_UTILITY_WIFI_WIFI_SERVICE_H_ | 5 #ifndef CHROME_UTILITY_WIFI_WIFI_SERVICE_H_ |
6 #define CHROME_UTILITY_WIFI_WIFI_SERVICE_H_ | 6 #define CHROME_UTILITY_WIFI_WIFI_SERVICE_H_ |
7 | 7 |
8 #include <list> | 8 #include <list> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 NetworkProperties(); | 123 NetworkProperties(); |
124 ~NetworkProperties(); | 124 ~NetworkProperties(); |
125 | 125 |
126 std::string connection_state; | 126 std::string connection_state; |
127 std::string guid; | 127 std::string guid; |
128 std::string name; | 128 std::string name; |
129 std::string ssid; | 129 std::string ssid; |
130 std::string bssid; | 130 std::string bssid; |
131 std::string type; | 131 std::string type; |
132 std::string security; | 132 std::string security; |
| 133 // |password| field is used to pass wifi password for network creation via |
| 134 // |CreateNetwork| or connection via |StartConnect|. It does not persist |
| 135 // once operation is completed. |
| 136 std::string password; |
133 // WiFi Signal Strength. 0..100 | 137 // WiFi Signal Strength. 0..100 |
134 uint32 signal_strength; | 138 uint32 signal_strength; |
135 bool auto_connect; | 139 bool auto_connect; |
136 Frequency frequency; | 140 Frequency frequency; |
137 FrequencyList frequency_list; | 141 FrequencyList frequency_list; |
138 | 142 |
139 std::string json_extra; // Extra JSON properties for unit tests | 143 std::string json_extra; // Extra JSON properties for unit tests |
140 | 144 |
141 scoped_ptr<base::DictionaryValue> ToValue(bool network_list) const; | 145 scoped_ptr<base::DictionaryValue> ToValue(bool network_list) const; |
| 146 // Updates only properties set in |value|. |
142 bool UpdateFromValue(const base::DictionaryValue& value); | 147 bool UpdateFromValue(const base::DictionaryValue& value); |
143 static std::string MacAddressAsString(const uint8 mac_as_int[6]); | 148 static std::string MacAddressAsString(const uint8 mac_as_int[6]); |
144 static bool OrderByType(const NetworkProperties& l, | 149 static bool OrderByType(const NetworkProperties& l, |
145 const NetworkProperties& r); | 150 const NetworkProperties& r); |
146 }; | 151 }; |
147 | 152 |
148 typedef std::list<NetworkProperties> NetworkList; | 153 typedef std::list<NetworkProperties> NetworkList; |
149 | 154 |
150 private: | 155 private: |
151 DISALLOW_COPY_AND_ASSIGN(WiFiService); | 156 DISALLOW_COPY_AND_ASSIGN(WiFiService); |
152 }; | 157 }; |
153 | 158 |
154 } // namespace wifi | 159 } // namespace wifi |
155 | 160 |
156 #endif // CHROME_UTILITY_WIFI_WIFI_SERVICE_H_ | 161 #endif // CHROME_UTILITY_WIFI_WIFI_SERVICE_H_ |
OLD | NEW |