| Index: chrome/browser/ui/crypto_module_delegate_nss.h
|
| diff --git a/chrome/browser/ui/crypto_module_delegate_nss.h b/chrome/browser/ui/crypto_module_delegate_nss.h
|
| index 7afde30beb605137c8d0bb1a95bbf3ed4ecbe6fd..3a1e96dac3b2b459c228055965f96126fcfc9303 100644
|
| --- a/chrome/browser/ui/crypto_module_delegate_nss.h
|
| +++ b/chrome/browser/ui/crypto_module_delegate_nss.h
|
| @@ -7,21 +7,22 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/callback_forward.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "chrome/browser/ui/crypto_module_password_dialog.h"
|
| #include "crypto/nss_crypto_module_delegate.h"
|
| #include "net/base/host_port_pair.h"
|
|
|
| -namespace content {
|
| -class ResourceContext;
|
| +namespace cert_database {
|
| +class CertDatabaseServiceIOPart;
|
| }
|
|
|
| // Delegate to handle unlocking a slot or indicating which slot to store a key
|
| // in. When passing to NSS functions which take a wincx argument, use the value
|
| // returned from the wincx() method.
|
| -class ChromeNSSCryptoModuleDelegate
|
| - : public crypto::NSSCryptoModuleDelegate {
|
| +class ChromeNSSCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate {
|
| public:
|
| // Create a ChromeNSSCryptoModuleDelegate. |reason| is used to select what
|
| // string to show the user, |server| is displayed to indicate which connection
|
| @@ -35,10 +36,10 @@ class ChromeNSSCryptoModuleDelegate
|
| // Must be called on IO thread. Creates a delegate and returns it
|
| // synchronously or asynchronously to |callback|. If the delegate could not be
|
| // created, |callback| is called with NULL.
|
| - static void CreateForResourceContext(
|
| + static void CreateForCertDatabase(
|
| chrome::CryptoModulePasswordReason reason,
|
| const net::HostPortPair& server,
|
| - content::ResourceContext* context,
|
| + cert_database::CertDatabaseServiceIOPart* cert_db_io,
|
| const base::Callback<void(scoped_ptr<ChromeNSSCryptoModuleDelegate>)>&
|
| callback);
|
|
|
|
|