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

Unified Diff: content/browser/renderer_host/buffered_resource_handler.cc

Issue 11031043: Fix handling of user and CA certificates 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/browser/renderer_host/buffered_resource_handler.cc
diff --git a/content/browser/renderer_host/buffered_resource_handler.cc b/content/browser/renderer_host/buffered_resource_handler.cc
index 98aae337af7b65d0d39e39a20b08640225dd6d3d..f511b1dd80eb7cca74a772cfe3a89b29cbcbf02d 100644
--- a/content/browser/renderer_host/buffered_resource_handler.cc
+++ b/content/browser/renderer_host/buffered_resource_handler.cc
@@ -293,7 +293,13 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request_);
const std::string& mime_type = response_->head.mime_type;
+#if defined(OS_ANDROID)
+ if (mime_type == "application/x-x509-user-cert" ||
+ mime_type == "application/x-x509-ca-cert" ||
+ mime_type == "application/x-pkcs12") {
+#else
if (mime_type == "application/x-x509-user-cert") {
+#endif
// Install X509 handler.
scoped_ptr<ResourceHandler> handler(
new X509UserCertResourceHandler(request_,
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/browser/renderer_host/x509_user_cert_resource_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698