From 85119db81afb58729bfd66a282838e5780c73a15 Mon Sep 17 00:00:00 2001 From: joshaber Date: Fri, 8 May 2015 16:28:24 -0400 Subject: [PATCH] Use a new option to opt into the standard window. --- atom/browser/native_window_mac.mm | 6 +++--- atom/common/options_switches.cc | 3 +++ atom/common/options_switches.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 4dac6b7..70276c9 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -310,12 +310,12 @@ NativeWindowMac::NativeWindowMac(content::WebContents* web_contents, width, height); - bool useFrame = true; - options.Get(switches::kFrame, &useFrame); + bool useStandardWindow = false; + options.Get(switches::kStandardWindow, &useStandardWindow); NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask; - if (!useFrame) { + if (!useStandardWindow) { styleMask |= NSTexturedBackgroundWindowMask; } diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc index c479b50..bfe34ee 100644 --- a/atom/common/options_switches.cc +++ b/atom/common/options_switches.cc @@ -78,6 +78,9 @@ const char kType[] = "type"; // Disable auto-hiding cursor. const char kDisableAutoHideCursor[] = "disable-auto-hide-cursor"; +// Use the OS X's standard window instead of the textured window. +const char kStandardWindow[] = "standard-window"; + // Web runtime features. const char kExperimentalFeatures[] = "experimental-features"; const char kExperimentalCanvasFeatures[] = "experimental-canvas-features"; diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h index 546c6a0..118271b 100644 --- a/atom/common/options_switches.h +++ b/atom/common/options_switches.h @@ -42,6 +42,7 @@ extern const char kPreloadScript[]; extern const char kTransparent[]; extern const char kType[]; extern const char kDisableAutoHideCursor[]; +extern const char kStandardWindow[]; extern const char kExperimentalFeatures[]; extern const char kExperimentalCanvasFeatures[]; -- 2.7.4