Chromium Code Reviews| Index: chrome/browser/ui/cocoa/certificate_viewer_mac.h |
| diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.h b/chrome/browser/ui/cocoa/certificate_viewer_mac.h |
| index f33bef2d5db39ae35258f0dcf874b820ef831351..c0d04016cfaa478534c83f80ca8b32cf8c30b5e3 100644 |
| --- a/chrome/browser/ui/cocoa/certificate_viewer_mac.h |
| +++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.h |
| @@ -6,39 +6,26 @@ |
|
tapted
2016/03/21 02:47:12
remove blank line
Patti Lor
2016/05/03 00:05:00
Done.
|
| #define CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_ |
| -#include "base/mac/scoped_nsobject.h" |
| +#import <Cocoa/Cocoa.h> |
| + |
| #include "base/memory/scoped_ptr.h" |
| +#import "chrome/browser/mac/certificate_viewer_base.h" |
| #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" |
| #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h" |
| + |
|
tapted
2016/03/21 02:47:12
remove blank line
Patti Lor
2016/05/03 00:05:00
Done.
|
| class SSLCertificateViewerCocoaBridge; |
| @class SFCertificatePanel; |
|
tapted
2016/03/21 02:47:12
unused
Patti Lor
2016/05/03 00:05:00
Done.
|
| -namespace net { |
| - class X509Certificate; |
| -} |
| - |
| -@interface SSLCertificateViewerCocoa : NSObject<ConstrainedWindowSheet> { |
| +@interface SSLCertificateViewerCocoa : |
| + SSLCertificateViewerMacBase<ConstrainedWindowSheet> { |
| @private |
| - // The corresponding list of certificates. |
| - base::scoped_nsobject<NSArray> certificates_; |
| scoped_ptr<SSLCertificateViewerCocoaBridge> observer_; |
| - base::scoped_nsobject<SFCertificatePanel> panel_; |
| scoped_ptr<ConstrainedWindowMac> constrainedWindow_; |
| - base::scoped_nsobject<NSWindow> overlayWindow_; |
| - BOOL closePending_; |
| // A copy of the sheet's frame used to restore on show. |
| NSRect oldSheetFrame_; |
| - // A copy of the sheet's |autoresizesSubviews| flag to restore on show. |
| - BOOL oldResizesSubviews_; |
| } |
| -- (id)initWithCertificate:(net::X509Certificate*)certificate; |
| - |
| -- (void)displayForWebContents:(content::WebContents*)webContents; |
| - |
| -- (NSWindow*)overlayWindow; |
| - |
| @end |
| -#endif // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_ |
| +#endif // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_ |