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 731f89783f5a9509a0dfaa6584f6de2fba163e8d..2e6e51dd5322faa622af84d1214a6713b57a0ae7 100644 |
--- a/content/public/browser/content_browser_client.h |
+++ b/content/public/browser/content_browser_client.h |
@@ -13,6 +13,7 @@ |
#include "content/public/browser/file_descriptor_info.h" |
#include "content/public/common/content_client.h" |
#include "content/public/common/window_container_type.h" |
+#include "net/base/mime_util.h" |
#include "net/cookies/canonical_cookie.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" |
@@ -323,13 +324,16 @@ class CONTENT_EXPORT ContentBrowserClient { |
net::SSLCertRequestInfo* cert_request_info, |
const base::Callback<void(net::X509Certificate*)>& callback) {} |
- // Adds a downloaded client cert. The embedder should ensure that there's |
- // a private key for the cert, displays the cert to the user, and adds it upon |
- // user approval. If the downloaded data could not be interpreted as a valid |
- // certificate, |cert| will be NULL. |
- virtual void AddNewCertificate( |
+ // Adds a new installable certificate or keychain. This is a downloaded |
Ryan Sleevi
2012/11/13 19:37:50
I'm hestitant to use the term "keychain", which is
digit1
2012/11/15 17:42:14
I've changed everything to say "PKCS#12 archive" i
|
+ // resource which passes net::IsSupportedCertificateMimeType(mime_type). |
+ // Typically used to install an X.509 user certificate. |
+ // Note that it's up to the embedder to parse the data. |
+ // |cert_data| will be NULL if file_size is 0. |
+ virtual void AddCertificates( |
net::URLRequest* request, |
- net::X509Certificate* cert, |
+ net::CertificateType cert_type, |
+ const void* cert_data, |
+ size_t cert_size, |
int render_process_id, |
int render_view_id) {} |