Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1891)

Unified Diff: content/public/browser/content_browser_client.h

Issue 11266008: Fix certificate and keychain installation on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..c791f70810b4b6044db5ef23ef7ceaaf6dca59fc 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 crypto file. This is a downloaded resource
+ // which satisfies net::IsSupportedCryptoMimeType(mime_type).
+ // Typically used to install an x509 user certificate.
+ // Note that it's up to the embedder to validate the data.
+ // |file_data| will be NULL if file_size is 0.
+ virtual void AddNewCryptoFile(
Ryan Sleevi 2012/10/24 22:01:25 I would prefer the name "AddCertificates" be used
digit1 2012/10/25 13:57:38 yes, I wasn't a big fan of "CryptoFile", but since
net::URLRequest* request,
- net::X509Certificate* cert,
+ net::CryptoFileType file_type,
+ const void* file_data,
+ size_t file_size,
int render_process_id,
int render_view_id) {}

Powered by Google App Engine
This is Rietveld 408576698