From bce62622bb4b9fa0a3e2ba843be09896d8613662 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 22 Sep 2016 09:22:28 -0700
Subject: [PATCH] Fix compiler errors

---
 atom/browser/native_window.h      |  3 ++-
 atom/browser/native_window_mac.mm | 42 +++++++++++++++----------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 4032861ac5..d8c022d606 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -118,7 +118,8 @@ class NativeWindow : public base::SupportsUserData,
   virtual bool IsFullScreenable() = 0;
   virtual void SetClosable(bool closable) = 0;
   virtual bool IsClosable() = 0;
-  virtual void SetAlwaysOnTop(bool top, const std::string& level) = 0;
+  virtual void SetAlwaysOnTop(bool top,
+                              const std::string& level = "floating") = 0;
   virtual bool IsAlwaysOnTop() = 0;
   virtual void Center() = 0;
   virtual void SetTitle(const std::string& title) = 0;
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 6582ac3b11..02a376a649 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -943,28 +943,28 @@ bool NativeWindowMac::IsClosable() {
   return [window_ styleMask] & NSClosableWindowMask;
 }
 
-void NativeWindowMac::SetAlwaysOnTop(bool top, std::string level) {
-  int intLevel;
-  if (level == "normal") {
-    intLevel = NSNormalWindowLevel;
-  } else if (level == "floating") {
-    intLevel = NSFloatingWindowLevel;
-  } else if (level == "torn-off-menu") {
-    intLevel = NSTornOffMenuWindowLevel;
-  } else if (level == "modal-panel") {
-    intLevel = NSModalPanelWindowLevel;
-  } else if (level == "main-menu") {
-    intLevel = NSMainMenuWindowLevel;
-  } else if (level == "status") {
-    intLevel = NSStatusWindowLevel;
-  } else if (level == "pop-up-menu") {
-    intLevel = NSPopUpMenuWindowLevel;
-  } else if (level == "screen-saver") {
-    intLevel = NSScreenSaverWindowLevel;
-  } else if (level == "dock") {
-    intLevel = NSDockWindowLevel;
+void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level) {
+  int windowLevel = NSNormalWindowLevel;
+  if (top) {
+    if (level == "floating") {
+      windowLevel = NSFloatingWindowLevel;
+    } else if (level == "torn-off-menu") {
+      windowLevel = NSTornOffMenuWindowLevel;
+    } else if (level == "modal-panel") {
+      windowLevel = NSModalPanelWindowLevel;
+    } else if (level == "main-menu") {
+      windowLevel = NSMainMenuWindowLevel;
+    } else if (level == "status") {
+      windowLevel = NSStatusWindowLevel;
+    } else if (level == "pop-up-menu") {
+      windowLevel = NSPopUpMenuWindowLevel;
+    } else if (level == "screen-saver") {
+      windowLevel = NSScreenSaverWindowLevel;
+    } else if (level == "dock") {
+      windowLevel = NSDockWindowLevel;
+    }
   }
-  [window_ setLevel:(top ? intLevel : NSNormalWindowLevel)];
+  [window_ setLevel:windowLevel];
 }
 
 bool NativeWindowMac::IsAlwaysOnTop() {