From 438ac61ff782a30d98a090ef90a38a3445c34fd5 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 23 May 2018 09:04:39 -0700
Subject: [PATCH] remove clipboard deprecations

---
 docs/tutorial/planned-breaking-changes.md | 33 -----------------------
 lib/common/api/clipboard.js               | 33 -----------------------
 2 files changed, 66 deletions(-)

diff --git a/docs/tutorial/planned-breaking-changes.md b/docs/tutorial/planned-breaking-changes.md
index 08fa88491af4..ffe4c8d30033 100644
--- a/docs/tutorial/planned-breaking-changes.md
+++ b/docs/tutorial/planned-breaking-changes.md
@@ -5,15 +5,6 @@ The following list includes the APIs that will be removed in Electron 3.0.
 There is no timetable for when this release will occur but deprecation
 warnings will be added at least [one major version](electron-versioning.md#semver) beforehand.
 
-## `app`
-
-```js
-// Deprecated
-app.getAppMemoryInfo()
-// Replace with
-app.getAppMetrics()
-```
-
 ## `BrowserWindow`
 
 ```js
@@ -38,30 +29,6 @@ window.on('app-command', (e, cmd) => {
 })
 ```
 
-## `clipboard`
-
-```js
-// Deprecated
-clipboard.readRtf()
-// Replace with
-clipboard.readRTF()
-
-// Deprecated
-clipboard.writeRtf()
-// Replace with
-clipboard.writeRTF()
-
-// Deprecated
-clipboard.readHtml()
-// Replace with
-clipboard.readHTML()
-
-// Deprecated
-clipboard.writeHtml()
-// Replace with
-clipboard.writeHTML()
-```
-
 ## `crashReporter`
 
 ```js
diff --git a/lib/common/api/clipboard.js b/lib/common/api/clipboard.js
index d5efbdb06aee..b52524d75998 100644
--- a/lib/common/api/clipboard.js
+++ b/lib/common/api/clipboard.js
@@ -2,41 +2,8 @@ if (process.platform === 'linux' && process.type === 'renderer') {
   // On Linux we could not access clipboard in renderer process.
   module.exports = require('electron').remote.clipboard
 } else {
-  const {deprecate} = require('electron')
   const clipboard = process.atomBinding('clipboard')
 
-  // TODO(codebytere): remove in 3.0
-  clipboard.readHtml = function () {
-    if (!process.noDeprecations) {
-      deprecate.warn('clipboard.readHtml', 'clipboard.readHTML')
-    }
-    return clipboard.readHTML()
-  }
-
-  // TODO(codebytere): remove in 3.0
-  clipboard.writeHtml = function () {
-    if (!process.noDeprecations) {
-      deprecate.warn('clipboard.writeHtml', 'clipboard.writeHTML')
-    }
-    return clipboard.writeHTML()
-  }
-
-  // TODO(codebytere): remove in 3.0
-  clipboard.readRtf = function () {
-    if (!process.noDeprecations) {
-      deprecate.warn('clipboard.readRtf', 'clipboard.writeRTF')
-    }
-    return clipboard.readRTF()
-  }
-
-  // TODO(codebytere): remove in 3.0
-  clipboard.writeRtf = function () {
-    if (!process.noDeprecations) {
-      deprecate.warn('clipboard.writeRtf', 'clipboard.writeRTF')
-    }
-    return clipboard.writeRTF()
-  }
-
   // Read/write to find pasteboard over IPC since only main process is notified
   // of changes
   if (process.platform === 'darwin' && process.type === 'renderer') {