From 432b912c6ac7385228d5a64e9685b3f4540917f8 Mon Sep 17 00:00:00 2001
From: Zachary Flower <zach@zacharyflower.com>
Date: Wed, 13 Sep 2017 12:16:37 -0600
Subject: [PATCH] :art: Rename ambiguous simple_fullscreen_ variable to
 always_simple_fullscreen_

---
 atom/browser/native_window_mac.h  | 4 ++--
 atom/browser/native_window_mac.mm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
index 5515ed72e733..bab6671d6764 100644
--- a/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@ -137,7 +137,7 @@ class NativeWindowMac : public NativeWindow,
 
   bool fullscreen_window_title() const { return fullscreen_window_title_; }
 
-  bool simple_fullscreen() const { return simple_fullscreen_; }
+  bool simple_fullscreen() const { return always_simple_fullscreen_; }
 
  protected:
   // Return a vector of non-draggable regions that fill a window of size
@@ -194,7 +194,7 @@ class NativeWindowMac : public NativeWindow,
   TitleBarStyle title_bar_style_;
 
   // Simple (pre-Lion) Fullscreen Settings
-  bool simple_fullscreen_;
+  bool always_simple_fullscreen_;
   bool is_simple_fullscreen_;
   bool was_maximizable_;
   bool was_movable_;
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 72e9441804af..e47fe513d23e 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -827,7 +827,7 @@ NativeWindowMac::NativeWindowMac(
       fullscreen_window_title_(false),
       attention_request_id_(0),
       title_bar_style_(NORMAL),
-      simple_fullscreen_(false),
+      always_simple_fullscreen_(false),
       is_simple_fullscreen_(false) {
   int width = 800, height = 600;
   options.Get(options::kWidth, &width);
@@ -974,7 +974,7 @@ NativeWindowMac::NativeWindowMac(
 
   options.Get(options::kFullscreenWindowTitle, &fullscreen_window_title_);
 
-  options.Get(options::kSimpleFullScreen, &simple_fullscreen_);
+  options.Get(options::kSimpleFullScreen, &always_simple_fullscreen_);
 
   // Enable the NSView to accept first mouse event.
   bool acceptsFirstMouse = false;