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 66d9e71955e10070a0a276da19ceb97bd23d3fe6..0984446dfa224e611940ae064c9c29adf7abb1e5 100644 |
--- a/chrome/browser/chrome_content_browser_client.h |
+++ b/chrome/browser/chrome_content_browser_client.h |
@@ -163,6 +163,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
bool strict_enforcement, |
const base::Callback<void(bool)>& callback, |
content::CertificateRequestResultType* request) OVERRIDE; |
+ virtual scoped_ptr<net::ClientCertStore> GetClientCertStore( |
+ content::ResourceContext* context) OVERRIDE; |
virtual void SelectClientCertificate( |
int render_process_id, |
int render_view_id, |
@@ -176,6 +178,12 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
size_t cert_size, |
int render_process_id, |
int render_view_id) OVERRIDE; |
+ virtual void GenerateKey( |
+ 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, |
@@ -262,11 +270,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 |
virtual bool IsPluginAllowedToCallRequestOSFileHandle( |
content::BrowserContext* browser_context, |