chrome/browser/ui/gtk/crypto_module_password_dialog.cc - Issue 6580058: NSS: Unlock crypto devices when populating cert manager.

Side by Side Diff: chrome/browser/ui/gtk/crypto_module_password_dialog.cc

Issue 6580058: NSS: Unlock crypto devices when populating cert manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: missing newline Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« chrome/browser/ui/crypto_module_password_dialog_nss.cc ('K') | « chrome/browser/ui/crypto_module_password_dialog_openssl.cc ('k') | chrome/browser/webui/options/certificate_manager_handler.cc » ('j') | content/browser/certificate_manager_model.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/crypto_module_password_dialog.h"	5 #include "chrome/browser/ui/crypto_module_password_dialog.h"

6	6

7 #include <gtk/gtk.h>	7 #include <gtk/gtk.h>

8	8

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "base/crypto/crypto_module_blocking_password_delegate.h"	10 #include "base/crypto/crypto_module_blocking_password_delegate.h"

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
133 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_KEYGEN, slot16, server16);	133 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_KEYGEN, slot16, server16);

134 break;	134 break;

135 case browser::kCryptoModulePasswordCertEnrollment:	135 case browser::kCryptoModulePasswordCertEnrollment:

136 text = l10n_util::GetStringFUTF8(	136 text = l10n_util::GetStringFUTF8(

137 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_ENROLLMENT, slot16, server16);	137 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_ENROLLMENT, slot16, server16);

138 break;	138 break;

139 case browser::kCryptoModulePasswordClientAuth:	139 case browser::kCryptoModulePasswordClientAuth:

140 text = l10n_util::GetStringFUTF8(	140 text = l10n_util::GetStringFUTF8(

141 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CLIENT_AUTH, slot16, server16);	141 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CLIENT_AUTH, slot16, server16);

142 break;	142 break;

	143 case browser::kCryptoModulePasswordCertManager:

	144 text = l10n_util::GetStringFUTF8(

	145 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_MANAGER, slot16);

	146 break;

143 case browser::kCryptoModulePasswordCertImport:	147 case browser::kCryptoModulePasswordCertImport:

144 text = l10n_util::GetStringFUTF8(	148 text = l10n_util::GetStringFUTF8(

145 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_IMPORT, slot16);	149 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_IMPORT, slot16);

146 break;	150 break;

147 case browser::kCryptoModulePasswordCertExport:	151 case browser::kCryptoModulePasswordCertExport:

148 text = l10n_util::GetStringFUTF8(	152 text = l10n_util::GetStringFUTF8(

149 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_EXPORT, slot16);	153 IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_EXPORT, slot16);

150 break;	154 break;

151 default:	155 default:

152 NOTREACHED();	156 NOTREACHED();

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
217 }	221 }

218	222

219 base::CryptoModuleBlockingPasswordDelegate*	223 base::CryptoModuleBlockingPasswordDelegate*

220 NewCryptoModuleBlockingDialogDelegate(	224 NewCryptoModuleBlockingDialogDelegate(

221 CryptoModulePasswordReason reason,	225 CryptoModulePasswordReason reason,

222 const std::string& server) {	226 const std::string& server) {

223 return new CryptoModuleBlockingDialogDelegate(reason, server);	227 return new CryptoModuleBlockingDialogDelegate(reason, server);

224 }	228 }

225	229

226 } // namespace browser	230 } // namespace browser

OLD	NEW