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

Side by Side Diff: net/cert/nss_cert_database_chromeos.h

Issue 2711113002: net: remove CryptoModuleList typedef (Closed)
Patch Set: more std::moves Created 3 years, 10 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
« no previous file with comments | « net/cert/nss_cert_database.cc ('k') | net/cert/nss_cert_database_chromeos.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 NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_ 5 #ifndef NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_
6 #define NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_ 6 #define NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 10 matching lines...) Expand all
21 crypto::ScopedPK11Slot private_slot); 21 crypto::ScopedPK11Slot private_slot);
22 ~NSSCertDatabaseChromeOS() override; 22 ~NSSCertDatabaseChromeOS() override;
23 23
24 // |system_slot| is the system TPM slot, which is only enabled for certain 24 // |system_slot| is the system TPM slot, which is only enabled for certain
25 // users. 25 // users.
26 void SetSystemSlot(crypto::ScopedPK11Slot system_slot); 26 void SetSystemSlot(crypto::ScopedPK11Slot system_slot);
27 27
28 // NSSCertDatabase implementation. 28 // NSSCertDatabase implementation.
29 void ListCertsSync(CertificateList* certs) override; 29 void ListCertsSync(CertificateList* certs) override;
30 void ListCerts(const NSSCertDatabase::ListCertsCallback& callback) override; 30 void ListCerts(const NSSCertDatabase::ListCertsCallback& callback) override;
31 void ListModules(CryptoModuleList* modules, bool need_rw) const override; 31 void ListModules(std::vector<crypto::ScopedPK11Slot>* modules,
32 bool need_rw) const override;
32 crypto::ScopedPK11Slot GetSystemSlot() const override; 33 crypto::ScopedPK11Slot GetSystemSlot() const override;
33 34
34 // TODO(mattm): handle trust setting, deletion, etc correctly when certs exist 35 // TODO(mattm): handle trust setting, deletion, etc correctly when certs exist
35 // in multiple slots. 36 // in multiple slots.
36 // TODO(mattm): handle trust setting correctly for certs in read-only slots. 37 // TODO(mattm): handle trust setting correctly for certs in read-only slots.
37 38
38 private: 39 private:
39 // Certificate listing implementation used by |ListCerts| and |ListCertsSync|. 40 // Certificate listing implementation used by |ListCerts| and |ListCertsSync|.
40 // The certificate list normally returned by NSSCertDatabase::ListCertsImpl 41 // The certificate list normally returned by NSSCertDatabase::ListCertsImpl
41 // is additionally filtered by |profile_filter|. 42 // is additionally filtered by |profile_filter|.
42 // Static so it may safely be used on the worker thread. 43 // Static so it may safely be used on the worker thread.
43 static void ListCertsImpl(const NSSProfileFilterChromeOS& profile_filter, 44 static void ListCertsImpl(const NSSProfileFilterChromeOS& profile_filter,
44 CertificateList* certs); 45 CertificateList* certs);
45 46
46 NSSProfileFilterChromeOS profile_filter_; 47 NSSProfileFilterChromeOS profile_filter_;
47 crypto::ScopedPK11Slot system_slot_; 48 crypto::ScopedPK11Slot system_slot_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS); 50 DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS);
50 }; 51 };
51 52
52 } // namespace net 53 } // namespace net
53 54
54 #endif // NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_ 55 #endif // NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « net/cert/nss_cert_database.cc ('k') | net/cert/nss_cert_database_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698