MacViews: Remove constrained window dependencies for certificate viewer.

chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.mm

Index: chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.mm
new file mode 100644
index 0000000000000000000000000000000000000000..429bb1a212ca426376119726ff1c204b2dd54aa5
--- /dev/null
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.mm
@@ -0,0 +1,112 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.h"
+
+#include "base/logging.h"
+#import "base/mac/foundation_util.h"
+#include "chrome/browser/certificate_viewer.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
+
+class SSLCertificateViewerCocoaBridge : public ConstrainedWindowMacDelegate {
+ public:
+  explicit SSLCertificateViewerCocoaBridge(
+      SSLCertificateViewerCocoa* controller)
+      : controller_(controller) {}
+
+  virtual ~SSLCertificateViewerCocoaBridge() {}
+
+  // ConstrainedWindowMacDelegate implementation:
+  void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override {
+    // |onConstrainedWindowClosed| will delete the sheet which might still be
+    // in use higher up the call stack. Wait for the next cycle of the event
+    // loop to call this function.
+    [controller_ performSelector:@selector(onConstrainedWindowClosed)
+                      withObject:nil
+                      afterDelay:0];
+  }
+
+ private:
+  SSLCertificateViewerCocoa* controller_;  // Weak. Owns this.
+
+  DISALLOW_COPY_AND_ASSIGN(SSLCertificateViewerCocoaBridge);
+};
+
+@implementation SSLCertificateViewerCocoa {
+  base::scoped_nsobject<NSWindow> overlayWindow_;
+  std::unique_ptr<SSLCertificateViewerCocoaBridge> observer_;
+  std::unique_ptr<ConstrainedWindowMac> constrainedWindow_;
+  // A copy of the sheet's frame. Used to restore on show.
+  NSRect oldSheetFrame_;
+}
+
+- (void)sheetDidEnd:(NSWindow*)parent
+         returnCode:(NSInteger)returnCode
+            context:(void*)context {
+  if (![self closePending])
+    constrainedWindow_->CloseWebContentsModalDialog();
+}
+
+- (void)displayForWebContents:(content::WebContents*)webContents {
+  [super displayForWebContents:webContents];
+
+  constrainedWindow_ =
+      CreateAndShowWebModalDialogMac(observer_.get(), webContents, self);
+}
+
+- (NSWindow*)overlayWindow {
+  return overlayWindow_;
+}
+
+- (void)showSheetForWindow:(NSWindow*)window {
+  overlayWindow_.reset([window retain]);
+  [super showSheetForWindow:window];
+}
+
+- (void)closeSheetWithAnimation:(BOOL)withAnimation {
+  overlayWindow_.reset();
+  [super closeSheetWithAnimation:withAnimation];
+}
+
+- (void)hideSheet {
+  NSWindow* sheetWindow = [overlayWindow_ attachedSheet];
+  [sheetWindow setAlphaValue:0.0];
+  [sheetWindow setIgnoresMouseEvents:YES];
+
+  [self setOldResizesSubviews:[[sheetWindow contentView] autoresizesSubviews]];
+  [[sheetWindow contentView] setAutoresizesSubviews:NO];
+}
+
+- (void)unhideSheet {
+  NSWindow* sheetWindow = [overlayWindow_ attachedSheet];
+  [sheetWindow setIgnoresMouseEvents:NO];
+
+  [[sheetWindow contentView] setAutoresizesSubviews:[self oldResizesSubviews]];
+  [[overlayWindow_ attachedSheet] setAlphaValue:1.0];
+}
+
+- (void)makeSheetKeyAndOrderFront {
+  [[overlayWindow_ attachedSheet] makeKeyAndOrderFront:nil];
+}
+
+- (void)onConstrainedWindowClosed {
+  [self deleteSheetWindow];

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

Does certificate_viewer_mac_views.mm need to call this too? - see later comment

But also this might not be needed at all -- the `[self release]` below should
eventually clean it up, but it *might* still be needed in order to "nerf" the
panel. But if *that's* needed, I think the panel_.reset() should instead happen
at the end of closeCertificateSheet

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

Have added a call to this for the MacViews version too, thanks for the help
offline with this! (See previous comment about why I haven't added it to
closeSheetWithAnimation in the superclass.)

Also, while looking at this I noticed that despite the comments, this method is
never actually called because observer_ is never created. Have fixed this now.

+  constrainedWindow_.reset();
+  [self release];
+}
+
+@end
+
+void ShowCertificateViewer(content::WebContents* web_contents,
+                           gfx::NativeWindow parent,
+                           net::X509Certificate* cert) {
+  // SSLCertificateViewerCocoa will manage its own lifetime and will release
+  // itself when the dialog is closed.
+  // See -[SSLCertificateViewerCocoa onConstrainedWindowClosed].
+  SSLCertificateViewerCocoa* viewer =
+      [[SSLCertificateViewerCocoa alloc] initWithCertificate:cert];
+  [viewer displayForWebContents:web_contents];
+}