| Index: chrome/browser/ui/crypto_module_password_dialog.h
|
| diff --git a/chrome/browser/ui/crypto_module_password_dialog.h b/chrome/browser/ui/crypto_module_password_dialog.h
|
| index 0f64caf4073e97d593b4123484d08cde32a1a9c3..06bf7a6ab6c5340d1b623c8137b132c9b5d121e5 100644
|
| --- a/chrome/browser/ui/crypto_module_password_dialog.h
|
| +++ b/chrome/browser/ui/crypto_module_password_dialog.h
|
| @@ -6,22 +6,10 @@
|
| #define CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_H_
|
|
|
| #include <string>
|
| -#include <vector>
|
|
|
| #include "base/callback.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| -namespace crypto {
|
| -class CryptoModuleBlockingPasswordDelegate;
|
| -}
|
| -
|
| -namespace net {
|
| -class CryptoModule;
|
| -typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
|
| -class X509Certificate;
|
| -}
|
| -
|
| namespace chrome {
|
|
|
| // An enum to describe the reason for the password request.
|
| @@ -48,30 +36,6 @@ void ShowCryptoModulePasswordDialog(
|
| gfx::NativeWindow parent,
|
| const CryptoModulePasswordCallback& callback);
|
|
|
| -// Returns a CryptoModuleBlockingPasswordDelegate to open a dialog and block
|
| -// until returning. Should only be used on a worker thread.
|
| -crypto::CryptoModuleBlockingPasswordDelegate*
|
| - NewCryptoModuleBlockingDialogDelegate(CryptoModulePasswordReason reason,
|
| - const std::string& server);
|
| -
|
| -// Asynchronously unlock |modules|, if necessary. |callback| is called when
|
| -// done (regardless if any modules were successfully unlocked or not). Should
|
| -// only be called on UI thread.
|
| -void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules,
|
| - CryptoModulePasswordReason reason,
|
| - const std::string& server,
|
| - gfx::NativeWindow parent,
|
| - const base::Closure& callback);
|
| -
|
| -// Asynchronously unlock the |cert|'s module, if necessary. |callback| is
|
| -// called when done (regardless if module was successfully unlocked or not).
|
| -// Should only be called on UI thread.
|
| -void UnlockCertSlotIfNecessary(net::X509Certificate* cert,
|
| - CryptoModulePasswordReason reason,
|
| - const std::string& server,
|
| - gfx::NativeWindow parent,
|
| - const base::Closure& callback);
|
| -
|
| } // namespace chrome
|
|
|
| #endif // CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_H_
|
|
|