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

Side by Side Diff: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h

Issue 2848313003: Revert of Remove client_certs from SSLCertRequestInfo. (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/mac/scoped_cftyperef.h" 13 #include "base/mac/scoped_cftyperef.h"
14 #include "base/mac/scoped_nsobject.h" 14 #include "base/mac/scoped_nsobject.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" 16 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
17 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h" 17 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h"
18 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h" 18 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h"
19 #include "net/cert/x509_certificate.h"
20 19
21 namespace content { 20 namespace content {
22 class BrowserContext; 21 class BrowserContext;
23 class ClientCertificateDelegate; 22 class ClientCertificateDelegate;
24 } 23 }
25 24
25 namespace net {
26 class X509Certificate;
27 }
28
26 class ConstrainedWindowMac; 29 class ConstrainedWindowMac;
27 @class SFChooseIdentityPanel; 30 @class SFChooseIdentityPanel;
28 class SSLClientAuthObserverCocoaBridge; 31 class SSLClientAuthObserverCocoaBridge;
29 32
30 @interface SSLClientCertificateSelectorCocoa 33 @interface SSLClientCertificateSelectorCocoa
31 : NSObject<ConstrainedWindowSheet> { 34 : NSObject<ConstrainedWindowSheet> {
32 @private 35 @private
33 // The list of identities offered to the user. 36 // The list of identities offered to the user.
34 base::ScopedCFTypeRef<CFMutableArrayRef> identities_; 37 base::ScopedCFTypeRef<CFMutableArrayRef> identities_;
35 // The corresponding list of certificates. 38 // The corresponding list of certificates.
(...skipping 12 matching lines...) Expand all
48 BOOL userResponded_; 51 BOOL userResponded_;
49 } 52 }
50 53
51 @property (readonly, nonatomic) SFChooseIdentityPanel* panel; 54 @property (readonly, nonatomic) SFChooseIdentityPanel* panel;
52 55
53 - (id)initWithBrowserContext:(const content::BrowserContext*)browserContext 56 - (id)initWithBrowserContext:(const content::BrowserContext*)browserContext
54 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo 57 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
55 delegate: 58 delegate:
56 (std::unique_ptr<content::ClientCertificateDelegate>) 59 (std::unique_ptr<content::ClientCertificateDelegate>)
57 delegate; 60 delegate;
58 - (void)displayForWebContents:(content::WebContents*)webContents 61 - (void)displayForWebContents:(content::WebContents*)webContents;
59 clientCerts:(net::CertificateList)inputClientCerts;
60 - (void)closeWebContentsModalDialog; 62 - (void)closeWebContentsModalDialog;
61 63
62 - (NSWindow*)overlayWindow; 64 - (NSWindow*)overlayWindow;
63 65
64 @end 66 @end
65 67
66 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_ 68 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698