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

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

Issue 1446623003: [Reland] Enable AutoResize for Constrained Web Dialogs for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 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 #include <vector> 9 #include <vector>
10 10
(...skipping 17 matching lines...) Expand all
28 @interface SSLClientCertificateSelectorCocoa 28 @interface SSLClientCertificateSelectorCocoa
29 : NSObject<ConstrainedWindowSheet> { 29 : NSObject<ConstrainedWindowSheet> {
30 @private 30 @private
31 // The list of identities offered to the user. 31 // The list of identities offered to the user.
32 base::ScopedCFTypeRef<CFMutableArrayRef> identities_; 32 base::ScopedCFTypeRef<CFMutableArrayRef> identities_;
33 // The corresponding list of certificates. 33 // The corresponding list of certificates.
34 std::vector<scoped_refptr<net::X509Certificate> > certificates_; 34 std::vector<scoped_refptr<net::X509Certificate> > certificates_;
35 // A C++ object to bridge SSLClientAuthObserver notifications to us. 35 // A C++ object to bridge SSLClientAuthObserver notifications to us.
36 scoped_ptr<SSLClientAuthObserverCocoaBridge> observer_; 36 scoped_ptr<SSLClientAuthObserverCocoaBridge> observer_;
37 base::scoped_nsobject<SFChooseIdentityPanel> panel_; 37 base::scoped_nsobject<SFChooseIdentityPanel> panel_;
38 scoped_ptr<ConstrainedWindowMac> constrainedWindow_; 38 std::unique_ptr<ConstrainedWindowMac> constrainedWindow_;
39 base::scoped_nsobject<NSWindow> overlayWindow_; 39 base::scoped_nsobject<NSWindow> overlayWindow_;
40 BOOL closePending_; 40 BOOL closePending_;
41 // A copy of the sheet's frame used to restore on show. 41 // A copy of the sheet's frame used to restore on show.
42 NSRect oldSheetFrame_; 42 NSRect oldSheetFrame_;
43 // A copy of the sheet's |autoresizesSubviews| flag to restore on show. 43 // A copy of the sheet's |autoresizesSubviews| flag to restore on show.
44 BOOL oldResizesSubviews_; 44 BOOL oldResizesSubviews_;
45 // True if the user dismissed the dialog directly, either via the OK (continue 45 // 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 46 // the request with a certificate) or Cancel (continue the request with no
47 // certificate) buttons. 47 // certificate) buttons.
48 BOOL userResponded_; 48 BOOL userResponded_;
49 } 49 }
50 50
51 @property (readonly, nonatomic) SFChooseIdentityPanel* panel; 51 @property (readonly, nonatomic) SFChooseIdentityPanel* panel;
52 52
53 - (id)initWithBrowserContext:(const content::BrowserContext*)browserContext 53 - (id)initWithBrowserContext:(const content::BrowserContext*)browserContext
54 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo 54 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
55 delegate:(scoped_ptr<content::ClientCertificateDelegate>) 55 delegate:(scoped_ptr<content::ClientCertificateDelegate>)
56 delegate; 56 delegate;
57 - (void)displayForWebContents:(content::WebContents*)webContents; 57 - (void)displayForWebContents:(content::WebContents*)webContents;
58 - (void)closeWebContentsModalDialog; 58 - (void)closeWebContentsModalDialog;
59 59
60 - (NSWindow*)overlayWindow; 60 - (NSWindow*)overlayWindow;
61 61
62 @end 62 @end
63 63
64 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_ 64 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698