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

Side by Side Diff: chromeos/network/onc/onc_signature.cc

Issue 750313003: ONC: Add IPConfigType. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipconfig_object
Patch Set: Fixed default value documentation. Created 6 years 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
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 #include "chromeos/network/onc/onc_signature.h" 5 #include "chromeos/network/onc/onc_signature.h"
6 6
7 #include "components/onc/onc_constants.h" 7 #include "components/onc/onc_constants.h"
8 #include "third_party/cros_system_api/dbus/service_constants.h" 8 #include "third_party/cros_system_api/dbus/service_constants.h"
9 9
10 using base::Value; 10 using base::Value;
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 { ::onc::cellular::kSIMLockStatus, &kSIMLockStatusSignature}, 293 { ::onc::cellular::kSIMLockStatus, &kSIMLockStatusSignature},
294 { ::onc::cellular::kSIMPresent, &kBoolSignature}, 294 { ::onc::cellular::kSIMPresent, &kBoolSignature},
295 { ::onc::cellular::kSupportNetworkScan, &kBoolSignature}, 295 { ::onc::cellular::kSupportNetworkScan, &kBoolSignature},
296 { ::onc::cellular::kSupportedCarriers, &kStringListSignature}, 296 { ::onc::cellular::kSupportedCarriers, &kStringListSignature},
297 {NULL}}; 297 {NULL}};
298 298
299 const OncFieldSignature network_configuration_fields[] = { 299 const OncFieldSignature network_configuration_fields[] = {
300 { ::onc::network_config::kCellular, &kCellularSignature}, 300 { ::onc::network_config::kCellular, &kCellularSignature},
301 { ::onc::network_config::kEthernet, &kEthernetSignature}, 301 { ::onc::network_config::kEthernet, &kEthernetSignature},
302 { ::onc::network_config::kGUID, &kStringSignature}, 302 { ::onc::network_config::kGUID, &kStringSignature},
303 303 { ::onc::network_config::kIPConfigType, &kStringSignature},
304 { ::onc::network_config::kName, &kStringSignature}, 304 { ::onc::network_config::kName, &kStringSignature},
305 305
306 // Not supported, yet. 306 // Not supported, yet.
307 { ::onc::network_config::kNameServers, &kStringListSignature}, 307 { ::onc::network_config::kNameServers, &kStringListSignature},
308 308
309 { ::onc::network_config::kPriority, &kIntegerSignature}, 309 { ::onc::network_config::kPriority, &kIntegerSignature},
310 { ::onc::network_config::kProxySettings, &kProxySettingsSignature}, 310 { ::onc::network_config::kProxySettings, &kProxySettingsSignature},
311 { ::onc::kRecommended, &kRecommendedSignature}, 311 { ::onc::kRecommended, &kRecommendedSignature},
312 { ::onc::kRemove, &kBoolSignature}, 312 { ::onc::kRemove, &kBoolSignature},
313 313
314 // Not supported, yet. 314 // Not supported, yet.
315 { ::onc::network_config::kSearchDomains, &kStringListSignature}, 315 { ::onc::network_config::kSearchDomains, &kStringListSignature},
316 316
317 { ::onc::network_config::kStaticIPConfig, &kStaticIPConfigSignature}, 317 { ::onc::network_config::kStaticIPConfig, &kStaticIPConfigSignature},
318 { ::onc::network_config::kType, &kStringSignature}, 318 { ::onc::network_config::kType, &kStringSignature},
319 { ::onc::network_config::kVPN, &kVPNSignature}, 319 { ::onc::network_config::kVPN, &kVPNSignature},
320 { ::onc::network_config::kWiFi, &kWiFiSignature}, 320 { ::onc::network_config::kWiFi, &kWiFiSignature},
321 { ::onc::network_config::kWimax, &kWiMAXSignature}, 321 { ::onc::network_config::kWimax, &kWiMAXSignature},
322 {NULL}}; 322 {NULL}};
323 323
324 const OncFieldSignature network_with_state_fields[] = { 324 const OncFieldSignature network_with_state_fields[] = {
325 { ::onc::network_config::kCellular, &kCellularWithStateSignature}, 325 { ::onc::network_config::kCellular, &kCellularWithStateSignature},
326 { ::onc::network_config::kConnectionState, &kStringSignature}, 326 { ::onc::network_config::kConnectionState, &kStringSignature},
327 { ::onc::network_config::kConnectable, &kBoolSignature}, 327 { ::onc::network_config::kConnectable, &kBoolSignature},
328 { ::onc::network_config::kErrorState, &kStringSignature}, 328 { ::onc::network_config::kErrorState, &kStringSignature},
329 { ::onc::network_config::kIPConfigs, &kIPConfigListSignature}, 329 { ::onc::network_config::kIPConfigs, &kIPConfigListSignature},
330 { ::onc::network_config::kIPConfigType, &kStringSignature},
330 { ::onc::network_config::kMacAddress, &kStringSignature}, 331 { ::onc::network_config::kMacAddress, &kStringSignature},
331 { ::onc::network_config::kRestrictedConnectivity, &kBoolSignature}, 332 { ::onc::network_config::kRestrictedConnectivity, &kBoolSignature},
332 { ::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature}, 333 { ::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature},
333 { ::onc::network_config::kSource, &kStringSignature}, 334 { ::onc::network_config::kSource, &kStringSignature},
334 { ::onc::network_config::kWiFi, &kWiFiWithStateSignature}, 335 { ::onc::network_config::kWiFi, &kWiFiWithStateSignature},
335 { ::onc::network_config::kWimax, &kWiMAXWithStateSignature}, 336 { ::onc::network_config::kWimax, &kWiMAXWithStateSignature},
336 {NULL}}; 337 {NULL}};
337 338
338 const OncFieldSignature global_network_configuration_fields[] = { 339 const OncFieldSignature global_network_configuration_fields[] = {
339 { ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect, 340 { ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 if (&signature == entry->value_signature && 516 if (&signature == entry->value_signature &&
516 onc_field_name == entry->field_name) { 517 onc_field_name == entry->field_name) {
517 return true; 518 return true;
518 } 519 }
519 } 520 }
520 return false; 521 return false;
521 } 522 }
522 523
523 } // namespace onc 524 } // namespace onc
524 } // namespace chromeos 525 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698