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..ab0a9657d6ec80e32e17f28564ea0cb73c95a117
--- /dev/null
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.mm
@@ -0,0 +1,71 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.

[tapted, 2016/05/04 03:29:24]

(c) 2012 -> 2016? Otherwise, can you play with `git cl upload --similarity to
get this to appear as a git-move from certificate_viewer_mac.mm

[Patti Lor, 2016/05/11 01:35:18]

Done.

+// 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"
+#include "base/mac/foundation_util.h"

[tapted, 2016/05/04 03:29:24]

nit: import

[Patti Lor, 2016/05/11 01:35:18]

Done.

+#include "chrome/browser/certificate_viewer.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 *

[tapted, 2016/05/04 03:29:24]

no space between SSLCertificateViewerCocoa and "*" - also the formatting is
weird - `git cl format`?

[Patti Lor, 2016/05/11 01:35:18]

Done.

+                                           controller)
+      : controller_(controller) {
+  }
+
+  virtual ~SSLCertificateViewerCocoaBridge() {}
+
+  // ConstrainedWindowMacDelegate implementation:
+  void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override {
+    // |onConstrainedWindowClosed| will delete the sheet which might be still

[tapted, 2016/05/04 03:29:24]

nit: still -> still be

[Patti Lor, 2016/05/11 01:35:18]

Done.

+    // 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

[tapted, 2016/05/04 03:29:24]

nit: // Weak. Owns this.

[Patti Lor, 2016/05/11 01:35:18]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(SSLCertificateViewerCocoaBridge);
+};
+
+@implementation SSLCertificateViewerCocoa
+
+- (void)sheetDidEnd:(NSWindow*)parent
+         returnCode:(NSInteger)returnCode
+            context:(void*)context {
+  if (!closePending_)
+    constrainedWindow_->CloseWebContentsModalDialog();
+}
+
+- (void)displayForWebContents:(content::WebContents*)webContents {
+  [super displayForWebContents:webContents];
+
+  constrainedWindow_ =
+      CreateAndShowWebModalDialogMac(observer_.get(), webContents, self);
+}
+
+- (void)onConstrainedWindowClosed {
+  panel_.reset();
+  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];
+}