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

Unified Diff: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h

Issue 2898573002: Refactor client cert private key handling. (Closed)
Patch Set: removed no longer needed forward declaration Created 3 years, 6 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: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
index 621429a70b069c648bb38eabcc2aba9f1599c063..9c77d4390356e2fc866b2324651de501568031ef 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
@@ -16,7 +16,7 @@
#include "chrome/browser/ssl/ssl_client_certificate_selector.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
-#include "net/cert/x509_certificate.h"
+#include "net/ssl/client_cert_identity.h"
namespace content {
class BrowserContext;
@@ -30,10 +30,10 @@ class SSLClientAuthObserverCocoaBridge;
@interface SSLClientCertificateSelectorCocoa
: NSObject<ConstrainedWindowSheet> {
@private
- // The list of identities offered to the user.
- base::ScopedCFTypeRef<CFMutableArrayRef> identities_;
- // The corresponding list of certificates.
- std::vector<scoped_refptr<net::X509Certificate>> certificates_;
+ // The list of SecIdentityRefs offered to the user.
+ base::ScopedCFTypeRef<CFMutableArrayRef> sec_identities_;
+ // The corresponding list of ClientCertIdentities.
+ net::ClientCertIdentityList cert_identities_;
// A C++ object to bridge SSLClientAuthObserver notifications to us.
std::unique_ptr<SSLClientAuthObserverCocoaBridge> observer_;
base::scoped_nsobject<SFChooseIdentityPanel> panel_;
@@ -56,7 +56,7 @@ class SSLClientAuthObserverCocoaBridge;
(std::unique_ptr<content::ClientCertificateDelegate>)
delegate;
- (void)displayForWebContents:(content::WebContents*)webContents
- clientCerts:(net::CertificateList)inputClientCerts;
+ clientCerts:(net::ClientCertIdentityList)inputClientCerts;
- (void)closeWebContentsModalDialog;
- (NSWindow*)overlayWindow;

Powered by Google App Engine
This is Rietveld 408576698