OLD | NEW |
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 |
| 10 #include <memory> |
9 #include <vector> | 11 #include <vector> |
10 | 12 |
11 #include "base/mac/scoped_cftyperef.h" | 13 #include "base/mac/scoped_cftyperef.h" |
12 #include "base/mac/scoped_nsobject.h" | 14 #include "base/mac/scoped_nsobject.h" |
13 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
14 #include "base/memory/scoped_ptr.h" | |
15 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 16 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
16 #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" |
17 #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" |
18 | 19 |
19 namespace content { | 20 namespace content { |
20 class BrowserContext; | 21 class BrowserContext; |
21 class ClientCertificateDelegate; | 22 class ClientCertificateDelegate; |
22 } | 23 } |
23 | 24 |
24 class ConstrainedWindowMac; | 25 class ConstrainedWindowMac; |
25 @class SFChooseIdentityPanel; | 26 @class SFChooseIdentityPanel; |
26 class SSLClientAuthObserverCocoaBridge; | 27 class SSLClientAuthObserverCocoaBridge; |
27 | 28 |
28 @interface SSLClientCertificateSelectorCocoa | 29 @interface SSLClientCertificateSelectorCocoa |
29 : NSObject<ConstrainedWindowSheet> { | 30 : NSObject<ConstrainedWindowSheet> { |
30 @private | 31 @private |
31 // The list of identities offered to the user. | 32 // The list of identities offered to the user. |
32 base::ScopedCFTypeRef<CFMutableArrayRef> identities_; | 33 base::ScopedCFTypeRef<CFMutableArrayRef> identities_; |
33 // The corresponding list of certificates. | 34 // The corresponding list of certificates. |
34 std::vector<scoped_refptr<net::X509Certificate> > certificates_; | 35 std::vector<scoped_refptr<net::X509Certificate> > certificates_; |
35 // A C++ object to bridge SSLClientAuthObserver notifications to us. | 36 // A C++ object to bridge SSLClientAuthObserver notifications to us. |
36 scoped_ptr<SSLClientAuthObserverCocoaBridge> observer_; | 37 std::unique_ptr<SSLClientAuthObserverCocoaBridge> observer_; |
37 base::scoped_nsobject<SFChooseIdentityPanel> panel_; | 38 base::scoped_nsobject<SFChooseIdentityPanel> panel_; |
38 scoped_ptr<ConstrainedWindowMac> constrainedWindow_; | 39 std::unique_ptr<ConstrainedWindowMac> constrainedWindow_; |
39 base::scoped_nsobject<NSWindow> overlayWindow_; | 40 base::scoped_nsobject<NSWindow> overlayWindow_; |
40 BOOL closePending_; | 41 BOOL closePending_; |
41 // A copy of the sheet's frame used to restore on show. | 42 // A copy of the sheet's frame used to restore on show. |
42 NSRect oldSheetFrame_; | 43 NSRect oldSheetFrame_; |
43 // A copy of the sheet's |autoresizesSubviews| flag to restore on show. | 44 // A copy of the sheet's |autoresizesSubviews| flag to restore on show. |
44 BOOL oldResizesSubviews_; | 45 BOOL oldResizesSubviews_; |
45 // True if the user dismissed the dialog directly, either via the OK (continue | 46 // True if the user dismissed the dialog directly, either via the OK (continue |
46 // the request with a certificate) or Cancel (continue the request with no | 47 // the request with a certificate) or Cancel (continue the request with no |
47 // certificate) buttons. | 48 // certificate) buttons. |
48 BOOL userResponded_; | 49 BOOL userResponded_; |
49 } | 50 } |
50 | 51 |
51 @property (readonly, nonatomic) SFChooseIdentityPanel* panel; | 52 @property (readonly, nonatomic) SFChooseIdentityPanel* panel; |
52 | 53 |
53 - (id)initWithBrowserContext:(const content::BrowserContext*)browserContext | 54 - (id)initWithBrowserContext:(const content::BrowserContext*)browserContext |
54 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo | 55 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo |
55 delegate:(scoped_ptr<content::ClientCertificateDelegate>) | 56 delegate: |
56 delegate; | 57 (std::unique_ptr<content::ClientCertificateDelegate>) |
| 58 delegate; |
57 - (void)displayForWebContents:(content::WebContents*)webContents; | 59 - (void)displayForWebContents:(content::WebContents*)webContents; |
58 - (void)closeWebContentsModalDialog; | 60 - (void)closeWebContentsModalDialog; |
59 | 61 |
60 - (NSWindow*)overlayWindow; | 62 - (NSWindow*)overlayWindow; |
61 | 63 |
62 @end | 64 @end |
63 | 65 |
64 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_ | 66 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_ |
OLD | NEW |