Index: chromeos/network/onc/onc_certificate_importer.h |
diff --git a/chromeos/network/onc/onc_certificate_importer.h b/chromeos/network/onc/onc_certificate_importer.h |
index 5eddbb776285aa68e94b31ec45e71fb8592980e0..60bc5a97dd33f061977f81ab969b5a2da423b57c 100644 |
--- a/chromeos/network/onc/onc_certificate_importer.h |
+++ b/chromeos/network/onc/onc_certificate_importer.h |
@@ -49,13 +49,18 @@ class CHROMEOS_EXPORT CertificateImporter { |
// removes the certificate from the store instead of importing. Returns the |
// result of the parse operation. In case of IMPORT_INCOMPLETE, some of the |
// certificates may be stored/removed successfully while others had errors. |
+ // |web_trust_certificates| will be filled with the list of certificates that |
+ // requested the Web trust flag, if not NULL. |
pneubeck (no reviews)
2013/03/26 10:01:25
NIT: "if not NULL" to the beginning of the sentenc
Joao da Silva
2013/03/31 19:22:14
Done.
|
// If no error occurred, returns IMPORT_OK. |
ParseResult ParseAndStoreCertificates( |
- const base::ListValue& onc_certificates); |
+ const base::ListValue& onc_certificates, |
+ net::CertificateList* web_trust_certificates); |
// Parses and stores/removes |certificate| in/from the certificate |
// store. Returns true if the operation succeeded. |
- bool ParseAndStoreCertificate(const base::DictionaryValue& certificate); |
+ bool ParseAndStoreCertificate( |
pneubeck (no reviews)
2013/03/26 10:01:25
you can make this one private. it's never called f
Joao da Silva
2013/03/31 19:22:14
Done.
|
+ const base::DictionaryValue& certificate, |
+ net::CertificateList* web_trust_certificates); |
// Lists the certificates that have the string |label| as their certificate |
// nickname (exact match). |
@@ -68,9 +73,11 @@ class CHROMEOS_EXPORT CertificateImporter { |
static bool DeleteCertAndKeyByNickname(const std::string& label); |
private: |
- bool ParseServerOrCaCertificate(const std::string& cert_type, |
- const std::string& guid, |
- const base::DictionaryValue& certificate); |
+ bool ParseServerOrCaCertificate( |
+ const std::string& cert_type, |
+ const std::string& guid, |
+ const base::DictionaryValue& certificate, |
+ net::CertificateList* web_trust_certificates); |
bool ParseClientCertificate(const std::string& guid, |
const base::DictionaryValue& certificate); |