Index: chrome/browser/chrome_content_browser_client.h |
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h |
index 6d5fd9f78fb66179cf7d6330021f3b3032d1ae1b..e1b1977125e5daa2e5c5633d8a6d0e34b81a0bac 100644 |
--- a/chrome/browser/chrome_content_browser_client.h |
+++ b/chrome/browser/chrome_content_browser_client.h |
@@ -173,6 +173,12 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
size_t cert_size, |
int render_process_id, |
int render_view_id) OVERRIDE; |
+ virtual void Keygen( |
+ content::ResourceContext* context, |
+ int key_size_in_bits, |
+ const std::string& challenge, |
+ const GURL& url, |
+ const base::Callback<void(const std::string*)>& callback) OVERRIDE; |
virtual content::MediaObserver* GetMediaObserver() OVERRIDE; |
virtual void RequestDesktopNotificationPermission( |
const GURL& source_origin, |
@@ -254,11 +260,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
bool* success) OVERRIDE; |
#endif |
-#if defined(USE_NSS) |
- virtual |
- crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( |
- const GURL& url) OVERRIDE; |
-#endif |
private: |
#if defined(ENABLE_PLUGINS) |