From 62d9bf9baeb25c30d903db2be3fae84d93fa53e7 Mon Sep 17 00:00:00 2001
From: Shubham <shubham2892@gmail.com>
Date: Tue, 30 May 2017 17:26:02 -0400
Subject: [PATCH] :art: :white_check_mark: code comments and test for
 getMenuBarHeight function

---
 atom/browser/api/atom_api_screen.cc     |  4 ++--
 atom/browser/api/atom_api_screen_mac.mm |  9 ++++++---
 filenames.gypi                          |  2 +-
 spec/api-screen-spec.js                 | 12 ++++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/atom/browser/api/atom_api_screen.cc b/atom/browser/api/atom_api_screen.cc
index 699bf1136105..a87d6d3598f8 100644
--- a/atom/browser/api/atom_api_screen.cc
+++ b/atom/browser/api/atom_api_screen.cc
@@ -120,9 +120,9 @@ void Screen::BuildPrototype(
       .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
       .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
       .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
-      #if defined(OS_MACOSX)
+#if defined(OS_MACOSX)
       .SetMethod("getMenuBarHeight", &Screen::getMenuBarHeight)
-      #endif
+#endif
       .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
 }
 
diff --git a/atom/browser/api/atom_api_screen_mac.mm b/atom/browser/api/atom_api_screen_mac.mm
index 85537f082041..56c83fd89f8c 100644
--- a/atom/browser/api/atom_api_screen_mac.mm
+++ b/atom/browser/api/atom_api_screen_mac.mm
@@ -1,3 +1,7 @@
+// Copyright (c) 2017 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
 #import "atom/browser/api/atom_api_screen.h"
 
 #import <Cocoa/Cocoa.h>
@@ -5,11 +9,10 @@
 namespace atom {
 
 namespace api {
-#if defined(OS_MACOSX)
-int Screen::getMenuBarHeight(){
+int Screen::getMenuBarHeight() {
   return [[NSApp mainMenu] menuBarHeight];
 }
-#endif
+
 }// namespace api
 
 }// namespace atom
diff --git a/filenames.gypi b/filenames.gypi
index a55c083ffc45..4d06d42a697e 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -135,9 +135,9 @@
       'atom/browser/api/atom_api_protocol.h',
       'atom/browser/api/atom_api_render_process_preferences.cc',
       'atom/browser/api/atom_api_render_process_preferences.h',
-      'atom/browser/api/atom_api_screen_mac.mm',
       'atom/browser/api/atom_api_screen.cc',
       'atom/browser/api/atom_api_screen.h',
+      'atom/browser/api/atom_api_screen_mac.mm',
       'atom/browser/api/atom_api_session.cc',
       'atom/browser/api/atom_api_session.h',
       'atom/browser/api/atom_api_system_preferences.cc',
diff --git a/spec/api-screen-spec.js b/spec/api-screen-spec.js
index 8c4f4305baff..8516e76480f9 100644
--- a/spec/api-screen-spec.js
+++ b/spec/api-screen-spec.js
@@ -18,4 +18,16 @@ describe('screen module', function () {
       assert(display.size.height > 0)
     })
   })
+
+  describe('screen.getMenuBarHeight()', function () {
+    if (process.platform !== 'darwin') {
+      return
+    }
+
+    it('returns an integer', function () {
+      var screenHeight = screen.getMenuBarHeight()
+      assert.equal(typeof screenHeight, 'number')
+    })
+  })
+
 })