From dcd2bf451db5dd896285c120f8442003c755a7e6 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Mon, 5 Nov 2018 20:42:19 -0800 Subject: [PATCH] refactor: remove 10.9 specific menu code (#15578) --- atom/browser/native_window_mac.mm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 8214c19b9106e..a3034340f248f 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -1358,9 +1358,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) { void NativeWindowMac::AddContentViewLayers() { // Make sure the bottom corner is rounded for non-modal windows: - // http://crbug.com/396264. But do not enable it on OS X 10.9 for transparent - // window, otherwise a semi-transparent frame would show. - if (!(transparent() && base::mac::IsOS10_9()) && !is_modal()) { + // http://crbug.com/396264. + if (!is_modal()) { // For normal window, we need to explicitly set layer for contentView to // make setBackgroundColor work correctly. // There is no need to do so for frameless window, and doing so would make @@ -1397,14 +1396,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) { [[CustomWindowButtonView alloc] initWithFrame:NSZeroRect]); [[window_ contentView] addSubview:buttons_view_]; } else { - if (title_bar_style_ != NORMAL) { - if (base::mac::IsOS10_9()) { - ShowWindowButton(NSWindowZoomButton); - ShowWindowButton(NSWindowMiniaturizeButton); - ShowWindowButton(NSWindowCloseButton); - } + if (title_bar_style_ != NORMAL) return; - } // Hide the window buttons. [[window_ standardWindowButton:NSWindowZoomButton] setHidden:YES];