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

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

Issue 13473003: Rename ONC field Trust to TrustBits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 8 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 #include "chromeos/network/onc/onc_signature.h" 5 #include "chromeos/network/onc/onc_signature.h"
6 6
7 #include "chromeos/network/onc/onc_constants.h" 7 #include "chromeos/network/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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 { network_config::kCellular, &kCellularWithStateSignature }, 252 { network_config::kCellular, &kCellularWithStateSignature },
253 { network_config::kConnectionState, &kStringSignature }, 253 { network_config::kConnectionState, &kStringSignature },
254 { network_config::kWiFi, &kWiFiWithStateSignature }, 254 { network_config::kWiFi, &kWiFiWithStateSignature },
255 { NULL } 255 { NULL }
256 }; 256 };
257 257
258 const OncFieldSignature certificate_fields[] = { 258 const OncFieldSignature certificate_fields[] = {
259 { certificate::kGUID, &kStringSignature }, 259 { certificate::kGUID, &kStringSignature },
260 { certificate::kPKCS12, &kStringSignature }, 260 { certificate::kPKCS12, &kStringSignature },
261 { kRemove, &kBoolSignature }, 261 { kRemove, &kBoolSignature },
262 { certificate::kTrust, &kStringListSignature }, 262 { certificate::kTrustBits, &kStringListSignature },
263 { certificate::kType, &kStringSignature }, 263 { certificate::kType, &kStringSignature },
264 { certificate::kX509, &kStringSignature }, 264 { certificate::kX509, &kStringSignature },
265 { NULL } 265 { NULL }
266 }; 266 };
267 267
268 const OncFieldSignature toplevel_configuration_fields[] = { 268 const OncFieldSignature toplevel_configuration_fields[] = {
269 { toplevel_config::kCertificates, &kCertificateListSignature }, 269 { toplevel_config::kCertificates, &kCertificateListSignature },
270 { toplevel_config::kNetworkConfigurations, 270 { toplevel_config::kNetworkConfigurations,
271 &kNetworkConfigurationListSignature }, 271 &kNetworkConfigurationListSignature },
272 { toplevel_config::kType, &kStringSignature }, 272 { toplevel_config::kType, &kStringSignature },
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (&signature == entry->value_signature && 393 if (&signature == entry->value_signature &&
394 onc_field_name == entry->field_name) { 394 onc_field_name == entry->field_name) {
395 return true; 395 return true;
396 } 396 }
397 } 397 }
398 return false; 398 return false;
399 } 399 }
400 400
401 } // namespace onc 401 } // namespace onc
402 } // namespace chromeos 402 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_normalizer.cc ('k') | chromeos/test/data/network/certificate-server.onc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698