chrome/browser/tab_contents/tab_contents_ssl_helper.cc - Issue 9384014: Remove knowledge about SSLClientAuthHandler from chrome. Instead a callback is given to the embed...

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: chrome/browser/tab_contents/tab_contents_ssl_helper.cc

Issue 9384014: Remove knowledge about SSLClientAuthHandler from chrome. Instead a callback is given to the embed... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: review comments+sync Created 8 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

« no previous file with comments | « chrome/browser/tab_contents/tab_contents_ssl_helper.h ('k') | chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/tab_contents_ssl_helper.cc

===================================================================

--- chrome/browser/tab_contents/tab_contents_ssl_helper.cc (revision 121706)

+++ chrome/browser/tab_contents/tab_contents_ssl_helper.cc (working copy)

@@ -24,7 +24,6 @@

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

-#include "content/browser/ssl/ssl_client_auth_handler.h"

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

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

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

@@ -191,9 +190,11 @@

}

void TabContentsSSLHelper::ShowClientCertificateRequestDialog(

- scoped_refptr<SSLClientAuthHandler> handler) {

+ const net::HttpNetworkSession* network_session,

+ net::SSLCertRequestInfo* cert_request_info,

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

browser::ShowSSLClientCertificateSelector(

- tab_contents_, handler->cert_request_info(), handler);

+ tab_contents_, network_session, cert_request_info, callback);

}

void TabContentsSSLHelper::OnVerifyClientCertificateError(