Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: chrome/browser/ui/crypto_module_password_dialog_nss.h

Issue 2711113002: net: remove CryptoModuleList typedef (Closed)
Patch Set: more std::moves Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ui/crypto_module_password_dialog_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/crypto_module_password_dialog_nss.h
diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.h b/chrome/browser/ui/crypto_module_password_dialog_nss.h
index 6d871f323d8b8c0593861f93ed9591f8ffdf1166..9fb2d8edb996344727e6c26df935e2956836b771 100644
--- a/chrome/browser/ui/crypto_module_password_dialog_nss.h
+++ b/chrome/browser/ui/crypto_module_password_dialog_nss.h
@@ -11,12 +11,11 @@
#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/ui/crypto_module_password_dialog.h"
+#include "crypto/scoped_nss_types.h"
#include "net/base/host_port_pair.h"
#include "ui/gfx/native_widget_types.h"
namespace net {
-class CryptoModule;
-typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
class X509Certificate;
}
@@ -25,7 +24,7 @@ namespace chrome {
// 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,
+void UnlockSlotsIfNecessary(std::vector<crypto::ScopedPK11Slot> modules,
CryptoModulePasswordReason reason,
const net::HostPortPair& server,
gfx::NativeWindow parent,
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ui/crypto_module_password_dialog_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698