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

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

Issue 780383002: Don't key client auth on HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
11 #include "base/mac/scoped_cftyperef.h" 11 #include "base/mac/scoped_cftyperef.h"
12 #include "base/mac/scoped_nsobject.h" 12 #include "base/mac/scoped_nsobject.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" 15 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
16 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.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_sheet_con troller.h" 17 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h"
18 18
19 namespace content {
20 class BrowserContext;
21 }
22
19 class ConstrainedWindowMac; 23 class ConstrainedWindowMac;
20 @class SFChooseIdentityPanel; 24 @class SFChooseIdentityPanel;
21 class SSLClientAuthObserverCocoaBridge; 25 class SSLClientAuthObserverCocoaBridge;
22 26
23 @interface SSLClientCertificateSelectorCocoa 27 @interface SSLClientCertificateSelectorCocoa
24 : NSObject<ConstrainedWindowSheet> { 28 : NSObject<ConstrainedWindowSheet> {
25 @private 29 @private
26 // The list of identities offered to the user. 30 // The list of identities offered to the user.
27 base::ScopedCFTypeRef<CFMutableArrayRef> identities_; 31 base::ScopedCFTypeRef<CFMutableArrayRef> identities_;
28 // The corresponding list of certificates. 32 // The corresponding list of certificates.
29 std::vector<scoped_refptr<net::X509Certificate> > certificates_; 33 std::vector<scoped_refptr<net::X509Certificate> > certificates_;
30 // A C++ object to bridge SSLClientAuthObserver notifications to us. 34 // A C++ object to bridge SSLClientAuthObserver notifications to us.
31 scoped_ptr<SSLClientAuthObserverCocoaBridge> observer_; 35 scoped_ptr<SSLClientAuthObserverCocoaBridge> observer_;
32 base::scoped_nsobject<SFChooseIdentityPanel> panel_; 36 base::scoped_nsobject<SFChooseIdentityPanel> panel_;
33 scoped_ptr<ConstrainedWindowMac> constrainedWindow_; 37 scoped_ptr<ConstrainedWindowMac> constrainedWindow_;
34 base::scoped_nsobject<NSWindow> overlayWindow_; 38 base::scoped_nsobject<NSWindow> overlayWindow_;
35 BOOL closePending_; 39 BOOL closePending_;
36 // A copy of the sheet's frame used to restore on show. 40 // A copy of the sheet's frame used to restore on show.
37 NSRect oldSheetFrame_; 41 NSRect oldSheetFrame_;
38 // A copy of the sheet's |autoresizesSubviews| flag to restore on show. 42 // A copy of the sheet's |autoresizesSubviews| flag to restore on show.
39 BOOL oldResizesSubviews_; 43 BOOL oldResizesSubviews_;
40 } 44 }
41 45
42 @property (readonly, nonatomic) SFChooseIdentityPanel* panel; 46 @property (readonly, nonatomic) SFChooseIdentityPanel* panel;
43 47
44 - (id)initWithNetworkSession:(const net::HttpNetworkSession*)networkSession 48 - (id)initWithBrowserContext:(const content::BrowserContext*)browserContext
45 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo 49 certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
46 callback:(const chrome::SelectCertificateCallback&)callback; 50 callback:(const chrome::SelectCertificateCallback&)callback;
47 - (void)displayForWebContents:(content::WebContents*)webContents; 51 - (void)displayForWebContents:(content::WebContents*)webContents;
48 - (void)closeWebContentsModalDialog; 52 - (void)closeWebContentsModalDialog;
49 53
50 - (NSWindow*)overlayWindow; 54 - (NSWindow*)overlayWindow;
51 55
52 @end 56 @end
53 57
54 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_ 58 #endif // CHROME_BROWSER_UI_COCOA_SSL_CLIENT_CERTIFICATE_SELECTOR_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698