Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4409)

Unified Diff: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

Issue 2559763003: Mac: Fix SSLClientCertificateSelectorCocoaTest.HideShow (fails on macOS Sierra). (Closed)
Patch Set: Cleanup. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
index 2400ec2a628b0d097d0a923b49c98a5364e20d26..aa06b2d989ff696541645153fad4f79cd81ca48b 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
@@ -282,25 +282,17 @@ void ClearTableViewDataSourcesIfNeeded(NSWindow*) {}
- (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);
- [sheetWindow setFrame:ui::kWindowSizeDeterminedLater display:NO];
}
- (void)unhideSheet {
NSWindow* sheetWindow = [overlayWindow_ attachedSheet];
- NSRect overlayFrame = [overlayWindow_ frame];
- oldSheetFrame_.origin.x += NSMinX(overlayFrame);
- oldSheetFrame_.origin.y += NSMinY(overlayFrame);
- [sheetWindow setFrame:oldSheetFrame_ display:NO];
[[sheetWindow contentView] setAutoresizesSubviews:oldResizesSubviews_];
- [[overlayWindow_ attachedSheet] setAlphaValue:1.0];
+ [sheetWindow setAlphaValue:1.0];
+ [sheetWindow setIgnoresMouseEvents:NO];
}
- (void)pulseSheet {

Powered by Google App Engine
This is Rietveld 408576698