| 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 6bfa61567812e1968efc5ea7823c82a3ff9980cc..178e85124f87fa027677aa266284484f6f6d37f5 100644
|
| --- a/content/public/browser/content_browser_client.h
|
| +++ b/content/public/browser/content_browser_client.h
|
| @@ -43,9 +43,6 @@ namespace base {
|
| class DictionaryValue;
|
| class FilePath;
|
| }
|
| -namespace crypto {
|
| -class CryptoModuleBlockingPasswordDelegate;
|
| -}
|
|
|
| namespace gfx {
|
| class ImageSkia;
|
| @@ -416,6 +413,16 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| int render_process_id,
|
| int render_view_id) {}
|
|
|
| + // Generate keypair. The |callback| will be called with the base64 encoded
|
| + // signedPublicKeyAndChallenge DER data, or in the case of error NULL or empty
|
| + // string.
|
| + virtual void Keygen(
|
| + 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();
|
| @@ -586,14 +593,6 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
|
| 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
|
| };
|
|
|
| } // namespace content
|
|
|