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

Side by Side 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, 9 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_ 5 #ifndef CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_
6 #define CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_ 6 #define CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "chrome/browser/ui/crypto_module_password_dialog.h" 13 #include "chrome/browser/ui/crypto_module_password_dialog.h"
14 #include "crypto/scoped_nss_types.h"
14 #include "net/base/host_port_pair.h" 15 #include "net/base/host_port_pair.h"
15 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
16 17
17 namespace net { 18 namespace net {
18 class CryptoModule;
19 typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
20 class X509Certificate; 19 class X509Certificate;
21 } 20 }
22 21
23 namespace chrome { 22 namespace chrome {
24 23
25 // Asynchronously unlock |modules|, if necessary. |callback| is called when 24 // Asynchronously unlock |modules|, if necessary. |callback| is called when
26 // done (regardless if any modules were successfully unlocked or not). Should 25 // done (regardless if any modules were successfully unlocked or not). Should
27 // only be called on UI thread. 26 // only be called on UI thread.
28 void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules, 27 void UnlockSlotsIfNecessary(std::vector<crypto::ScopedPK11Slot> modules,
29 CryptoModulePasswordReason reason, 28 CryptoModulePasswordReason reason,
30 const net::HostPortPair& server, 29 const net::HostPortPair& server,
31 gfx::NativeWindow parent, 30 gfx::NativeWindow parent,
32 const base::Closure& callback); 31 const base::Closure& callback);
33 32
34 // Asynchronously unlock the |cert|'s module, if necessary. |callback| is 33 // Asynchronously unlock the |cert|'s module, if necessary. |callback| is
35 // called when done (regardless if module was successfully unlocked or not). 34 // called when done (regardless if module was successfully unlocked or not).
36 // Should only be called on UI thread. 35 // Should only be called on UI thread.
37 void UnlockCertSlotIfNecessary(net::X509Certificate* cert, 36 void UnlockCertSlotIfNecessary(net::X509Certificate* cert,
38 CryptoModulePasswordReason reason, 37 CryptoModulePasswordReason reason,
39 const net::HostPortPair& server, 38 const net::HostPortPair& server,
40 gfx::NativeWindow parent, 39 gfx::NativeWindow parent,
41 const base::Closure& callback); 40 const base::Closure& callback);
42 41
43 } // namespace chrome 42 } // namespace chrome
44 43
45 #endif // CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_ 44 #endif // CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_NSS_H_
OLDNEW
« 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