From 199cf31b9ec654db55523e588899ad79b643c7da Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 5 Mar 2018 19:45:51 -0500
Subject: [PATCH 1/2] deprecate screen.getMenuBarHeight

---
 atom/browser/api/atom_api_screen_mac.mm | 1 +
 lib/browser/api/screen.js               | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/atom/browser/api/atom_api_screen_mac.mm b/atom/browser/api/atom_api_screen_mac.mm
index 0d22fad5b8..056b775fdf 100644
--- a/atom/browser/api/atom_api_screen_mac.mm
+++ b/atom/browser/api/atom_api_screen_mac.mm
@@ -9,6 +9,7 @@ namespace atom {
 
 namespace api {
 
+//TODO(codebytere): deprecated; remove in 3.0
 int Screen::getMenuBarHeight() {
   return [[NSApp mainMenu] menuBarHeight];
 }
diff --git a/lib/browser/api/screen.js b/lib/browser/api/screen.js
index 8287bfa8bf..bbbc1bbe17 100644
--- a/lib/browser/api/screen.js
+++ b/lib/browser/api/screen.js
@@ -1,8 +1,17 @@
 const {EventEmitter} = require('events')
+const {deprecate} = require('electron')
 const {screen, Screen} = process.atomBinding('screen')
 
 // Screen is an EventEmitter.
 Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
 EventEmitter.call(screen)
 
+const nativeFn = screen.getMenuBarHeight
+screen.getMenuBarHeight = function () {
+  if (!process.noDeprecations) {
+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
+  }
+  return nativeFn.call(this)
+}
+
 module.exports = screen

From 3635872f37f27829c85a22946e86152dc3517e14 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 5 Mar 2018 20:10:34 -0500
Subject: [PATCH 2/2] remove screen.getMenuBarHeight spec

---
 spec/api-screen-spec.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/spec/api-screen-spec.js b/spec/api-screen-spec.js
index bb60826b2d..910bca8454 100644
--- a/spec/api-screen-spec.js
+++ b/spec/api-screen-spec.js
@@ -18,17 +18,4 @@ describe('screen module', () => {
       assert(display.size.height > 0)
     })
   })
-
-  describe('screen.getMenuBarHeight()', () => {
-    before(function () {
-      if (process.platform !== 'darwin') {
-        this.skip()
-      }
-    })
-
-    it('returns an integer', () => {
-      const screenHeight = screen.getMenuBarHeight()
-      assert.equal(typeof screenHeight, 'number')
-    })
-  })
 })