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..2ac747067f2728a21092333d407fa7c421cefa54 |
--- /dev/null |
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac_cocoa.mm |
@@ -0,0 +1,106 @@ |
+// 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 |
+ |
+- (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); |
+} |
+ |
+- (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]; |
+ |
+ oldResizesSubviews_ = [[sheetWindow contentView] autoresizesSubviews]; |
+ [[sheetWindow contentView] setAutoresizesSubviews:NO]; |
+} |
+ |
+- (void)unhideSheet { |
+ NSWindow* sheetWindow = [overlayWindow_ attachedSheet]; |
+ [sheetWindow setIgnoresMouseEvents:NO]; |
+ |
+ [[sheetWindow contentView] setAutoresizesSubviews:oldResizesSubviews_]; |
+ [[overlayWindow_ attachedSheet] setAlphaValue:1.0]; |
+} |
+ |
+- (void)makeSheetKeyAndOrderFront { |
+ [[overlayWindow_ attachedSheet] makeKeyAndOrderFront:nil]; |
+} |
+ |
+- (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]; |
+} |