MacViews: Remove constrained window dependencies for certificate viewer.

chrome/browser/ui/cocoa/certificate_viewer_mac.h

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 962cc569500ae978a47f0b556e5cf479daedb423..5a0e89239a1ffe689e51ab4604cacb2ac3ce5cfc 100644
--- a/chrome/browser/ui/cocoa/certificate_viewer_mac.h
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.h
@@ -3,43 +3,60 @@
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
-
 #define CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
 
-#include <memory>
+#import <Cocoa/Cocoa.h>
+#import <SecurityInterface/SFCertificatePanel.h>
 
-#include "base/mac/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
+#import "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
 
-class SSLCertificateViewerCocoaBridge;
-@class SFCertificatePanel;
+namespace content {
+class WebContents;
+}
 
 namespace net {
-  class X509Certificate;
+class X509Certificate;
 }
 
-@interface SSLCertificateViewerCocoa : NSObject<ConstrainedWindowSheet> {
- @private
-  // The corresponding list of certificates.
-  base::scoped_nsobject<NSArray> certificates_;
-  std::unique_ptr<SSLCertificateViewerCocoaBridge> observer_;
-  base::scoped_nsobject<SFCertificatePanel> panel_;
-  std::unique_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_;
-}
+@interface SFCertificatePanel (SystemPrivate)
+// A system-private interface that dismisses a panel whose sheet was started by
+// -beginSheetForWindow:
+//        modalDelegate:
+//       didEndSelector:
+//          contextInfo:
+//         certificates:
+//            showGroup:
+// as though the user clicked the button identified by returnCode. Verified
+// present in 10.8.
+- (void)_dismissWithCode:(NSInteger)code;
+@end
 
+// Base class for the certificate viewer generated by OSX for Chrome Mac.
+// It grabs the certificates for a given WebContents object and displays the
+// certificate viewer.
+@interface SSLCertificateViewerMac : NSObject<ConstrainedWindowSheet>
+
+// Initializes |certificates_| with the certificate chain for a given
+// certificate.
 - (id)initWithCertificate:(net::X509Certificate*)certificate;
 
+// Closes the certificate viewer Cocoa sheet.
+- (void)sheetDidEnd:(NSWindow*)parent;
+
+// Initializes the SFCertificatePanel provided by the OS to show the
+// certificate. Also handles showing revoked certificates.
 - (void)displayForWebContents:(content::WebContents*)webContents;
 
-- (NSWindow*)overlayWindow;
+// Sets the certificate viewer sheet to null.

[tapted, 2016/05/19 01:53:25]

nit: Releases the native SFCertificatePanel window sheet.

[Patti Lor, 2016/05/25 05:43:00]

Done.

+- (void)deleteSheetWindow;

[tapted, 2016/05/19 01:53:25]

nit: releaseSheetWindow

(since there's no guarantee there aren't more references that prevent it from
actually being deleted)

[Patti Lor, 2016/05/25 05:43:00]

Done.

+
+// Whether the sheet and dialog is about to be closed.
+@property (nonatomic, readonly) BOOL closePending;
+
+// A copy of the sheet's |autoresizesSubviews| flag to restore on show.
+@property (nonatomic) BOOL oldResizesSubviews;
 
 @end
 
-#endif // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
+#endif  // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_