Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / options / cert_library.h

diff --git a/src/chrome/browser/chromeos/options/cert_library.h b/src/chrome/browser/chromeos/options/cert_library.h
index eb9b7e5..a3c898b 100644 (file)
--- a/src/chrome/browser/chromeos/options/cert_library.h
+++ b/src/chrome/browser/chromeos/options/cert_library.h
@@ -60,16 +60,13 @@ class CertLibrary : public CertLoader::Observer {
   // Returns true when the certificate list has been initiailized.
   bool CertificatesLoaded() const;
 
-  // Returns true if the TPM is available for hardware-backed certificates.
-  bool IsHardwareBacked() const;
-
   // Retruns the number of certificates available for |type|.
   int NumCertificates(CertType type) const;
 
   // Retreives the certificate property for |type| at |index|.
   base::string16 GetCertDisplayStringAt(CertType type, int index) const;
   std::string GetServerCACertPEMAt(int index) const;
-  std::string GetUserCertPkcs11IdAt(int index) const;
+  std::string GetUserCertPkcs11IdAt(int index, int* slot_id) const;
   bool IsCertHardwareBackedAt(CertType type, int index) const;
 
   // Returns the index of a Certificate matching |pem_encoded| or -1 if none
@@ -83,7 +80,7 @@ class CertLibrary : public CertLoader::Observer {
 
   // CertLoader::Observer
   virtual void OnCertificatesLoaded(const net::CertificateList&,
-                                    bool initial_load) OVERRIDE;
+                                    bool initial_load) override;
 
  private:
   CertLibrary();