| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index 724a728b1493bb5ba811b9e14eb83c9f81ebb372..ff2ec2fa3a2669277f55ae920f102a2e808fd7dd 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -26,6 +26,10 @@
|
| #include "net/http/http_network_session.h"
|
| #include "net/url_request/url_request_job_factory.h"
|
|
|
| +#if defined(USE_NSS)
|
| +#include "crypto/scoped_nss_types.h"
|
| +#endif
|
| +
|
| class ChromeHttpUserAgentSettings;
|
| class ChromeNetworkDelegate;
|
| class CookieSettings;
|
| @@ -192,6 +196,11 @@ class ProfileIOData {
|
| }
|
| #endif
|
|
|
| +#if defined(USE_NSS)
|
| + crypto::ScopedPK11Slot GetPublicNSSKeySlot() const;
|
| + crypto::ScopedPK11Slot GetPrivateNSSKeySlot() const;
|
| +#endif
|
| +
|
| // Initialize the member needed to track the metrics enabled state. This is
|
| // only to be called on the UI thread.
|
| void InitializeMetricsEnabledStateOnUIThread();
|
| @@ -278,6 +287,11 @@ class ProfileIOData {
|
| scoped_ptr<policy::PolicyCertVerifier> cert_verifier;
|
| #endif
|
|
|
| +#if defined(USE_NSS)
|
| + crypto::ScopedPK11Slot public_slot;
|
| + crypto::ScopedPK11Slot private_slot;
|
| +#endif
|
| +
|
| // The profile this struct was populated from. It's passed as a void* to
|
| // ensure it's not accidently used on the IO thread. Before using it on the
|
| // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
|
| @@ -499,6 +513,10 @@ class ProfileIOData {
|
| #if defined(OS_CHROMEOS)
|
| mutable scoped_ptr<net::CertVerifier> cert_verifier_;
|
| #endif
|
| +#if defined(USE_NSS)
|
| + mutable crypto::ScopedPK11Slot public_slot_;
|
| + mutable crypto::ScopedPK11Slot private_slot_;
|
| +#endif
|
|
|
| #if defined(ENABLE_NOTIFICATIONS)
|
| mutable DesktopNotificationService* notification_service_;
|
|
|