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

Unified Diff: content/public/browser/resource_context.h

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unit_test compile fix Created 7 years 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
Index: content/public/browser/resource_context.h
diff --git a/content/public/browser/resource_context.h b/content/public/browser/resource_context.h
index ba713f60f18879cea685d26be77885d86956f03a..086fe802bedd23f614a07f23e1e1eef82777adff 100644
--- a/content/public/browser/resource_context.h
+++ b/content/public/browser/resource_context.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_PUBLIC_BROWSER_RESOURCE_CONTEXT_H_
#define CONTENT_PUBLIC_BROWSER_RESOURCE_CONTEXT_H_
+#include <string>
+
#include "base/basictypes.h"
+#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "base/supports_user_data.h"
#include "build/build_config.h"
@@ -20,6 +23,7 @@ class AppCacheService;
namespace net {
class ClientCertStore;
class HostResolver;
+class KeygenHandler;
class URLRequestContext;
}
@@ -46,6 +50,16 @@ class CONTENT_EXPORT ResourceContext : public base::SupportsUserData {
// Get platform ClientCertStore. May return NULL.
virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore();
+ // Create a platform KeygenHandler. On synchronous completion the
+ // KeygenHandler will be returned and |callback| is not run. If asynchronous
+ // initialization is necessary, NULL is returned and the KeygenHandler is
+ // passed to |callback| when it is ready.
+ virtual scoped_ptr<net::KeygenHandler> CreateKeygenHandler(
jam 2013/12/12 06:42:50 nit: we prefer one way of returning data. so if it
mattm 2013/12/12 21:49:18 Sleevi had a concern that that style of callback w
jam 2013/12/13 03:16:39 I can understand the concern, but personally I thi
mattm 2013/12/14 01:58:29 Done.
+ uint32 key_size_in_bits,
+ const std::string& challenge_string,
+ const GURL& url,
+ const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback);
+
// Returns true if microphone access is allowed for |origin|. Used to
// determine what level of authorization is given to |origin| to access
// resource metadata.

Powered by Google App Engine
This is Rietveld 408576698