| Index: chrome/browser/ui/crypto_module_password_dialog_nss.cc
|
| diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc
|
| index 3b699e501e43180a4845e459b6653fcfb400911d..cff7e25e77b34c24d301f68dd73a341304c482af 100644
|
| --- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc
|
| +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc
|
| @@ -32,7 +32,7 @@ bool ShouldShowDialog(const net::CryptoModule* module) {
|
| class SlotUnlocker {
|
| public:
|
| SlotUnlocker(const net::CryptoModuleList& modules,
|
| - browser::CryptoModulePasswordReason reason,
|
| + chrome::CryptoModulePasswordReason reason,
|
| const std::string& host,
|
| const base::Closure& callback);
|
|
|
| @@ -44,14 +44,14 @@ class SlotUnlocker {
|
|
|
| size_t current_;
|
| net::CryptoModuleList modules_;
|
| - browser::CryptoModulePasswordReason reason_;
|
| + chrome::CryptoModulePasswordReason reason_;
|
| std::string host_;
|
| base::Closure callback_;
|
| PRBool retry_;
|
| };
|
|
|
| SlotUnlocker::SlotUnlocker(const net::CryptoModuleList& modules,
|
| - browser::CryptoModulePasswordReason reason,
|
| + chrome::CryptoModulePasswordReason reason,
|
| const std::string& host,
|
| const base::Closure& callback)
|
| : current_(0),
|
| @@ -133,10 +133,10 @@ void SlotUnlocker::Done() {
|
|
|
| } // namespace
|
|
|
| -namespace browser {
|
| +namespace chrome {
|
|
|
| void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules,
|
| - browser::CryptoModulePasswordReason reason,
|
| + chrome::CryptoModulePasswordReason reason,
|
| const std::string& host,
|
| const base::Closure& callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| @@ -150,7 +150,7 @@ void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules,
|
| }
|
|
|
| void UnlockCertSlotIfNecessary(net::X509Certificate* cert,
|
| - browser::CryptoModulePasswordReason reason,
|
| + chrome::CryptoModulePasswordReason reason,
|
| const std::string& host,
|
| const base::Closure& callback) {
|
| net::CryptoModuleList modules;
|
| @@ -159,4 +159,4 @@ void UnlockCertSlotIfNecessary(net::X509Certificate* cert,
|
| UnlockSlotsIfNecessary(modules, reason, host, callback);
|
| }
|
|
|
| -} // namespace browser
|
| +} // namespace chrome
|
|
|