content/public/browser/content_browser_client.cc - Issue 859213006: Cancel client auth requests when not promptable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 859213006: Cancel client auth requests when not promptable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@client-auth-cancel-1

Patch Set: mmenke comments Created 5 years, 10 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

« content/public/browser/client_certificate_delegate.h ('K') | « content/public/browser/content_browser_client.h ('k') | content/test/data/workers/worker_common.js » ('j') | content/test/data/workers/worker_tls_client_auth.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/browser/content_browser_client.cc

diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc

index 67d2df7c1bf839247279e9a134aa3e7a52900f22..e8e6f9555465079b7cc39294cdaa36e22b1f4dc1 100644

--- a/content/public/browser/content_browser_client.cc

+++ b/content/public/browser/content_browser_client.cc

@@ -5,6 +5,7 @@

#include "content/public/browser/content_browser_client.h"

#include "base/files/file_path.h"

+#include "content/public/browser/client_certificate_delegate.h"

#include "ui/gfx/image/image_skia.h"

#include "url/gurl.h"

@@ -177,11 +178,10 @@ QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() {

}

void ContentBrowserClient::SelectClientCertificate(

- int render_process_id,

- int render_frame_id,

+ WebContents* web_contents,

net::SSLCertRequestInfo* cert_request_info,

- const base::Callback<void(net::X509Certificate*)>& callback) {

- callback.Run(nullptr);

+ scoped_ptr<ClientCertificateDelegate> delegate) {

+ delegate->CancelCertificateSelection();

}

net::URLRequestContext* ContentBrowserClient::OverrideRequestContextForURL(