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

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

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Flattened components/cert_database folders. Created 6 years, 1 month 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/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/crypto_module_delegate_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_delegate_nss.h
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.h b/chrome/browser/ui/crypto_module_delegate_nss.h
index 60c7cb54e57876a085adb7b013e26f8244587afd..1fc8ceb7a701399fa3995dcd33333bafee80c79f 100644
--- a/chrome/browser/ui/crypto_module_delegate_nss.h
+++ b/chrome/browser/ui/crypto_module_delegate_nss.h
@@ -7,21 +7,22 @@
#include <string>
+#include "base/callback_forward.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/synchronization/waitable_event.h"
#include "chrome/browser/ui/crypto_module_password_dialog.h"
#include "crypto/nss_crypto_module_delegate.h"
#include "net/base/host_port_pair.h"
-namespace content {
-class ResourceContext;
+namespace cert_database {
+class CertDatabaseServiceIOPart;
}
// Delegate to handle unlocking a slot or indicating which slot to store a key
// in. When passing to NSS functions which take a wincx argument, use the value
// returned from the wincx() method.
-class ChromeNSSCryptoModuleDelegate
- : public crypto::NSSCryptoModuleDelegate {
+class ChromeNSSCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate {
public:
// Create a ChromeNSSCryptoModuleDelegate. |reason| is used to select what
// string to show the user, |server| is displayed to indicate which connection
@@ -35,10 +36,10 @@ class ChromeNSSCryptoModuleDelegate
// Must be called on IO thread. Creates a delegate and returns it
// synchronously or asynchronously to |callback|. If the delegate could not be
// created, |callback| is called with NULL.
- static void CreateForResourceContext(
+ static void CreateForCertDatabase(
chrome::CryptoModulePasswordReason reason,
const net::HostPortPair& server,
- content::ResourceContext* context,
+ cert_database::CertDatabaseServiceIOPart* cert_db_io,
const base::Callback<void(scoped_ptr<ChromeNSSCryptoModuleDelegate>)>&
callback);
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/crypto_module_delegate_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698