| Index: content/public/browser/content_browser_client.h
|
| diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
| index dc7f9dd057c29299d8e8a4a4cd2ce5330f2fe460..0c8ded6732d8e57da9bf32acbdbb8c12336bfd90 100644
|
| --- a/content/public/browser/content_browser_client.h
|
| +++ b/content/public/browser/content_browser_client.h
|
| @@ -43,15 +43,13 @@ namespace base {
|
| class DictionaryValue;
|
| class FilePath;
|
| }
|
| -namespace crypto {
|
| -class CryptoModuleBlockingPasswordDelegate;
|
| -}
|
|
|
| namespace gfx {
|
| class ImageSkia;
|
| }
|
|
|
| namespace net {
|
| +class ClientCertStore;
|
| class CookieOptions;
|
| class HttpNetworkSession;
|
| class NetLog;
|
| @@ -396,6 +394,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| const base::Callback<void(bool)>& callback,
|
| CertificateRequestResultType* result) {}
|
|
|
| + // Get platform ClientCertStore. May return NULL.
|
| + virtual scoped_ptr<net::ClientCertStore> GetClientCertStore(
|
| + ResourceContext* context);
|
| +
|
| // Selects a SSL client certificate and returns it to the |callback|. If no
|
| // certificate was selected NULL is returned to the |callback|.
|
| virtual void SelectClientCertificate(
|
| @@ -417,6 +419,16 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| int render_process_id,
|
| int render_view_id) {}
|
|
|
| + // Generate keypair for <keygen>. The |callback| will be called with the
|
| + // base64 encoded signedPublicKeyAndChallenge DER data, or in the case of
|
| + // error NULL or empty string.
|
| + virtual void GenerateKey(
|
| + ResourceContext* context,
|
| + int key_size_in_bits,
|
| + const std::string& challenge,
|
| + const GURL& url,
|
| + const base::Callback<void(const std::string*)>& callback) {}
|
| +
|
| // Returns a class to get notifications about media event. The embedder can
|
| // return NULL if they're not interested.
|
| virtual MediaObserver* GetMediaObserver();
|
| @@ -591,19 +603,12 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| bool* success) {}
|
| #endif
|
|
|
| -#if defined(USE_NSS)
|
| - // Return a delegate to authenticate and unlock |module|.
|
| - // This is called on a worker thread.
|
| - virtual
|
| - crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
|
| - const GURL& url);
|
| -#endif
|
| -
|
| // Returns true if plugin referred to by the url can use
|
| // pp::FileIO::RequestOSFileHandle.
|
| virtual bool IsPluginAllowedToCallRequestOSFileHandle(
|
| content::BrowserContext* browser_context,
|
| const GURL& url);
|
| +
|
| };
|
|
|
| } // namespace content
|
|
|