mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #11321 from electron/add-setExtraParameter-deprecation

Browse source 
Add back setExtraParameter() deprecation warning
This commit is contained in:
shelley vohr 2017-12-07 14:49:18 -05:00 committed by GitHub
commit 63c91e7dd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/common/api/crash-reporter.js
View file

@ -4,7 +4,7 @@ const {spawn} = require('child_process')
const os = require('os')
const path = require('path')
const electron = require('electron')
const {app} = process.type === 'browser' ? electron : electron.remote
const {app, deprecate} = process.type === 'browser' ? electron : electron.remote
const binding = process.atomBinding('crash_reporter')
class CrashReporter {
@ -106,14 +106,10 @@ class CrashReporter {
// TODO(2.0) Remove
setExtraParameter (key, value) {
// TODO(alexeykuzmin): Warning disabled since it caused
// a couple of Crash Reported tests to time out on Mac. Add it back.
// https://github.com/electron/electron/issues/11012
// if (!process.noDeprecations) {
// deprecate.warn('crashReporter.setExtraParameter',
// 'crashReporter.addExtraParameter or crashReporter.removeExtraParameter')
// }
if (!process.noDeprecations) {
deprecate.warn('crashReporter.setExtraParameter',
'crashReporter.addExtraParameter or crashReporter.removeExtraParameter')
}
binding.setExtraParameter(key, value)
}

4
spec/fixtures/api/crash-restart.html vendored
View file

@ -24,8 +24,8 @@ if (process.platform === 'win32') {
setImmediate(() => {
if (process.platform === 'darwin') {
crashReporter.setExtraParameter('extra2', 'extra2')
crashReporter.setExtraParameter('extra3', null)
crashReporter.addExtraParameter('extra2', 'extra2')
crashReporter.removeExtraParameter('extra3')
} else {
crashReporter.start({
productName: 'Zombies',