MacViews: Refactor certificate viewer tests to work for MacViews browser.

chrome/browser/ui/cocoa/certificate_viewer_mac.mm

 // Copyright (c) 2012 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.h"
 
 #include <Security/Security.h>
 #include <SecurityInterface/SFCertificatePanel.h>
 #include <vector>
 
@@ skipping 147 matching lines @@
   closePending_ = YES;
   overlayWindow_.reset();
   // Closing the sheet using -[NSApp endSheet:] doesn't work so use the private
   // method.
   [panel_ _dismissWithCode:NSFileHandlingPanelCancelButton];
 }
 
 - (void)hideSheet {
   NSWindow* sheetWindow = [overlayWindow_ attachedSheet];
   [sheetWindow setAlphaValue:0.0];
+  [sheetWindow setIgnoresMouseEvents:YES];
 
   oldResizesSubviews_ = [[sheetWindow contentView] autoresizesSubviews];
   [[sheetWindow contentView] setAutoresizesSubviews:NO];
-
-  oldSheetFrame_ = [sheetWindow frame];
-  NSRect overlayFrame = [overlayWindow_ frame];
-  oldSheetFrame_.origin.x -= NSMinX(overlayFrame);
-  oldSheetFrame_.origin.y -= NSMinY(overlayFrame);
-  oldOverlaySize_ = [overlayWindow_ frame].size;
-  [sheetWindow setFrame:ui::kWindowSizeDeterminedLater display:NO];
 }
 
 - (void)unhideSheet {
   NSWindow* sheetWindow = [overlayWindow_ attachedSheet];
-  NSRect overlayFrame = [overlayWindow_ frame];
-
-  // If the overlay frame's size has changed, the position offsets need to be

[tapted, 2016/06/17 06:11:33]

So does this happen automatically? (i.e. does the sheet always reposition itself
appropriately)

[Patti Lor, 2016/06/20 03:42:28]

Yep, the certificate viewer position is controlled by
ConstrainedWindowSheetController
updateSheetPosition/overlayWindowFrameForParentView (see
constrained_window_sheet_controller.mm).

-  // calculated. Since the certificate is horizontally centered, so the x
-  // offset is calculated by halving the width difference. In addition,
-  // because the certificate is located directly below the toolbar, the y
-  // offset is just the difference in height.
-  CGFloat yOffset = (NSHeight(overlayFrame) - oldOverlaySize_.height);
-  CGFloat xOffset = (NSWidth(overlayFrame) - oldOverlaySize_.width) / 2;
-
-  oldSheetFrame_.origin.x += NSMinX(overlayFrame) + xOffset;
-  oldSheetFrame_.origin.y += NSMinY(overlayFrame) + yOffset;
-  [sheetWindow setFrame:oldSheetFrame_ display:NO];
+  [sheetWindow setIgnoresMouseEvents:NO];
 
   [[sheetWindow contentView] setAutoresizesSubviews:oldResizesSubviews_];
   [[overlayWindow_ attachedSheet] setAlphaValue:1.0];
 }
 
 - (void)pulseSheet {
   // NOOP
 }
 
 - (void)makeSheetKeyAndOrderFront {
@@ skipping 12 matching lines @@
   return panel_;
 }
 
 - (void)onConstrainedWindowClosed {
   panel_.reset();
   constrainedWindow_.reset();
   [self release];
 }
 
 @end