Bump v7.0.0-beta.2

* fix: crash on print cancellation

* fix: update printing patch for new options

* refactor: use DictionaryValue for printBackground

.eslintrc.json

@@ -6,11 +6,9 @@
     "browser": true
   },
   "rules": {
-    "semi": ["error", "always"],
     "no-var": "error",
     "no-unused-vars": 0,
     "no-global-assign": 0,
-    "guard-for-in": 2,
     "@typescript-eslint/no-unused-vars": ["error", {
       "vars": "all",
       "args": "after-used",
@@ -19,29 +17,18 @@
     "prefer-const": ["error", {
       "destructuring": "all"
     }],
-    "standard/no-callback-literal": "off",
     "node/no-deprecated-api": 0
   },
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module"
   },
-  "globals": {
-    "standardScheme": "readonly"
-  },
   "overrides": [
     {
       "files": "*.js",
       "rules": {
           "@typescript-eslint/no-unused-vars": "off"
       }
-    },
-    {
-      "files": "*.d.ts",
-      "rules": {
-          "no-useless-constructor": "off",
-          "@typescript-eslint/no-unused-vars": "off"
-      }
     }
   ]
 }

.gitattributes

@@ -1,4 +1,3 @@
 # `git apply` and friends don't understand CRLF, even on windows. Force those
 # files to be checked out with LF endings even if core.autocrlf is true.
 *.patch text eol=lf
-patches/**/.patches merge=union

.github/CODEOWNERS

@@ -11,7 +11,6 @@
 
 # Upgrades WG
 /patches/                               @electron/wg-upgrades
-DEPS                                    @electron/wg-upgrades
 
 # Docs & Tooling WG
 /default_app/ @electron/wg-docs-tools

.github/ISSUE_TEMPLATE/security_report.md

@@ -0,0 +1,10 @@
+---
+name: Security report
+about: Do not create an issue for security reports, send an email to security@electronjs.org
+
+---
+
+### Notice 
+
+**DO NOT** create an issue for security reports.
+Send an email to: **security@electronjs.org**.

.github/config.yml

@@ -29,11 +29,13 @@ firstPRMergeComment: >
 # Users authorized to run manual trop backports
 authorizedUsers:
   - alexeykuzmin
+  - BinaryMuse
   - ckerr
   - codebytere
   - deepak1556
   - jkleinsc
   - MarshallOfSound
   - miniak
+  - nitsakh
   - nornagon
   - zcbenz

.github/main.workflow

@@ -0,0 +1,10 @@
+workflow "Clerk" {
+  #TODO(codebytere): make this work properly on pull_request
+  on = "repository_dispatch"
+  resolves = "Check release notes"
+}
+
+action "Check release notes" {
+  uses = "electron/clerk@master"
+  secrets = [ "GITHUB_TOKEN" ]
+}

.github/stale.yml

@@ -0,0 +1,25 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 45
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+   - fixme/bug
+   - fixme/crash
+   - fixme/regression
+   - fixme/security
+   - blocked
+   - blocking-stable
+   - needs-review
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity and is not currently prioritized. It will be closed
+  in a week if no further activity occurs :)
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  If you still think this issue is relevant, please ping a maintainer or
+  leave a comment!

.gitignore

@@ -58,11 +58,10 @@ spec/.hash
 .eslintcache
 
 # Generated native addon files
-/spec-main/fixtures/native-addon/echo/build/
+/spec/fixtures/native-addon/echo/build/
 
 # If someone runs tsc this is where stuff will end up
 ts-gen
 
 # Used to accelerate CI builds
 .depshash
-.depshash-target

CONTRIBUTING.md

@@ -20,11 +20,13 @@ Issues are created [here](https://github.com/electron/electron/issues/new).
 * [Triaging a Bug Report](https://electronjs.org/docs/development/issues#triaging-a-bug-report)
 * [Resolving a Bug Report](https://electronjs.org/docs/development/issues#resolving-a-bug-report)
 
-### Issue Closure
-
-Bug reports will be closed if the issue has been inactive and the latest affected version no longer receives support. At the moment, Electron maintains its three latest major versions, with a new major version being released every 12 weeks. (For more information on Electron's release cadence, see [this blog post](https://electronjs.org/blog/12-week-cadence).)
-
-_If an issue has been closed and you still feel it's relevant, feel free to ping a maintainer or add a comment!_
+### Issue Maintenance and Closure
+* If an issue is inactive for 45 days (no activity of any kind), it will be
+marked for closure with `stale`.
+* If after this label is applied, no further activity occurs in the next 7 days,
+the issue will be closed.
+  * If an issue has been closed and you still feel it's relevant, feel free to
+  ping a maintainer or add a comment!
 
 ### Languages
 

DEPS

@@ -5,16 +5,14 @@ gclient_gn_args = [
   'checkout_android_native_support',
   'checkout_libaom',
   'checkout_nacl',
-  'checkout_oculus_sdk',
-  'checkout_openxr',
-  'checkout_google_benchmark'
+  'checkout_oculus_sdk'
 ]
 
 vars = {
   'chromium_version':
-    '83.0.4103.26',
+    '78.0.3866.0',
   'node_version':
-    'v12.14.1',
+    'v12.6.0',
   'nan_version':
     '2ee313aaca52e2b478965ac50eb5082520380d1b',
 
@@ -62,16 +60,12 @@ vars = {
     True,
   'checkout_oculus_sdk':
     False,
-  'checkout_openxr':
-    False,
   'build_with_chromium':
     True,
   'checkout_android':
     False,
   'checkout_android_native_support':
     False,
-  'checkout_google_benchmark':
-    False,
 }
 
 deps = {
@@ -117,7 +111,7 @@ hooks = [
     'pattern': 'src/electron/script/update-external-binaries.py',
     'condition': 'download_external_binaries',
     'action': [
-      'python3',
+      'python',
       'src/electron/script/update-external-binaries.py',
     ],
   },
@@ -155,5 +149,3 @@ hooks = [
 recursedeps = [
   'src',
 ]
-
-# Touch DEPS again to bust cache

Dockerfile

@@ -0,0 +1,50 @@
+FROM ubuntu:18.04
+
+RUN groupadd --gid 1000 builduser \
+  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
+
+# Set up TEMP directory
+ENV TEMP=/tmp
+RUN chmod a+rwx /tmp
+
+# Install Linux packages
+ADD build/install-build-deps.sh /setup/install-build-deps.sh
+RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
+RUN dpkg --add-architecture i386
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    curl \
+    libnotify-bin \
+    locales \
+    lsb-release \
+    nano \
+    python-dbus \
+    python-pip \
+    python-setuptools \
+    sudo \
+    vim-nox \
+    wget \
+    g++-multilib \
+    libgl1:i386 \
+  && /setup/install-build-deps.sh --syms --no-prompt --no-chromeos-fonts --lib32 --arm \
+  && rm -rf /var/lib/apt/lists/*
+
+# Install Node.js
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+# crcmod is required by gsutil, which is used for filling the gclient git cache
+RUN pip install -U crcmod
+
+# dbusmock is needed for Electron tests
+RUN pip install python-dbusmock
+
+RUN mkdir /tmp/workspace
+RUN chown builduser:builduser /tmp/workspace
+
+# Add xvfb init script
+ADD tools/xvfb-init.sh /etc/init.d/xvfb
+RUN chmod a+x /etc/init.d/xvfb
+
+USER builduser
+WORKDIR /home/builduser

Dockerfile.arm32v7

@@ -0,0 +1,59 @@
+FROM arm32v7/ubuntu:18.04
+
+RUN groupadd --gid 1000 builduser \
+  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
+
+# Set up TEMP directory
+ENV TEMP=/tmp
+RUN chmod a+rwx /tmp
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ bison \
+ build-essential \
+ clang \
+ curl \
+ gperf \
+ git \
+ libasound2 \
+ libasound2-dev \
+ libcap-dev \
+ libcups2-dev \
+ libdbus-1-dev \
+ libgnome-keyring-dev \
+ libgtk2.0-0 \
+ libgtk2.0-dev \
+ libgtk-3-0 \
+ libgtk-3-dev \
+ libnotify-bin \
+ libnss3 \
+ libnss3-dev \
+ libxss1 \
+ libxtst-dev \
+ libxtst6 \
+ lsb-release \
+ locales \
+ nano \
+ python-setuptools \
+ python-pip \
+ python-dbusmock \
+ sudo \
+ unzip \
+ wget \
+ xvfb \
+&& rm -rf /var/lib/apt/lists/*
+
+# Install Node.js
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+# crcmod is required by gsutil, which is used for filling the gclient git cache
+RUN pip install -U crcmod
+
+ADD tools/xvfb-init.sh /etc/init.d/xvfb
+RUN chmod a+x /etc/init.d/xvfb
+
+RUN usermod -aG sudo builduser
+RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+WORKDIR /home/builduser

Dockerfile.arm64v8

@@ -0,0 +1,65 @@
+FROM arm64v8/ubuntu:18.04
+
+RUN groupadd --gid 1000 builduser \
+  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
+
+# Set up TEMP directory
+ENV TEMP=/tmp
+RUN chmod a+rwx /tmp
+
+RUN dpkg --add-architecture armhf
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ bison \
+ build-essential \
+ clang \
+ curl \
+ gperf \
+ git \
+ libasound2 \
+ libasound2-dev \
+ libc6:armhf \
+ libcap-dev \
+ libcups2-dev \
+ libdbus-1-dev \
+ libgnome-keyring-dev \
+ libgtk2.0-0 \
+ libgtk2.0-dev \
+ libgtk-3-0 \
+ libgtk-3-dev \
+ libnotify-bin \
+ libnss3 \
+ libnss3-dev \
+ libstdc++6:armhf \
+ libxss1 \
+ libxtst-dev \
+ libxtst6 \
+ lsb-release \
+ locales \
+ nano \
+ python-setuptools \
+ python-pip \
+ sudo \
+ unzip \
+ wget \
+ xvfb \
+&& rm -rf /var/lib/apt/lists/*
+
+# Install Node.js
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+# crcmod is required by gsutil, which is used for filling the gclient git cache
+RUN pip install -U crcmod
+
+# dbusmock is needed for Electron tests
+RUN pip install python-dbusmock
+
+ADD tools/xvfb-init.sh /etc/init.d/xvfb
+RUN chmod a+x /etc/init.d/xvfb
+
+RUN usermod -aG sudo builduser
+RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+WORKDIR /home/builduser

ELECTRON_VERSION

@@ -1 +1 @@
-9.0.0-beta.21
+7.0.0-beta.2

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2020 GitHub Inc.
+Copyright (c) 2013-2019 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -58,13 +58,13 @@ npm start
 
 ## Resources for learning Electron
 
-- [electronjs.org/docs](https://electronjs.org/docs) - All of Electron's documentation
+- [electronjs.org/docs](https://electronjs.org/docs) - all of Electron's documentation
 - [electron/fiddle](https://github.com/electron/fiddle) - A tool to build, run, and package small Electron experiments
-- [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - A very basic starter Electron app
-- [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - Sample starter apps created by the community
-- [electron/simple-samples](https://github.com/electron/simple-samples) - Small applications with ideas for taking them further
-- [electron/electron-api-demos](https://github.com/electron/electron-api-demos) - An Electron app that teaches you how to use Electron
-- [hokein/electron-sample-apps](https://github.com/hokein/electron-sample-apps) - Small demo apps for the various Electron APIs
+- [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - a very basic starter Electron app
+- [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - sample starter apps created by the community
+- [electron/simple-samples](https://github.com/electron/simple-samples) - small applications with ideas for taking them further
+- [electron/electron-api-demos](https://github.com/electron/electron-api-demos) - an Electron app that teaches you how to use Electron
+- [hokein/electron-sample-apps](https://github.com/hokein/electron-sample-apps) - small demo apps for the various Electron APIs
 
 ## Programmatic usage
 

appveyor.yml

@@ -1,5 +1,5 @@
 # The config expects the following environment variables to be set:
-#  - "GN_CONFIG" Build type. One of {'testing', 'release'}.
+#  - "GN_CONFIG" Build type. One of {'debug', 'testing', 'release'}.
 #  - "GN_EXTRA_ARGS" Additional gn arguments for a build config,
 #      e.g. 'target_cpu="x86"' to build for a 32bit platform.
 #      https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu
@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: libcc-20
-image: vs2019bt-16.4.0
+image: vs2017-15.9-10.0.18362
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -50,12 +50,6 @@ build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
         Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-      } else {
-        node script/yarn.js install --frozen-lockfile
-
-        if ($(node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH;$LASTEXITCODE -eq 0)) {
-          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
-        }
       }
   - echo "Building $env:GN_CONFIG build"
   - git config --global core.longpaths true
@@ -66,7 +60,7 @@ build_script:
   - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        $env:GCLIENT_EXTRA_ARGS="$env:GCLIENT_EXTRA_ARGS --custom-var=checkout_boto=True --custom-var=checkout_requests=True"
+        $env:GCLIENT_EXTRA_ARGS="--custom-var=checkout_boto=True --custom-var=checkout_requests=True"
       } else {
         $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
       }
@@ -76,92 +70,25 @@ build_script:
       --unmanaged
       %GCLIENT_EXTRA_ARGS%
       "https://github.com/electron/electron"
-  - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
-        $env:RUN_GCLIENT_SYNC="true"
-      } else {
-        cd src\electron
-        node script\generate-deps-hash.js
-        $depshash = Get-Content .\.depshash -Raw 
-        $zipfile = "Z:\$depshash.7z"
-        cd ..\..
-        if (Test-Path -Path $zipfile) {
-          # file exists, unzip and then gclient sync
-          7z x -y $zipfile -mmt=30 -aoa
-          if (-not (Test-Path -Path "src\buildtools")) {
-            # the zip file must be corrupt - resync
-            $env:RUN_GCLIENT_SYNC="true"
-            if ($env:TARGET_ARCH -ne 'ia32') {
-              # only save on x64/woa to avoid contention saving
-              $env:SAVE_GCLIENT_SRC="true"
-            }
-          } else {
-            # update external binaries
-            python src/electron/script/update-external-binaries.py
-          }
-        } else {    
-          # file does not exist, gclient sync, then zip
-          $env:RUN_GCLIENT_SYNC="true"
-          if ($env:TARGET_ARCH -ne 'ia32') {
-            # only save on x64/woa to avoid contention saving
-            $env:SAVE_GCLIENT_SRC="true"
-          }
-        }
-      }
-  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags --ignore_locks)
-  - ps: >-
-      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
-        # archive current source for future use 
-        # only run on x64/woa to avoid contention saving
-        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
-          Write-warning "Could not save source to shared drive; continuing anyway"
-        }
-      }
-  - ps: >-
-      if ($env:GN_CONFIG -ne 'release') {
-        if (Test-Path 'env:RAW_GOMA_AUTH') {
-          $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
-          $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE      
-        }
-        git clone https://github.com/electron/build-tools.git
-        cd build-tools
-        npm install
-        mkdir third_party
-        node -e "require('./src/utils/goma.js').downloadAndPrepare()"
-        $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-        $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-        cd ..
-        .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
-      }
+  - gclient sync --with_branch_heads --with_tags --reset
   - cd src
-  - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
-  - if DEFINED GN_GOMA_FILE (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% ") else (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS% cc_wrapper=\"%SCCACHE_PATH%\"")
+  - ps: $env:BUILD_CONFIG_PATH="//electron/build/args/%GN_CONFIG%.gn"
+  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS%"
   - gn check out/Default //electron:electron_lib
   - gn check out/Default //electron:electron_app
   - gn check out/Default //electron:manifests
   - gn check out/Default //electron/shell/common/api:mojo
-  - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
-  - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
+  - ninja -C out/Default electron:electron_app
+  - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default )  
   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
   - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
   - ninja -C out/Default electron:electron_dist_zip
-  - ninja -C out/Default shell_browser_ui_unittests
   - ninja -C out/Default electron:electron_mksnapshot_zip
-  - ninja -C out/Default electron:hunspell_dictionaries_zip
   - ninja -C out/Default electron:electron_chromedriver_zip
   - ninja -C out/Default third_party/electron_node:headers
-  - if "%GN_CONFIG%"=="testing" ( python %LOCAL_GOMA_DIR%\goma_ctl.py stat )
-  - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-  - appveyor PushArtifact out/Default/windows_toolchain_profile.json
   - appveyor PushArtifact out/Default/dist.zip
-  - appveyor PushArtifact out/Default/shell_browser_ui_unittests.exe
   - appveyor PushArtifact out/Default/chromedriver.zip
   - appveyor PushArtifact out/ffmpeg/ffmpeg.zip
-  - 7z a node_headers.zip out\Default\gen\node_headers
-  - appveyor PushArtifact node_headers.zip
-  - appveyor PushArtifact out/Default/mksnapshot.zip
-  - appveyor PushArtifact out/Default/hunspell_dictionaries.zip
-  - appveyor PushArtifact out/Default/electron.lib
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         # Needed for msdia140.dll on 64-bit windows
@@ -171,19 +98,14 @@ build_script:
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         python electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
-      } else {
-        # It's useful to have pdb files when debugging testing builds that are
-        # built on CI.
-        7z a pdb.zip out\Default\*.pdb
-        appveyor-retry appveyor PushArtifact pdb.zip
+        appveyor PushArtifact out/Default/symbols.zip
       }
   - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:
   # Workaround for https://github.com/appveyor/ci/issues/2420
   - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
   - ps: >-
-      if ((-Not (Test-Path Env:\TEST_WOA)) -And (-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
+      if ((-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
         $env:RUN_TESTS="true"
       }
   - ps: >-
@@ -194,15 +116,12 @@ test_script:
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --enable-logging)
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --ci --enable-logging)
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
-  - echo "About to verify mksnapshot"  
-  - if "%RUN_TESTS%"=="true" ( gn desc out\Default v8:run_mksnapshot_default args > out\Default\mksnapshot_args )
+  - echo "About to verify mksnapshot"
   - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
   - echo "Done verifying mksnapshot"
-  - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
-  - echo "Done verifying chromedriver"
 deploy_script:
   - cd electron
   - ps: >-
@@ -214,6 +133,4 @@ deploy_script:
           Write-Output "Uploading Electron release distribution to github releases"
           & python script\release\uploaders\upload.py
         }
-      } elseif (Test-Path Env:\TEST_WOA) {
-        node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }

azure-pipelines-woa.yml

@@ -1,92 +0,0 @@
-steps:
-- task: CopyFiles@2
-  displayName: 'Copy Files to: src\electron'
-  inputs:
-    TargetFolder: src\electron
-
-- script: |
-    cd src\electron
-    node script/yarn.js install --frozen-lockfile
-  displayName: 'Yarn install'
-
-- powershell: |
-    $localArtifactPath = "$pwd\dist.zip"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/dist.zip"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
-  displayName: 'Download and extract dist.zip for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$pwd\src\out\Default\shell_browser_ui_unittests.exe"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/shell_browser_ui_unittests.exe"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-  displayName: 'Download and extract native test executables for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$pwd\ffmpeg.zip"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/ffmpeg.zip"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
-  displayName: 'Download and extract ffmpeg.zip for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$pwd\src\node_headers.zip"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/node_headers.zip"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    cd src
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
-  displayName: 'Download node headers for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$pwd\src\out\Default\electron.lib"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/electron.lib"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-  displayName: 'Download electron.lib for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    New-Item src\out\Default\gen\node_headers\Release -Type directory
-    Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
-  displayName: 'Setup node headers'
-
-- script: |
-    cd src
-    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-    set npm_config_arch=arm64
-    cd electron
-    node script/yarn test -- --enable-logging --verbose
-  displayName: 'Run Electron tests'
-  env:
-    ELECTRON_OUT_DIR: Default
-    IGNORE_YARN_INSTALL_ERROR: 1
-    ELECTRON_TEST_RESULTS_DIR: junit
-    MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-    MOCHA_REPORTER: mocha-multi-reporters
-
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFiles: '*.xml'
-    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
-  condition: always()
-
-- script: |
-    cd src
-    echo "Verifying non proprietary ffmpeg"
-    python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-  displayName: 'Verify ffmpeg'
-
-- powershell: |
-    Get-Process | Where Name –Like "electron*" | Stop-Process
-    Get-Process | Where Name –Like "MicrosoftEdge*" | Stop-Process
-  displayName: 'Kill processes left running from last test run'
-  condition: always()

build/args/all.gn

@@ -1,8 +1,9 @@
 is_electron_build = true
+use_jumbo_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 80
+node_module_version = 75
 
 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
@@ -17,10 +18,9 @@ ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
-dawn_enable_vulkan_validation_layers = false
 
 is_cfi = false
 
-enable_osr = true
-
-enable_electron_extensions = true
+# TODO: Remove this and update CI to contain 10.14 SDK once
+# crbug.com/986701 is fixed.
+mac_sdk_min = "10.13"

build/args/debug.gn

@@ -0,0 +1,10 @@
+import("all.gn")
+is_debug = true
+is_component_build = true
+
+# This may be guarded behind is_chrome_branded alongside
+# proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
+# explicitly override here to build OpenH264 encoder/FFmpeg decoder.
+# The initialization of the decoder depends on whether ffmpeg has
+# been built with H.264 support.
+rtc_use_h264 = proprietary_codecs

build/args/goma.gn

@@ -1,2 +0,0 @@
-goma_dir = rebase_path("//electron/external_binaries/goma")
-use_goma = true

build/args/native_tests.gn

@@ -5,3 +5,4 @@ is_debug = false
 is_component_build = false
 is_component_ffmpeg = false
 symbol_level = 1
+use_jumbo_build = true

build/extract_symbols.gni

@@ -34,7 +34,9 @@ template("extract_symbols") {
       dump_syms_binary,
     ]
     stamp_file = "${target_gen_dir}/${target_name}.stamp"
-    outputs = [ stamp_file ]
+    outputs = [
+      stamp_file,
+    ]
     args = [
       "./" + rebase_path(dump_syms_binary, root_build_dir),
       rebase_path(invoker.binary, root_build_dir),

build/npm.gni

@@ -10,7 +10,9 @@ template("npm_action") {
     ]
     script = "//electron/build/npm-run.py"
 
-    outputs = [ "$target_gen_dir/npm_pre_stamps/" + target_name + ".stamp" ]
+    outputs = [
+      "$target_gen_dir/npm_pre_stamps/" + target_name + ".stamp",
+    ]
 
     args = [
       "--silent",

build/profile_toolchain.py

@@ -1,98 +0,0 @@
-from __future__ import with_statement
-import contextlib
-import sys
-import os
-import optparse
-import json
-
-sys.path.append("%s/../../build" % os.path.dirname(os.path.realpath(__file__)))
-
-import find_depot_tools
-from vs_toolchain import \
-    SetEnvironmentAndGetRuntimeDllDirs, \
-    SetEnvironmentAndGetSDKDir, \
-    GetVisualStudioVersion, \
-    NormalizePath
-
-sys.path.append("%s/win_toolchain" % find_depot_tools.add_depot_tools_to_path())
-
-from get_toolchain_if_necessary import CalculateHash
-
-
-@contextlib.contextmanager
-def cwd(dir):
-    curdir = os.getcwd()
-    try:
-        os.chdir(dir)
-        yield
-    finally:
-        os.chdir(curdir)
-
-
-def calculate_hash(root):
-    with cwd(root):
-        return CalculateHash('.', None)
-
-def windows_installed_software():
-    import win32com.client
-    strComputer = "."
-    objWMIService = win32com.client.Dispatch("WbemScripting.SWbemLocator")
-    objSWbemServices = objWMIService.ConnectServer(strComputer, "root\cimv2")
-    colItems = objSWbemServices.ExecQuery("Select * from Win32_Product")
-    items = []
-
-    for objItem in colItems:
-        item = {}
-        if objItem.Caption:
-            item['caption'] = objItem.Caption
-        if objItem.Caption:
-            item['description'] = objItem.Description
-        if objItem.InstallDate:
-            item['install_date'] = objItem.InstallDate
-        if objItem.InstallDate2:
-            item['install_date_2'] = objItem.InstallDate2
-        if objItem.InstallLocation:
-            item['install_location'] = objItem.InstallLocation
-        if objItem.Name:
-            item['name'] = objItem.Name
-        if objItem.SKUNumber:
-            item['sku_number'] = objItem.SKUNumber
-        if objItem.Vendor:
-            item['vendor'] = objItem.Vendor
-        if objItem.Version:
-            item['version'] = objItem.Version
-        items.append(item)
-
-    return items
-
-
-def windows_profile():
-    runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
-    win_sdk_dir = SetEnvironmentAndGetSDKDir()
-    path = NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH'])
-
-    return {
-        'pwd': os.getcwd(), # since current windows executable are symbols path dependant, profile the current directory too
-        'installed_software': windows_installed_software(),
-        'sdks': [
-            {'name': 'vs', 'path': path, 'hash': calculate_hash(path)},
-            {'name': 'wsdk', 'path': win_sdk_dir, 'hash': calculate_hash(win_sdk_dir)}
-        ],
-        'runtime_lib_dirs': runtime_dll_dirs,
-    }
-
-
-def main(options):
-    if sys.platform == 'win32':
-        with open(options.output_json, 'wb') as f:
-            json.dump(windows_profile(), f)
-    else:
-        raise OSError("Unsupported OS")
-
-
-if __name__ == '__main__':
-  parser = optparse.OptionParser()
-  parser.add_option('--output-json', metavar='FILE', default='profile.json',
-                    help='write information about toolchain to FILE')
-  options, args = parser.parse_args()
-  sys.exit(main(options))

build/rules.gni

@@ -1,94 +0,0 @@
-import("//build/config/mac/mac_sdk.gni")
-
-# Template to compile .xib and .storyboard files.
-# (copied from src/build/config/ios/rules.gni)
-#
-# Arguments
-#
-#     sources:
-#         list of string, sources to compile
-#
-#     ibtool_flags:
-#         (optional) list of string, additional flags to pass to the ibtool
-template("compile_ib_files") {
-  action_foreach(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "testonly",
-                             "visibility",
-                           ])
-    assert(defined(invoker.sources),
-           "sources must be specified for $target_name")
-    assert(defined(invoker.output_extension),
-           "output_extension must be specified for $target_name")
-
-    ibtool_flags = []
-    if (defined(invoker.ibtool_flags)) {
-      ibtool_flags = invoker.ibtool_flags
-    }
-
-    _output_extension = invoker.output_extension
-
-    script = "//build/config/ios/compile_ib_files.py"
-    sources = invoker.sources
-    outputs = [
-      "$target_gen_dir/$target_name/{{source_name_part}}.$_output_extension",
-    ]
-    args = [
-      "--input",
-      "{{source}}",
-      "--output",
-      rebase_path(
-          "$target_gen_dir/$target_name/{{source_name_part}}.$_output_extension",
-          root_build_dir),
-    ]
-    args += ibtool_flags
-  }
-}
-
-# Template is copied here from Chromium but was removed in
-# https://chromium-review.googlesource.com/c/chromium/src/+/1637981
-# Template to compile and package Mac XIB files as bundle data.
-# Arguments
-#     sources:
-#         list of string, sources to comiple
-#     output_path:
-#         (optional) string, the path to use for the outputs list in the
-#         bundle_data step. If unspecified, defaults to bundle_resources_dir.
-template("mac_xib_bundle_data") {
-  _target_name = target_name
-  _compile_target_name = _target_name + "_compile_ibtool"
-
-  compile_ib_files(_compile_target_name) {
-    forward_variables_from(invoker, [ "testonly" ])
-    visibility = [ ":$_target_name" ]
-    sources = invoker.sources
-    output_extension = "nib"
-    ibtool_flags = [
-      "--minimum-deployment-target",
-      mac_deployment_target,
-
-      # TODO(rsesek): Enable this once all the bots are on Xcode 7+.
-      # "--target-device",
-      # "mac",
-    ]
-  }
-
-  bundle_data(_target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "testonly",
-                             "visibility",
-                           ])
-
-    public_deps = [ ":$_compile_target_name" ]
-    sources = get_target_outputs(":$_compile_target_name")
-
-    _output_path = "{{bundle_resources_dir}}"
-    if (defined(invoker.output_path)) {
-      _output_path = invoker.output_path
-    }
-
-    outputs = [ "$_output_path/{{source_file_part}}" ]
-  }
-}

build/templated_file.gni

@@ -15,8 +15,12 @@ template("templated_file") {
                              "inputs",
                              "outputs",
                            ])
-    inputs = [ invoker.template ]
-    outputs = [ invoker.output ]
+    inputs = [
+      invoker.template,
+    ]
+    outputs = [
+      invoker.output,
+    ]
     script = "//electron/build/generate-template.py"
     args = [
       rebase_path(invoker.template),

build/webpack/webpack.config.base.js

@@ -42,7 +42,7 @@ module.exports = ({
     resolve: {
       alias: {
         '@electron/internal': path.resolve(electronRoot, 'lib'),
-        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts'),
+        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.js'),
         // Force timers to resolve to our dependency that doens't use window.postMessage
         'timers': path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
       },
@@ -74,10 +74,7 @@ module.exports = ({
           global: ['@electron/internal/renderer/webpack-provider', '_global'],
           Buffer: ['@electron/internal/renderer/webpack-provider', 'Buffer'],
         })
-      ] : []),
-      new webpack.ProvidePlugin({
-        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise'],
-      }),
+      ] : [])
     ]
   })
-}
+}

build/webpack/webpack.gni

@@ -27,6 +27,8 @@ template("webpack_build") {
       rebase_path(invoker.out_file),
     ]
 
-    outputs = [ invoker.out_file ]
+    outputs = [
+      invoker.out_file,
+    ]
   }
 }

build/zip.py

@@ -9,7 +9,6 @@ EXTENSIONS_TO_SKIP = [
   '.pdb',
   '.mojom.js',
   '.mojom-lite.js',
-  '.info'
 ]
 
 PATHS_TO_SKIP = [
@@ -17,10 +16,6 @@ PATHS_TO_SKIP = [
   './libVkICD_mock_', #Skipping because these are outputs that we don't need
   './VkICD_mock_', #Skipping because these are outputs that we don't need
 
-  # Skipping because its an output of create_bundle from //build/config/mac/rules.gni
-  # that we don't need
-  'Electron.dSYM',
-
   # //chrome/browser:resources depends on this via
   # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
   # ship it.
@@ -51,19 +46,19 @@ def execute(argv):
     raise e
 
 def main(argv):
-  dist_zip, runtime_deps, target_cpu, target_os, flatten_val = argv
-  should_flatten = flatten_val == "true"
+  dist_zip, runtime_deps, target_cpu, target_os = argv
   dist_files = set()
   with open(runtime_deps) as f:
     for dep in f.readlines():
       dep = dep.strip()
-      if not skip_path(dep, dist_zip, target_cpu):
-        dist_files.add(dep)
-  if sys.platform == 'darwin' and not should_flatten:
+      dist_files.add(dep)
+  if sys.platform == 'darwin':
     execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
   else:
     with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z:
       for dep in dist_files:
+        if skip_path(dep, dist_zip, target_cpu):
+          continue
         if os.path.isdir(dep):
           for root, dirs, files in os.walk(dep):
             for file in files:
@@ -72,7 +67,7 @@ def main(argv):
           basename = os.path.basename(dep)
           dirname = os.path.dirname(dep)
           arcname = os.path.join(dirname, 'chrome-sandbox') if basename == 'chrome_sandbox' else dep
-          z.write(dep, os.path.basename(arcname) if should_flatten else arcname)
+          z.write(dep, arcname)
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))

buildflags/BUILD.gn

@@ -12,15 +12,12 @@ buildflag_header("buildflags") {
     "ENABLE_DESKTOP_CAPTURER=$enable_desktop_capturer",
     "ENABLE_RUN_AS_NODE=$enable_run_as_node",
     "ENABLE_OSR=$enable_osr",
-    "ENABLE_REMOTE_MODULE=$enable_remote_module",
     "ENABLE_VIEW_API=$enable_view_api",
     "ENABLE_PEPPER_FLASH=$enable_pepper_flash",
     "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
     "ENABLE_TTS=$enable_tts",
     "ENABLE_COLOR_CHOOSER=$enable_color_chooser",
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
-    "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
-    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }

buildflags/buildflags.gni

@@ -10,18 +10,14 @@ declare_args() {
 
   enable_osr = true
 
-  enable_remote_module = true
-
   enable_view_api = false
 
-  enable_pdf_viewer = true
+  enable_pdf_viewer = false
 
   enable_tts = true
 
   enable_color_chooser = true
 
-  enable_picture_in_picture = true
-
   # Provide a fake location provider for mocking
   # the geolocation responses. Disable it if you
   # need to test with chromium's location provider.
@@ -33,7 +29,4 @@ declare_args() {
 
   # Enable Chrome extensions support.
   enable_electron_extensions = false
-
-  # Enable Spellchecker support
-  enable_builtin_spellchecker = true
 }

chromium_src/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//components/spellcheck/spellcheck_build_features.gni")
 import("//electron/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//third_party/widevine/cdm/widevine.gni")
@@ -32,27 +31,16 @@ static_library("chrome") {
     "//chrome/browser/icon_loader_win.cc",
     "//chrome/browser/icon_manager.cc",
     "//chrome/browser/icon_manager.h",
-    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
     "//chrome/browser/net/proxy_config_monitor.cc",
     "//chrome/browser/net/proxy_config_monitor.h",
     "//chrome/browser/net/proxy_service_factory.cc",
     "//chrome/browser/net/proxy_service_factory.h",
-    "//chrome/browser/predictors/preconnect_manager.cc",
-    "//chrome/browser/predictors/preconnect_manager.h",
-    "//chrome/browser/predictors/predictors_features.cc",
-    "//chrome/browser/predictors/predictors_features.h",
-    "//chrome/browser/predictors/proxy_lookup_client_impl.cc",
-    "//chrome/browser/predictors/proxy_lookup_client_impl.h",
-    "//chrome/browser/predictors/resolve_host_client_impl.cc",
-    "//chrome/browser/predictors/resolve_host_client_impl.h",
     "//chrome/browser/ssl/security_state_tab_helper.cc",
     "//chrome/browser/ssl/security_state_tab_helper.h",
-    "//chrome/browser/ssl/tls_deprecation_config.cc",
-    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
-    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
+    "//chrome/browser/ui/autofill/popup_view_common.cc",
+    "//chrome/browser/ui/autofill/popup_view_common.h",
     "//chrome/browser/win/chrome_process_finder.cc",
     "//chrome/browser/win/chrome_process_finder.h",
     "//extensions/browser/app_window/size_constraints.cc",
@@ -67,9 +55,7 @@ static_library("chrome") {
     "//content/public/browser",
   ]
   deps = [
-    "//chrome/browser:resource_prefetch_predictor_proto",
     "//components/feature_engagement:buildflags",
-    "//components/optimization_guide/proto:optimization_guide_proto",
   ]
 
   if (is_linux) {
@@ -77,14 +63,6 @@ static_library("chrome") {
     sources += [
       "//chrome/browser/extensions/global_shortcut_listener_x11.cc",
       "//chrome/browser/extensions/global_shortcut_listener_x11.h",
-      "//chrome/browser/ui/views/status_icons/concat_menu_model.cc",
-      "//chrome/browser/ui/views/status_icons/concat_menu_model.h",
-      "//chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc",
-      "//chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h",
-    ]
-    public_deps += [
-      "//components/dbus/menu",
-      "//components/dbus/thread_linux",
     ]
   }
 
@@ -110,15 +88,11 @@ static_library("chrome") {
     ]
 
     if (use_aura) {
-      sources += [ "//chrome/browser/platform_util_aura.cc" ]
-
-      if (!is_win) {
-        sources += [
-          "//chrome/browser/ui/views/color_chooser_aura.cc",
-          "//chrome/browser/ui/views/color_chooser_aura.h",
-        ]
-      }
-
+      sources += [
+        "//chrome/browser/platform_util_aura.cc",
+        "//chrome/browser/ui/views/color_chooser_aura.cc",
+        "//chrome/browser/ui/views/color_chooser_aura.h",
+      ]
       deps += [ "//components/feature_engagement" ]
     }
 
@@ -152,6 +126,10 @@ static_library("chrome") {
     sources += [
       "//chrome/browser/speech/tts_controller_delegate_impl.cc",
       "//chrome/browser/speech/tts_controller_delegate_impl.h",
+      "//chrome/browser/speech/tts_message_filter.cc",
+      "//chrome/browser/speech/tts_message_filter.h",
+      "//chrome/renderer/tts_dispatcher.cc",
+      "//chrome/renderer/tts_dispatcher.h",
     ]
   }
 
@@ -181,21 +159,17 @@ static_library("chrome") {
       "//chrome/browser/printing/printer_query.h",
       "//chrome/browser/printing/printing_message_filter.cc",
       "//chrome/browser/printing/printing_message_filter.h",
-      "//chrome/browser/printing/printing_service.cc",
-      "//chrome/browser/printing/printing_service.h",
     ]
-
     public_deps += [
       "//chrome/services/printing:lib",
       "//components/printing/browser",
       "//components/printing/renderer",
-      "//components/services/print_compositor",
-      "//components/services/print_compositor/public/cpp",
-      "//components/services/print_compositor/public/mojom",
+      "//components/services/pdf_compositor/public/cpp:factory",
+      "//components/services/pdf_compositor/public/mojom",
     ]
-
     deps += [
       "//components/printing/common",
+      "//components/services/pdf_compositor",
       "//printing",
     ]
 
@@ -208,182 +182,4 @@ static_library("chrome") {
       ]
     }
   }
-
-  if (enable_picture_in_picture) {
-    sources += [
-      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc",
-      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
-      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.cc",
-      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.h",
-      "//chrome/browser/ui/views/overlay/close_image_button.cc",
-      "//chrome/browser/ui/views/overlay/close_image_button.h",
-      "//chrome/browser/ui/views/overlay/overlay_window_views.cc",
-      "//chrome/browser/ui/views/overlay/overlay_window_views.h",
-      "//chrome/browser/ui/views/overlay/playback_image_button.cc",
-      "//chrome/browser/ui/views/overlay/playback_image_button.h",
-      "//chrome/browser/ui/views/overlay/resize_handle_button.cc",
-      "//chrome/browser/ui/views/overlay/resize_handle_button.h",
-      "//chrome/browser/ui/views/overlay/skip_ad_label_button.cc",
-      "//chrome/browser/ui/views/overlay/skip_ad_label_button.h",
-      "//chrome/browser/ui/views/overlay/track_image_button.cc",
-      "//chrome/browser/ui/views/overlay/track_image_button.h",
-    ]
-
-    deps += [
-      "//chrome/app/vector_icons",
-      "//components/vector_icons:vector_icons",
-    ]
-  }
-
-  if (enable_electron_extensions) {
-    sources += [
-      "//chrome/browser/extensions/chrome_url_request_util.cc",
-      "//chrome/browser/extensions/chrome_url_request_util.h",
-      "//chrome/browser/pdf/pdf_extension_util.cc",
-      "//chrome/browser/pdf/pdf_extension_util.h",
-      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc",
-      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h",
-      "//chrome/renderer/extensions/extension_hooks_delegate.cc",
-      "//chrome/renderer/extensions/extension_hooks_delegate.h",
-      "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
-      "//chrome/renderer/extensions/tabs_hooks_delegate.h",
-      "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
-      "//chrome/renderer/pepper/chrome_pdf_print_client.h",
-    ]
-  }
-}
-
-source_set("plugins") {
-  sources = []
-  deps = []
-  libs = []
-
-  # browser side
-  sources += [
-    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
-    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
-    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h",
-    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
-  ]
-  deps += [
-    "//components/pdf/browser",
-    "//media:media_buildflags",
-    "//ppapi/buildflags",
-    "//ppapi/proxy:ipc",
-    "//services/device/public/mojom",
-  ]
-  if (enable_pepper_flash) {
-    sources += [
-      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h",
-    ]
-    if (is_mac) {
-      sources += [
-        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
-        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
-      ]
-      libs += [ "CoreGraphics.framework" ]
-    }
-    if (is_linux) {
-      deps += [ "//components/services/font/public/cpp" ]
-    }
-  }
-
-  # renderer side
-  sources += [
-    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
-    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
-    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
-    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
-  ]
-  if (enable_pepper_flash) {
-    sources += [
-      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
-      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
-      "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_menu_host.h",
-      "//chrome/renderer/pepper/pepper_flash_renderer_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
-    ]
-  }
-  if (enable_pepper_flash || enable_pdf_viewer) {
-    sources += [
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
-    ]
-  }
-  deps += [
-    "//components/pdf/renderer",
-    "//components/strings",
-    "//media:media_buildflags",
-    "//ppapi/host",
-    "//ppapi/proxy",
-    "//ppapi/proxy:ipc",
-    "//ppapi/shared_impl",
-    "//skia",
-  ]
-}
-
-# This source set is just so we don't have to depend on all of //chrome/browser
-# You may have to add new files here during the upgrade if //chrome/browser/spellchecker
-# gets more files
-source_set("chrome_spellchecker") {
-  sources = []
-  deps = []
-  libs = []
-
-  if (enable_builtin_spellchecker) {
-    sources += [
-      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
-      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
-      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
-      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_factory.cc",
-      "//chrome/browser/spellchecker/spellcheck_factory.h",
-      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
-      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
-      "//chrome/browser/spellchecker/spellcheck_service.cc",
-      "//chrome/browser/spellchecker/spellcheck_service.h",
-      "//chrome/common/pref_names.h",
-    ]
-
-    if (has_spellcheck_panel) {
-      sources += [
-        "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
-        "//chrome/browser/spellchecker/spell_check_panel_host_impl.h",
-      ]
-    }
-
-    if (use_browser_spellchecker) {
-      sources += [
-        "//chrome/browser/spellchecker/spelling_request.cc",
-        "//chrome/browser/spellchecker/spelling_request.h",
-      ]
-    }
-
-    deps += [
-      "//base:base_static",
-      "//components/language/core/browser",
-      "//components/spellcheck:buildflags",
-      "//components/sync",
-    ]
-  }
-
-  public_deps = [
-    "//components/spellcheck/browser",
-    "//components/spellcheck/common",
-    "//components/spellcheck/renderer",
-  ]
 }

chromium_src/chrome/browser/certificate_manager_model.cc

@@ -37,8 +37,10 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
     // public and private slot.
     // Redirect any slot usage to this persistent slot on Linux.
     g_nss_cert_database = new net::NSSCertDatabase(
-        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* public slot */,
-        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* private slot */);
+        crypto::ScopedPK11Slot(
+            crypto::GetPersistentNSSKeySlot()) /* public slot */,
+        crypto::ScopedPK11Slot(
+            crypto::GetPersistentNSSKeySlot()) /* private slot */);
   }
   return g_nss_cert_database;
 }
@@ -71,7 +73,7 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
 void CertificateManagerModel::Create(content::BrowserContext* browser_context,
                                      const CreationCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::PostTask(
+  base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
                      browser_context->GetResourceContext(), callback));
@@ -84,7 +86,7 @@ CertificateManagerModel::CertificateManagerModel(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
-CertificateManagerModel::~CertificateManagerModel() = default;
+CertificateManagerModel::~CertificateManagerModel() {}
 
 int CertificateManagerModel::ImportFromPKCS12(
     PK11SlotInfo* slot_info,
@@ -144,7 +146,7 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   bool is_user_db_available = !!cert_db->GetPublicSlot();
-  base::PostTask(
+  base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
                      is_user_db_available, callback));

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -56,7 +56,7 @@
 #include <stddef.h>
 
 #include "shell/browser/browser.h"
-#include "shell/common/electron_command_line.h"
+#include "shell/common/atom_command_line.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ -93,6 +93,7 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/network_interfaces.h"
+#include "ui/base/l10n/l10n_util.h"
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "ui/views/linux_ui/linux_ui.h"
@@ -184,7 +185,7 @@ int WaitSocketForRead(int fd, const base::TimeDelta& timeout) {
   FD_ZERO(&read_fds);
   FD_SET(fd, &read_fds);
 
-  return HANDLE_EINTR(select(fd + 1, &read_fds, nullptr, nullptr, &tv));
+  return HANDLE_EINTR(select(fd + 1, &read_fds, NULL, NULL, &tv));
 }
 
 // Read a message from a socket fd, with an optional timeout.
@@ -704,7 +705,7 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
   if (shutdown(fd_, SHUT_WR) < 0)
     PLOG(ERROR) << "shutdown() failed";
 
-  base::PostTask(
+  base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&ProcessSingleton::LinuxWatcher::RemoveSocketReader,
                      parent_, this));
@@ -826,7 +827,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
     return PROCESS_NONE;
   to_send.append(current_dir.value());
 
-  const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
+  const std::vector<std::string>& argv = electron::AtomCommandLine::argv();
   for (std::vector<std::string>::const_iterator it = argv.begin();
        it != argv.end(); ++it) {
     to_send.push_back(kTokenDelimiter);
@@ -884,9 +885,10 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
 
 void ProcessSingleton::StartListeningOnSocket() {
   watcher_ = new LinuxWatcher(this);
-  base::PostTask(FROM_HERE, {BrowserThread::IO},
-                 base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening,
-                                watcher_, sock_));
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
+                     sock_));
 }
 
 void ProcessSingleton::OnBrowserReady() {

chromium_src/chrome/browser/process_singleton_win.cc

@@ -23,6 +23,7 @@
 #include "chrome/browser/win/chrome_process_finder.h"
 #include "content/public/common/result_codes.h"
 #include "net/base/escape.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 namespace {
@@ -197,7 +198,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
     return PROCESS_NONE;
   }
 
-  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
+  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, false)) {
     case chrome::NOTIFY_SUCCESS:
       return PROCESS_NOTIFIED;
     case chrome::NOTIFY_FAILED:

components/pepper_flash/BUILD.gn

@@ -0,0 +1,61 @@
+# Copyright (c) 2018 GitHub, Inc.
+# Use of this source code is governed by the MIT license that can be
+# found in the LICENSE file.
+
+component("pepper_flash") {
+  visibility = [ "//electron:electron_lib" ]
+  defines = [ "IS_PEPPER_FLASH_IMPL" ]
+  sources = [
+    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
+    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
+    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h",
+    "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h",
+    "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
+    "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h",
+    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
+    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
+    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
+    "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
+    "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
+    "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_menu_host.h",
+    "//chrome/renderer/pepper/pepper_flash_renderer_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
+    "//chrome/renderer/pepper/pepper_helper.cc",
+    "//chrome/renderer/pepper/pepper_helper.h",
+    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
+    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
+  ]
+  deps = [
+    "//content/public/browser",
+    "//content/public/renderer",
+    "//media:media_buildflags",
+    "//ppapi/host",
+    "//ppapi/proxy",
+    "//ppapi/proxy:ipc",
+    "//ppapi/shared_impl",
+    "//services/device/public/mojom",
+    "//skia",
+    "//third_party/adobe/flash:flapper_version_h",
+    "//ui/base",
+    "//ui/base/clipboard",
+  ]
+  if (is_mac) {
+    sources += [
+      "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
+      "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
+    ]
+  }
+  if (is_linux) {
+    deps += [ "//components/services/font/public/cpp" ]
+  }
+}

default_app/default_app.ts

@@ -1,48 +1,48 @@
-import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron';
-import * as path from 'path';
+import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron'
+import * as path from 'path'
 
-let mainWindow: BrowserWindow | null = null;
+let mainWindow: BrowserWindow | null = null
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
-  app.quit();
-});
+  app.quit()
+})
 
 function decorateURL (url: string) {
   // safely add `?utm_source=default_app
-  const parsedUrl = new URL(url);
-  parsedUrl.searchParams.append('utm_source', 'default_app');
-  return parsedUrl.toString();
+  const parsedUrl = new URL(url)
+  parsedUrl.searchParams.append('utm_source', 'default_app')
+  return parsedUrl.toString()
 }
 
 // Find the shortest path to the electron binary
-const absoluteElectronPath = process.execPath;
-const relativeElectronPath = path.relative(process.cwd(), absoluteElectronPath);
+const absoluteElectronPath = process.execPath
+const relativeElectronPath = path.relative(process.cwd(), absoluteElectronPath)
 const electronPath = absoluteElectronPath.length < relativeElectronPath.length
   ? absoluteElectronPath
-  : relativeElectronPath;
+  : relativeElectronPath
 
-const indexPath = path.resolve(app.getAppPath(), 'index.html');
+const indexPath = path.resolve(app.getAppPath(), 'index.html')
 
 function isTrustedSender (webContents: Electron.WebContents) {
   if (webContents !== (mainWindow && mainWindow.webContents)) {
-    return false;
+    return false
   }
 
-  const parsedUrl = new URL(webContents.getURL());
+  const parsedUrl = new URL(webContents.getURL())
   const urlPath = process.platform === 'win32'
     // Strip the prefixed "/" that occurs on windows
     ? path.resolve(parsedUrl.pathname.substr(1))
-    : parsedUrl.pathname;
-  return parsedUrl.protocol === 'file:' && urlPath === indexPath;
+    : parsedUrl.pathname
+  return parsedUrl.protocol === 'file:' && urlPath === indexPath
 }
 
 ipcMain.handle('bootstrap', (event) => {
-  return isTrustedSender(event.sender) ? electronPath : null;
-});
+  return isTrustedSender(event.sender) ? electronPath : null
+})
 
 async function createWindow () {
-  await app.whenReady();
+  await app.whenReady()
 
   const options: Electron.BrowserWindowConstructorOptions = {
     width: 900,
@@ -57,46 +57,46 @@ async function createWindow () {
     },
     useContentSize: true,
     show: false
-  };
-
-  if (process.platform === 'linux') {
-    options.icon = path.join(__dirname, 'icon.png');
   }
 
-  mainWindow = new BrowserWindow(options);
-  mainWindow.on('ready-to-show', () => mainWindow!.show());
+  if (process.platform === 'linux') {
+    options.icon = path.join(__dirname, 'icon.png')
+  }
+
+  mainWindow = new BrowserWindow(options)
+  mainWindow.on('ready-to-show', () => mainWindow!.show())
 
   mainWindow.webContents.on('new-window', (event, url) => {
-    event.preventDefault();
-    shell.openExternal(decorateURL(url));
-  });
+    event.preventDefault()
+    shell.openExternal(decorateURL(url))
+  })
 
   mainWindow.webContents.session.setPermissionRequestHandler((webContents, permission, done) => {
-    const parsedUrl = new URL(webContents.getURL());
+    const parsedUrl = new URL(webContents.getURL())
 
     const options: Electron.MessageBoxOptions = {
       title: 'Permission Request',
       message: `Allow '${parsedUrl.origin}' to access '${permission}'?`,
       buttons: ['OK', 'Cancel'],
       cancelId: 1
-    };
+    }
 
     dialog.showMessageBox(mainWindow!, options).then(({ response }) => {
-      done(response === 0);
-    });
-  });
+      done(response === 0)
+    })
+  })
 
-  return mainWindow;
+  return mainWindow
 }
 
 export const loadURL = async (appUrl: string) => {
-  mainWindow = await createWindow();
-  mainWindow.loadURL(appUrl);
-  mainWindow.focus();
-};
+  mainWindow = await createWindow()
+  mainWindow.loadURL(appUrl)
+  mainWindow.focus()
+}
 
 export const loadFile = async (appPath: string) => {
-  mainWindow = await createWindow();
-  mainWindow.loadFile(appPath);
-  mainWindow.focus();
-};
+  mainWindow = await createWindow()
+  mainWindow.loadFile(appPath)
+  mainWindow.focus()
+}

default_app/index.html

@@ -2,9 +2,10 @@
 
 <head>
   <title>Electron</title>
-  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'sha256-6PH54BfkNq/EMMhUY7nhHf3c+AxloOwfy7hWyT01CM8='; style-src 'self'; img-src 'self'; connect-src 'self'" />
+  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'; connect-src 'self'" />
   <link href="./styles.css" type="text/css" rel="stylesheet" />
   <link href="./octicon/build.css" type="text/css" rel="stylesheet" />
+  <script defer src="./index.js"></script>
 </head>
 
 <body>
@@ -83,9 +84,6 @@
       </div>
     </div>
   </nav>
-  <script>
-    window.electronDefaultApp.initialize()
-  </script>
 </body>
 
 </html>

default_app/index.ts

@@ -0,0 +1,30 @@
+async function getOcticonSvg (name: string) {
+  try {
+    const response = await fetch(`octicon/${name}.svg`)
+    const div = document.createElement('div')
+    div.innerHTML = await response.text()
+    return div
+  } catch {
+    return null
+  }
+}
+
+async function loadSVG (element: HTMLSpanElement) {
+  for (const cssClass of element.classList) {
+    if (cssClass.startsWith('octicon-')) {
+      const icon = await getOcticonSvg(cssClass.substr(8))
+      if (icon) {
+        for (const elemClass of element.classList) {
+          icon.classList.add(elemClass)
+        }
+        element.before(icon)
+        element.remove()
+        break
+      }
+    }
+  }
+}
+
+for (const element of document.querySelectorAll<HTMLSpanElement>('.octicon')) {
+  loadSVG(element)
+}

default_app/main.ts

@@ -1,8 +1,8 @@
-import { app, dialog } from 'electron';
+import { app, dialog } from 'electron'
 
-import * as fs from 'fs';
-import * as path from 'path';
-import * as url from 'url';
+import * as fs from 'fs'
+import * as path from 'path'
+import * as url from 'url'
 
 type DefaultAppOptions = {
   file: null | string;
@@ -14,10 +14,10 @@ type DefaultAppOptions = {
   modules: string[];
 }
 
-const Module = require('module');
+const Module = require('module')
 
 // Parse command line options.
-const argv = process.argv.slice(1);
+const argv = process.argv.slice(1)
 
 const option: DefaultAppOptions = {
   file: null,
@@ -27,50 +27,50 @@ const option: DefaultAppOptions = {
   interactive: false,
   abi: false,
   modules: []
-};
+}
 
-let nextArgIsRequire = false;
+let nextArgIsRequire = false
 
 for (const arg of argv) {
   if (nextArgIsRequire) {
-    option.modules.push(arg);
-    nextArgIsRequire = false;
-    continue;
+    option.modules.push(arg)
+    nextArgIsRequire = false
+    continue
   } else if (arg === '--version' || arg === '-v') {
-    option.version = true;
-    break;
+    option.version = true
+    break
   } else if (arg.match(/^--app=/)) {
-    option.file = arg.split('=')[1];
-    break;
+    option.file = arg.split('=')[1]
+    break
   } else if (arg === '--interactive' || arg === '-i' || arg === '-repl') {
-    option.interactive = true;
+    option.interactive = true
   } else if (arg === '--test-type=webdriver') {
-    option.webdriver = true;
+    option.webdriver = true
   } else if (arg === '--require' || arg === '-r') {
-    nextArgIsRequire = true;
-    continue;
+    nextArgIsRequire = true
+    continue
   } else if (arg === '--abi' || arg === '-a') {
-    option.abi = true;
-    continue;
+    option.abi = true
+    continue
   } else if (arg === '--no-help') {
-    option.noHelp = true;
-    continue;
+    option.noHelp = true
+    continue
   } else if (arg[0] === '-') {
-    continue;
+    continue
   } else {
-    option.file = arg;
-    break;
+    option.file = arg
+    break
   }
 }
 
 if (nextArgIsRequire) {
-  console.error('Invalid Usage: --require [file]\n\n"file" is required');
-  process.exit(1);
+  console.error('Invalid Usage: --require [file]\n\n"file" is required')
+  process.exit(1)
 }
 
 // Set up preload modules
 if (option.modules.length > 0) {
-  Module._preloadModules(option.modules);
+  Module._preloadModules(option.modules)
 }
 
 function loadApplicationPackage (packagePath: string) {
@@ -79,102 +79,102 @@ function loadApplicationPackage (packagePath: string) {
     configurable: false,
     enumerable: true,
     value: true
-  });
+  })
 
   try {
     // Override app name and version.
-    packagePath = path.resolve(packagePath);
-    const packageJsonPath = path.join(packagePath, 'package.json');
-    let appPath;
+    packagePath = path.resolve(packagePath)
+    const packageJsonPath = path.join(packagePath, 'package.json')
+    let appPath
     if (fs.existsSync(packageJsonPath)) {
-      let packageJson;
+      let packageJson
       try {
-        packageJson = require(packageJsonPath);
+        packageJson = require(packageJsonPath)
       } catch (e) {
-        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`);
-        return;
+        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`)
+        return
       }
 
       if (packageJson.version) {
-        app.setVersion(packageJson.version);
+        app.setVersion(packageJson.version)
       }
       if (packageJson.productName) {
-        app.name = packageJson.productName;
+        app.name = packageJson.productName
       } else if (packageJson.name) {
-        app.name = packageJson.name;
+        app.name = packageJson.name
       }
-      appPath = packagePath;
+      appPath = packagePath
     }
 
     try {
-      const filePath = Module._resolveFilename(packagePath, module, true);
-      app._setDefaultAppPaths(appPath || path.dirname(filePath));
+      const filePath = Module._resolveFilename(packagePath, module, true)
+      app._setDefaultAppPaths(appPath || path.dirname(filePath))
     } catch (e) {
-      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`);
-      return;
+      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`)
+      return
     }
 
     // Run the app.
-    Module._load(packagePath, module, true);
+    Module._load(packagePath, module, true)
   } catch (e) {
-    console.error('App threw an error during load');
-    console.error(e.stack || e);
-    throw e;
+    console.error('App threw an error during load')
+    console.error(e.stack || e)
+    throw e
   }
 }
 
 function showErrorMessage (message: string) {
-  app.focus();
-  dialog.showErrorBox('Error launching app', message);
-  process.exit(1);
+  app.focus()
+  dialog.showErrorBox('Error launching app', message)
+  process.exit(1)
 }
 
 async function loadApplicationByURL (appUrl: string) {
-  const { loadURL } = await import('./default_app');
-  loadURL(appUrl);
+  const { loadURL } = await import('./default_app')
+  loadURL(appUrl)
 }
 
 async function loadApplicationByFile (appPath: string) {
-  const { loadFile } = await import('./default_app');
-  loadFile(appPath);
+  const { loadFile } = await import('./default_app')
+  loadFile(appPath)
 }
 
 function startRepl () {
   if (process.platform === 'win32') {
-    console.error('Electron REPL not currently supported on Windows');
-    process.exit(1);
+    console.error('Electron REPL not currently supported on Windows')
+    process.exit(1)
   }
 
   // prevent quitting
-  app.on('window-all-closed', () => {});
+  app.on('window-all-closed', () => {})
 
-  const repl = require('repl');
+  const repl = require('repl')
   repl.start('> ').on('exit', () => {
-    process.exit(0);
-  });
+    process.exit(0)
+  })
 }
 
 // Start the specified app if there is one specified in command line, otherwise
 // start the default app.
 if (option.file && !option.webdriver) {
-  const file = option.file;
-  const protocol = url.parse(file).protocol;
-  const extension = path.extname(file);
+  const file = option.file
+  const protocol = url.parse(file).protocol
+  const extension = path.extname(file)
   if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
-    loadApplicationByURL(file);
+    loadApplicationByURL(file)
   } else if (extension === '.html' || extension === '.htm') {
-    loadApplicationByFile(path.resolve(file));
+    loadApplicationByFile(path.resolve(file))
   } else {
-    loadApplicationPackage(file);
+    loadApplicationPackage(file)
   }
 } else if (option.version) {
-  console.log('v' + process.versions.electron);
-  process.exit(0);
+  console.log('v' + process.versions.electron)
+  process.exit(0)
 } else if (option.abi) {
-  console.log(process.versions.modules);
-  process.exit(0);
+  console.log(process.versions.modules)
+  process.exit(0)
 } else if (option.interactive) {
-  startRepl();
+  startRepl()
 } else {
   if (!option.noHelp) {
     const welcomeMessage = `
@@ -192,10 +192,10 @@ Options:
   -i, --interactive     Open a REPL to the main process.
   -r, --require         Module to preload (option can be repeated).
   -v, --version         Print the version.
-  -a, --abi             Print the Node ABI version.`;
+  -a, --abi             Print the Node ABI version.`
 
-    console.log(welcomeMessage);
+    console.log(welcomeMessage)
   }
 
-  loadApplicationByFile('index.html');
+  loadApplicationByFile('index.html')
 }

default_app/preload.ts

@@ -1,53 +1,20 @@
-import { ipcRenderer, contextBridge } from 'electron';
-
-async function getOcticonSvg (name: string) {
-  try {
-    const response = await fetch(`octicon/${name}.svg`);
-    const div = document.createElement('div');
-    div.innerHTML = await response.text();
-    return div;
-  } catch {
-    return null;
-  }
-}
-
-async function loadSVG (element: HTMLSpanElement) {
-  for (const cssClass of element.classList) {
-    if (cssClass.startsWith('octicon-')) {
-      const icon = await getOcticonSvg(cssClass.substr(8));
-      if (icon) {
-        for (const elemClass of element.classList) {
-          icon.classList.add(elemClass);
-        }
-        element.before(icon);
-        element.remove();
-        break;
-      }
-    }
-  }
-}
+import { ipcRenderer } from 'electron'
 
 async function initialize () {
-  const electronPath = await ipcRenderer.invoke('bootstrap');
+  const electronPath = await ipcRenderer.invoke('bootstrap')
 
   function replaceText (selector: string, text: string) {
-    const element = document.querySelector<HTMLElement>(selector);
+    const element = document.querySelector<HTMLElement>(selector)
     if (element) {
-      element.innerText = text;
+      element.innerText = text
     }
   }
 
-  replaceText('.electron-version', `Electron v${process.versions.electron}`);
-  replaceText('.chrome-version', `Chromium v${process.versions.chrome}`);
-  replaceText('.node-version', `Node v${process.versions.node}`);
-  replaceText('.v8-version', `v8 v${process.versions.v8}`);
-  replaceText('.command-example', `${electronPath} path-to-app`);
-
-  for (const element of document.querySelectorAll<HTMLSpanElement>('.octicon')) {
-    loadSVG(element);
-  }
+  replaceText('.electron-version', `Electron v${process.versions.electron}`)
+  replaceText('.chrome-version', `Chromium v${process.versions.chrome}`)
+  replaceText('.node-version', `Node v${process.versions.node}`)
+  replaceText('.v8-version', `v8 v${process.versions.v8}`)
+  replaceText('.command-example', `${electronPath} path-to-app`)
 }
 
-contextBridge.exposeInMainWorld('electronDefaultApp', {
-  initialize
-});
+document.addEventListener('DOMContentLoaded', initialize)

docs-translations/README.md

@@ -0,0 +1,33 @@
+## Docs Translations
+
+This directory once contained unstructured translations of Electron's 
+documentation, but has been deprecated in favor of a new translation process 
+using [Crowdin], a GitHub-friendly platform for collaborative translation.
+
+For more details, visit the [electron/i18n] repo.
+
+## Contributing
+
+If you're interested in helping translate Electron's docs, visit 
+[Crowdin] and log in with your GitHub account. And thanks!
+
+## Offline Docs
+
+If you miss having access to Electron's raw markdown files in your preferred
+language, don't fret! You can still get raw docs, they're just in a 
+different place now. See [electron/i18n/tree/master/content]
+
+To more easily view and browse offline docs in your language, clone the repo and use [vmd], 
+an Electron-based GitHub-styled markdown viewer:
+
+```sh
+npm i -g vmd
+git clone https://github.com/electron/i18n
+vmd electron-i18n/content/zh-CN
+```
+
+[crowdin.com/project/electron]: https://crowdin.com/project/electron
+[Crowdin]: https://crowdin.com/project/electron
+[electron/i18n]: https://github.com/electron/i18n#readme
+[electron/i18n/tree/master/content]: https://github.com/electron/i18n/tree/master/content
+[vmd]: http://ghub.io/vmd

docs/README.md

@@ -39,7 +39,6 @@ an issue:
   * [Using Electron's APIs](tutorial/application-architecture.md#using-electron-apis)
   * [Using Node.js APIs](tutorial/application-architecture.md#using-nodejs-apis)
   * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
-  * [Performance Strategies](tutorial/performance.md)
 * Adding Features to Your App
   * [Notifications](tutorial/notifications.md)
   * [Recent Documents](tutorial/recent-documents.md)
@@ -53,7 +52,6 @@ an issue:
   * [Native File Drag & Drop](tutorial/native-file-drag-drop.md)
   * [Offscreen Rendering](tutorial/offscreen-rendering.md)
   * [Supporting macOS Dark Mode](tutorial/mojave-dark-mode-guide.md)
-  * [Web embeds in Electron](tutorial/web-embeds.md)
 * [Accessibility](tutorial/accessibility.md)
   * [Spectron](tutorial/accessibility.md#spectron)
   * [Devtron](tutorial/accessibility.md#devtron)
@@ -110,9 +108,9 @@ These individual tutorials expand on topics discussed in the guide above.
 
 * [Synopsis](api/synopsis.md)
 * [Process Object](api/process.md)
-* [Supported Command Line Switches](api/command-line-switches.md)
+* [Supported Chrome Command Line Switches](api/chrome-command-line-switches.md)
 * [Environment Variables](api/environment-variables.md)
-* [Breaking API Changes](breaking-changes.md)
+* [Breaking API Changes](api/breaking-changes.md)
 
 ### Custom DOM Elements:
 
@@ -136,7 +134,6 @@ These individual tutorials expand on topics discussed in the guide above.
 * [MenuItem](api/menu-item.md)
 * [net](api/net.md)
 * [netLog](api/net-log.md)
-* [Notification](api/notification.md)
 * [powerMonitor](api/power-monitor.md)
 * [powerSaveBlocker](api/power-save-blocker.md)
 * [protocol](api/protocol.md)

docs/api/accelerator.md

@@ -18,7 +18,7 @@ method, i.e.
 ```javascript
 const { app, globalShortcut } = require('electron')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   // Register a 'CommandOrControl+Y' shortcut listener.
   globalShortcut.register('CommandOrControl+Y', () => {
     // Do stuff when Y and either Command/Control is pressed.
@@ -54,7 +54,7 @@ The `Super` key is mapped to the `Windows` key on Windows and Linux and
 * `0` to `9`
 * `A` to `Z`
 * `F1` to `F24`
-* Punctuation like `~`, `!`, `@`, `#`, `$`, etc.
+* Punctuations like `~`, `!`, `@`, `#`, `$`, etc.
 * `Plus`
 * `Space`
 * `Tab`

docs/api/app.md

@@ -34,11 +34,10 @@ Returns:
 
 * `launchInfo` unknown _macOS_
 
-Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
-holds the `userInfo` of the `NSUserNotification` that was used to open the
-application, if it was launched from Notification Center. You can also call
-`app.isReady()` to check if this event has already fired and `app.whenReady()`
-to get a Promise that is fulfilled when Electron is initialized.
+Emitted when Electron has finished initializing. On macOS, `launchInfo` holds
+the `userInfo` of the `NSUserNotification` that was used to open the application,
+if it was launched from Notification Center. You can call `app.isReady()` to
+check if this event has already fired.
 
 ### Event: 'window-all-closed'
 
@@ -75,7 +74,7 @@ Returns:
 * `event` Event
 
 Emitted when all windows have been closed and the application will quit.
-Calling `event.preventDefault()` will prevent the default behavior, which is
+Calling `event.preventDefault()` will prevent the default behaviour, which is
 terminating the application.
 
 See the description of the `window-all-closed` event for the differences between
@@ -204,7 +203,7 @@ Returns:
   [`NSUserActivity.activityType`][activity-type].
 * `userInfo` unknown - Contains app-specific state stored by the activity.
 
-Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActivity()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.
+Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActiviy()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.
 
 ### Event: 'new-window-for-tab' _macOS_
 
@@ -315,8 +314,10 @@ Returns:
 
 * `event` Event
 * `webContents` [WebContents](web-contents.md)
-* `authenticationResponseDetails` Object
+* `request` Object
+  * `method` String
   * `url` URL
+  * `referrer` URL
 * `authInfo` Object
   * `isProxy` Boolean
   * `scheme` String
@@ -324,8 +325,8 @@ Returns:
   * `port` Integer
   * `realm` String
 * `callback` Function
-  * `username` String (optional)
-  * `password` String (optional)
+  * `username` String
+  * `password` String
 
 Emitted when `webContents` wants to do basic auth.
 
@@ -336,16 +337,12 @@ should prevent the default behavior with `event.preventDefault()` and call
 ```javascript
 const { app } = require('electron')
 
-app.on('login', (event, webContents, details, authInfo, callback) => {
+app.on('login', (event, webContents, request, authInfo, callback) => {
   event.preventDefault()
   callback('username', 'secret')
 })
 ```
 
-If `callback` is called without a username or password, the authentication
-request will be cancelled and the authentication error will be returned to the
-page.
-
 ### Event: 'gpu-info-update'
 
 Emitted whenever there is a GPU info update.
@@ -393,7 +390,7 @@ Emitted when Electron has created a new `session`.
 ```javascript
 const { app } = require('electron')
 
-app.on('session-created', (session) => {
+app.on('session-created', (event, session) => {
   console.log(session)
 })
 ```
@@ -488,6 +485,18 @@ Emitted when `remote.getCurrentWebContents()` is called in the renderer process
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
+### Event: 'remote-get-guest-web-contents'
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+* `guestWebContents` [WebContents](web-contents.md)
+
+Emitted when `<webview>.getWebContents()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 ## Methods
 
 The `app` object has the following methods:
@@ -546,7 +555,6 @@ app.exit(0)
 ### `app.isReady()`
 
 Returns `Boolean` - `true` if Electron has finished initializing, `false` otherwise.
-See also `app.whenReady()`.
 
 ### `app.whenReady()`
 
@@ -574,7 +582,7 @@ them.
 
 Sets or creates a directory your app's logs which can then be manipulated with `app.getPath()` or `app.setPath(pathName, newPath)`.
 
-Calling `app.setAppLogsPath()` without a `path` parameter will result in this directory being set to `~/Library/Logs/YourAppName` on _macOS_, and inside the `userData` directory on _Linux_ and _Windows_.
+Calling `app.setAppLogsPath()` without a `path` parameter will result in this directory being set to `/Library/Logs/YourAppName` on _macOS_, and inside the `userData` directory on _Linux_ and _Windows_.
 
 ### `app.getAppPath()`
 
@@ -606,8 +614,6 @@ Returns `String` - The current application directory.
 Returns `String` - A path to a special directory or file associated with `name`. On
 failure, an `Error` is thrown.
 
-If `app.getPath('logs')` is called without called `app.setAppLogsPath()` being called first, a default log directory will be created equivalent to calling `app.setAppLogsPath()` without a `path` parameter.
-
 ### `app.getFileIcon(path[, options])`
 
 * `path` String
@@ -659,19 +665,21 @@ to the npm modules spec. You should usually also specify a `productName`
 field, which is your application's full capitalized name, and which will be
 preferred over `name` by Electron.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.setName(name)`
 
 * `name` String
 
 Overrides the current application's name.
 
-**Note:** This function overrides the name used internally by Electron; it does not affect the name that the OS uses.
+**[Deprecated](modernization/property-updates.md)**
 
 ### `app.getLocale()`
 
 Returns `String` - The current application locale. Possible return values are documented [here](locales.md).
 
-To set the locale, you'll want to use a command line switch at app startup, which may be found [here](https://github.com/electron/electron/blob/master/docs/api/command-line-switches.md).
+To set the locale, you'll want to use a command line switch at app startup, which may be found [here](https://github.com/electron/electron/blob/master/docs/api/chrome-command-line-switches.md).
 
 **Note:** When distributing your packaged app, you have to also ship the
 `locales` folder.
@@ -699,34 +707,34 @@ Clears the recent documents list.
 
 ### `app.setAsDefaultProtocolClient(protocol[, path, args])`
 
-* `protocol` String - The name of your protocol, without `://`. For example,
-  if you want your app to handle `electron://` links, call this method with
-  `electron` as the parameter.
-* `path` String (optional) _Windows_ - The path to the Electron executable.
-  Defaults to `process.execPath`
-* `args` String[] (optional) _Windows_ - Arguments passed to the executable.
-  Defaults to an empty array
+* `protocol` String - The name of your protocol, without `://`. If you want your
+  app to handle `electron://` links, call this method with `electron` as the
+  parameter.
+* `path` String (optional) _Windows_ - Defaults to `process.execPath`
+* `args` String[] (optional) _Windows_ - Defaults to an empty array
 
 Returns `Boolean` - Whether the call succeeded.
 
-Sets the current executable as the default handler for a protocol (aka URI
-scheme). It allows you to integrate your app deeper into the operating system.
-Once registered, all links with `your-protocol://` will be opened with the
-current executable. The whole link, including protocol, will be passed to your
-application as a parameter.
+This method sets the current executable as the default handler for a protocol
+(aka URI scheme). It allows you to integrate your app deeper into the operating
+system. Once registered, all links with `your-protocol://` will be opened with
+the current executable. The whole link, including protocol, will be passed to
+your application as a parameter.
+
+On Windows, you can provide optional parameters path, the path to your executable,
+and args, an array of arguments to be passed to your executable when it launches.
 
 **Note:** On macOS, you can only register protocols that have been added to
-your app's `info.plist`, which cannot be modified at runtime. However, you can
-change the file during build time via [Electron Forge][electron-forge],
-[Electron Packager][electron-packager], or by editing `info.plist` with a text
-editor. Please refer to [Apple's documentation][CFBundleURLTypes] for details.
+your app's `info.plist`, which can not be modified at runtime. You can however
+change the file with a simple text editor or script during build time.
+Please refer to [Apple's documentation][CFBundleURLTypes] for details.
 
 **Note:** In a Windows Store environment (when packaged as an `appx`) this API
 will return `true` for all calls but the registry key it sets won't be accessible
 by other applications.  In order to register your Windows Store application
 as a default protocol handler you must [declare the protocol in your manifest](https://docs.microsoft.com/en-us/uwp/schemas/appxpackage/uapmanifestschema/element-uap-protocol).
 
-The API uses the Windows Registry and `LSSetDefaultHandlerForURLScheme` internally.
+The API uses the Windows Registry and LSSetDefaultHandlerForURLScheme internally.
 
 ### `app.removeAsDefaultProtocolClient(protocol[, path, args])` _macOS_ _Windows_
 
@@ -745,8 +753,10 @@ protocol (aka URI scheme). If so, it will remove the app as the default handler.
 * `path` String (optional) _Windows_ - Defaults to `process.execPath`
 * `args` String[] (optional) _Windows_ - Defaults to an empty array
 
-Returns `Boolean` - Whether the current executable is the default handler for a
-protocol (aka URI scheme).
+Returns `Boolean`
+
+This method checks if the current executable is the default handler for a protocol
+(aka URI scheme). If so, it will return true. Otherwise, it will return false.
 
 **Note:** On macOS, you can use this method to check if the app has been
 registered as the default protocol handler for a protocol. You can also verify
@@ -754,22 +764,7 @@ this by checking `~/Library/Preferences/com.apple.LaunchServices.plist` on the
 macOS machine. Please refer to
 [Apple's documentation][LSCopyDefaultHandlerForURLScheme] for details.
 
-The API uses the Windows Registry and `LSCopyDefaultHandlerForURLScheme` internally.
-
-### `app.getApplicationNameForProtocol(url)`
-
-* `url` String - a URL with the protocol name to check. Unlike the other
-  methods in this family, this accepts an entire URL, including `://` at a
-  minimum (e.g. `https://`).
-
-Returns `String` - Name of the application handling the protocol, or an empty
-  string if there is no handler. For instance, if Electron is the default
-  handler of the URL, this could be `Electron` on Windows and Mac. However,
-  don't rely on the precise format which is not guaranteed to remain unchanged.
-  Expect a different format on Linux, possibly with a `.desktop` suffix.
-
-This method returns the application name of the default handler for the protocol
-(aka URI scheme) of a URL.
+The API uses the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.
 
 ### `app.setUserTasks(tasks)` _Windows_
 
@@ -931,7 +926,7 @@ if (!gotTheLock) {
   })
 
   // Create myWindow, load the rest of the app, etc...
-  app.whenReady().then(() => {
+  app.on('ready', () => {
   })
 }
 ```
@@ -988,17 +983,6 @@ Updates the current activity if its type matches `type`, merging the entries fro
 
 Changes the [Application User Model ID][app-user-model-id] to `id`.
 
-### `app.setActivationPolicy(policy)` _macOS_
-
-* `policy` String - Can be 'regular', 'accessory', or 'prohibited'.
-
-Sets the activation policy for a given app.
-
-Activation policy types:
-* 'regular' - The application is an ordinary app that appears in the Dock and may have a user interface.
-* 'accessory' - The application doesn’t appear in the Dock and doesn’t have a menu bar, but it may be activated programmatically or by clicking on one of its windows.
-* 'prohibited' - The application doesn’t appear in the Dock and may not create windows or be activated.
-
 ### `app.importCertificate(options, callback)` _Linux_
 
 * `options` Object
@@ -1021,7 +1005,7 @@ This method can only be called before app is ready.
 
 By default, Chromium disables 3D APIs (e.g. WebGL) until restart on a per
 domain basis if the GPU processes crashes too frequently. This function
-disables that behavior.
+disables that behaviour.
 
 This method can only be called before app is ready.
 
@@ -1085,10 +1069,14 @@ On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher.
 **Note:** Unity launcher requires the existence of a `.desktop` file to work,
 for more information please read [Desktop Environment Integration][unity-requirement].
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.getBadgeCount()` _Linux_ _macOS_
 
 Returns `Integer` - The current value displayed in the counter badge.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.isUnityRunning()` _Linux_
 
 Returns `Boolean` - Whether the current desktop environment is Unity launcher.
@@ -1163,6 +1151,8 @@ technologies, such as screen readers, has been detected. See
 https://www.chromium.org/developers/design-documents/accessibility for more
 details.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.setAccessibilitySupportEnabled(enabled)` _macOS_ _Windows_
 
 * `enabled` Boolean - Enable or disable [accessibility tree](https://developers.google.com/web/fundamentals/accessibility/semantics-builtin/the-accessibility-tree) rendering
@@ -1174,25 +1164,26 @@ This API must be called after the `ready` event is emitted.
 
 **Note:** Rendering accessibility tree can significantly affect the performance of your app. It should not be enabled by default.
 
-### `app.showAboutPanel()`
+**[Deprecated](modernization/property-updates.md)**
+
+### `app.showAboutPanel()` _macOS_ _Linux_
 
 Show the app's about panel options. These options can be overridden with `app.setAboutPanelOptions(options)`.
 
-### `app.setAboutPanelOptions(options)`
+### `app.setAboutPanelOptions(options)` _macOS_ _Linux_
 
 * `options` Object
   * `applicationName` String (optional) - The app's name.
   * `applicationVersion` String (optional) - The app's version.
   * `copyright` String (optional) - Copyright information.
   * `version` String (optional) _macOS_ - The app's build version number.
-  * `credits` String (optional) _macOS_ _Windows_ - Credit information.
+  * `credits` String (optional) _macOS_ - Credit information.
   * `authors` String[] (optional) _Linux_ - List of app authors.
   * `website` String (optional) _Linux_ - The app's website.
-  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
+  * `iconPath` String (optional) _Linux_ - Path to the app's icon. Will be shown as 64x64 pixels while retaining aspect ratio.
 
-Set the about panel options. This will override the values defined in the app's `.plist` file on macOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
-
-If you do not set `credits` but still wish to surface them in your app, AppKit will look for a file named "Credits.html", "Credits.rtf", and "Credits.rtfd", in that order, in the bundle returned by the NSBundle class method main. The first file found is used, and if none is found, the info area is left blank. See Apple [documentation](https://developer.apple.com/documentation/appkit/nsaboutpaneloptioncredits?language=objc) for more information.
+Set the about panel options. This will override the values defined in the app's
+`.plist` file on MacOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
 
 ### `app.isEmojiPanelSupported()`
 
@@ -1303,7 +1294,7 @@ command line arguments that Chromium uses.
 
 ### `app.dock` _macOS_ _Readonly_
 
-A [`Dock`](./dock.md) `| undefined` object that allows you to perform actions on your app icon in the user's
+A [`Dock`](./dock.md) object that allows you to perform actions on your app icon in the user's
 dock on macOS.
 
 ### `app.isPackaged` _Readonly_
@@ -1313,8 +1304,6 @@ A `Boolean` property that returns  `true` if the app is packaged, `false` otherw
 [dock-menu]:https://developer.apple.com/macos/human-interface-guidelines/menus/dock-menus/
 [tasks]:https://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#tasks
 [app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
-[electron-forge]: https://www.electronforge.io/
-[electron-packager]: https://github.com/electron/electron-packager
 [CFBundleURLTypes]: https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/TP40009249-102207-TPXREF115
 [LSCopyDefaultHandlerForURLScheme]: https://developer.apple.com/library/mac/documentation/Carbon/Reference/LaunchServicesReference/#//apple_ref/c/func/LSCopyDefaultHandlerForURLScheme
 [handoff]: https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/Handoff/HandoffFundamentals/HandoffFundamentals.html

docs/api/breaking-changes.md

@@ -1,151 +1,11 @@
 # Breaking Changes
 
-Breaking changes will be documented here, and deprecation warnings added to JS code where possible, at least [one major version](tutorial/electron-versioning.md#semver) before the change is made.
+Breaking changes will be documented here, and deprecation warnings added to JS code where possible, at least [one major version](../tutorial/electron-versioning.md#semver) before the change is made.
 
 ## `FIXME` comments
 
 The `FIXME` string is used in code comments to denote things that should be fixed for future releases. See https://github.com/electron/electron/search?q=fixme
 
-## Planned Breaking API Changes (9.0)
-
-### `<webview>.getWebContents()`
-
-This API, which was deprecated in Electron 8.0, is now removed.
-
-```js
-// Removed in Electron 9.0
-webview.getWebContents()
-// Replace with
-const { remote } = require('electron')
-remote.webContents.fromId(webview.getWebContentsId())
-```
-
-### `webFrame.setLayoutZoomLevelLimits()`
-
-Chromium has removed support for changing the layout zoom level limits, and it
-is beyond Electron's capacity to maintain it. The function was deprecated in
-Electron 8.x, and has been removed in Electron 9.x. The layout zoom level limits
-are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
-[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
-
-### Sending non-JS objects over IPC now throws an exception
-
-In Electron 8.0, IPC was changed to use the Structured Clone Algorithm,
-bringing significant performance improvements. To help ease the transition, the
-old IPC serialization algorithm was kept and used for some objects that aren't
-serializable with Structured Clone. In particular, DOM objects (e.g. `Element`,
-`Location` and `DOMMatrix`), Node.js objects backed by C++ classes (e.g.
-`process.env`, some members of `Stream`), and Electron objects backed by C++
-classes (e.g. `WebContents`, `BrowserWindow` and `WebFrame`) are not
-serializable with Structured Clone. Whenever the old algorithm was invoked, a
-deprecation warning was printed.
-
-In Electron 9.0, the old serialization algorithm has been removed, and sending
-such non-serializable objects will now throw an "object could not be cloned"
-error.
-
-## Planned Breaking API Changes (8.0)
-
-### Values sent over IPC are now serialized with Structured Clone Algorithm
-
-The algorithm used to serialize objects sent over IPC (through
-`ipcRenderer.send`, `ipcRenderer.sendSync`, `WebContents.send` and related
-methods) has been switched from a custom algorithm to V8's built-in [Structured
-Clone Algorithm][SCA], the same algorithm used to serialize messages for
-`postMessage`. This brings about a 2x performance improvement for large
-messages, but also brings some breaking changes in behavior.
-
-- Sending Functions, Promises, WeakMaps, WeakSets, or objects containing any
-  such values, over IPC will now throw an exception, instead of silently
-  converting the functions to `undefined`.
-```js
-// Previously:
-ipcRenderer.send('channel', { value: 3, someFunction: () => {} })
-// => results in { value: 3 } arriving in the main process
-
-// From Electron 8:
-ipcRenderer.send('channel', { value: 3, someFunction: () => {} })
-// => throws Error("() => {} could not be cloned.")
-```
-- `NaN`, `Infinity` and `-Infinity` will now be correctly serialized, instead
-  of being converted to `null`.
-- Objects containing cyclic references will now be correctly serialized,
-  instead of being converted to `null`.
-- `Set`, `Map`, `Error` and `RegExp` values will be correctly serialized,
-  instead of being converted to `{}`.
-- `BigInt` values will be correctly serialized, instead of being converted to
-  `null`.
-- Sparse arrays will be serialized as such, instead of being converted to dense
-  arrays with `null`s.
-- `Date` objects will be transferred as `Date` objects, instead of being
-  converted to their ISO string representation.
-- Typed Arrays (such as `Uint8Array`, `Uint16Array`, `Uint32Array` and so on)
-  will be transferred as such, instead of being converted to Node.js `Buffer`.
-- Node.js `Buffer` objects will be transferred as `Uint8Array`s. You can
-  convert a `Uint8Array` back to a Node.js `Buffer` by wrapping the underlying
-  `ArrayBuffer`:
-```js
-Buffer.from(value.buffer, value.byteOffset, value.byteLength)
-```
-
-Sending any objects that aren't native JS types, such as DOM objects (e.g.
-`Element`, `Location`, `DOMMatrix`), Node.js objects (e.g. `process.env`,
-`Stream`), or Electron objects (e.g. `WebContents`, `BrowserWindow`,
-`WebFrame`) is deprecated. In Electron 8, these objects will be serialized as
-before with a DeprecationWarning message, but starting in Electron 9, sending
-these kinds of objects will throw a 'could not be cloned' error.
-
-[SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-
-### `<webview>.getWebContents()`
-
-This API is implemented using the `remote` module, which has both performance
-and security implications. Therefore its usage should be explicit.
-
-```js
-// Deprecated
-webview.getWebContents()
-// Replace with
-const { remote } = require('electron')
-remote.webContents.fromId(webview.getWebContentsId())
-```
-
-However, it is recommended to avoid using the `remote` module altogether.
-
-```js
-// main
-const { ipcMain, webContents } = require('electron')
-
-const getGuestForWebContents = (webContentsId, contents) => {
-  const guest = webContents.fromId(webContentsId)
-  if (!guest) {
-    throw new Error(`Invalid webContentsId: ${webContentsId}`)
-  }
-  if (guest.hostWebContents !== contents) {
-    throw new Error(`Access denied to webContents`)
-  }
-  return guest
-}
-
-ipcMain.handle('openDevTools', (event, webContentsId) => {
-  const guest = getGuestForWebContents(webContentsId, event.sender)
-  guest.openDevTools()
-})
-
-// renderer
-const { ipcRenderer } = require('electron')
-
-ipcRenderer.invoke('openDevTools', webview.getWebContentsId())
-```
-
-### `webFrame.setLayoutZoomLevelLimits()`
-
-Chromium has removed support for changing the layout zoom level limits, and it
-is beyond Electron's capacity to maintain it. The function will emit a warning
-in Electron 8.x, and cease to exist in Electron 9.x. The layout zoom level
-limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
-[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
-
 ## Planned Breaking API Changes (7.0)
 
 ### Node Headers URL
@@ -190,7 +50,7 @@ const idleTime = getSystemIdleTime()
 ### webFrame Isolated World APIs
 
 ```js
-// Removed in Electron 7.0
+// Removed in Elecron 7.0
 webFrame.setIsolatedWorldContentSecurityPolicy(worldId, csp)
 webFrame.setIsolatedWorldHumanReadableName(worldId, name)
 webFrame.setIsolatedWorldSecurityOrigin(worldId, securityOrigin)
@@ -208,39 +68,6 @@ webFrame.setIsolatedWorldInfo(
 
 This property was removed in Chromium 77, and as such is no longer available.
 
-### `webkitdirectory` attribute for `<input type="file"/>`
-
-The `webkitdirectory` property on HTML file inputs allows them to select folders.
-Previous versions of Electron had an incorrect implementation where the `event.target.files`
-of the input returned a `FileList` that returned one `File` corresponding to the selected folder.
-
-As of Electron 7, that `FileList` is now list of all files contained within
-the folder, similarly to Chrome, Firefox, and Edge
-([link to MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/webkitdirectory)).
-
-As an illustration, take a folder with this structure:
-```console
-folder
-├── file1
-├── file2
-└── file3
-```
-
-In Electron <=6, this would return a `FileList` with a `File` object for:
-```console
-path/to/folder
-```
-
-In Electron 7, this now returns a `FileList` with a `File` object for:
-```console
-/path/to/folder/file3
-/path/to/folder/file2
-/path/to/folder/file1
-```
-
-Note that `webkitdirectory` no longer exposes the path to the selected folder.
-If you require the path to the selected folder rather than the folder contents,
-see the `dialog.showOpenDialog` API ([link](https://github.com/electron/electron/blob/master/docs/api/dialog.md#dialogshowopendialogbrowserwindow-options)).
 ## Planned Breaking API Changes (6.0)
 
 ### `win.setMenu(null)`

docs/api/browser-view.md

@@ -15,9 +15,12 @@ relative to its owning window. It is meant to be an alternative to the
 // In the main process.
 const { BrowserView, BrowserWindow } = require('electron')
 
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
+win.on('closed', () => {
+  win = null
+})
 
-const view = new BrowserView()
+let view = new BrowserView()
 win.setBrowserView(view)
 view.setBounds({ x: 0, y: 0, width: 300, height: 300 })
 view.webContents.loadURL('https://electronjs.org')

docs/api/browser-window.md

@@ -11,7 +11,10 @@ const { BrowserWindow } = require('electron')
 // Or use `remote` from the renderer process.
 // const { BrowserWindow } = require('electron').remote
 
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
+win.on('closed', () => {
+  win = null
+})
 
 // Load a remote URL
 win.loadURL('https://github.com')
@@ -48,9 +51,6 @@ This event is usually emitted after the `did-finish-load` event, but for
 pages with many remote resources, it may be emitted before the `did-finish-load`
 event.
 
-Please note that using this event implies that the renderer will be considered "visible" and
-paint even though `show` is false.  This event will never fire if you use `paintWhenInitiallyHidden: false`
-
 ## Setting `backgroundColor`
 
 For a complex app, the `ready-to-show` event could be emitted too late, making
@@ -177,14 +177,13 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `simpleFullscreen` Boolean (optional) - Use pre-Lion fullscreen on macOS. Default is `false`.
   * `skipTaskbar` Boolean (optional) - Whether to show the window in taskbar. Default is
     `false`.
-  * `kiosk` Boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
+  * `kiosk` Boolean (optional) - The kiosk mode. Default is `false`.
   * `title` String (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
   * `icon` ([NativeImage](native-image.md) | String) (optional) - The window icon. On Windows it is
     recommended to use `ICO` icons to get best visual effects, you can also
     leave it undefined so the executable's icon will be used.
   * `show` Boolean (optional) - Whether window should be shown when created. Default is
     `true`.
-  * `paintWhenInitiallyHidden` Boolean (optional) - Whether the renderer should be active when `show` is `false` and it has just been created.  In order for `document.visibilityState` to work correctly on first load with `show: false` you should set this to `false`.  Setting this to `false` will cause the `ready-to-show` event to not fire.  Default is `true`.
   * `frame` Boolean (optional) - Specify `false` to create a
     [Frameless Window](frameless-window.md). Default is `true`.
   * `parent` BrowserWindow (optional) - Specify parent window. Default is `null`.
@@ -203,11 +202,12 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `backgroundColor` String (optional) - Window's background color as a hexadecimal value,
     like `#66CD00` or `#FFF` or `#80FFFFFF` (alpha in #AARRGGBB format is supported if
     `transparent` is set to `true`). Default is `#FFF` (white).
-  * `hasShadow` Boolean (optional) - Whether window should have a shadow. Default is `true`.
+  * `hasShadow` Boolean (optional) - Whether window should have a shadow. This is only
+    implemented on macOS. Default is `true`.
   * `opacity` Number (optional) - Set the initial opacity of the window, between 0.0 (fully
     transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
   * `darkTheme` Boolean (optional) - Forces using dark theme for the window, only works on
-    some GTK desktop environments. Default is `false`.
+    some GTK+3 desktop environments. Default is `false`.
   * `transparent` Boolean (optional) - Makes the window [transparent](frameless-window.md#transparent-window).
     Default is `false`. On Windows, does not work unless the window is frameless.
   * `type` String (optional) - The type of window, default is normal window. See more about
@@ -226,7 +226,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       unless hovered over in the top left of the window. These custom buttons prevent
       issues with mouse events that occur with the standard window toolbar buttons.
       **Note:** This option is currently experimental.
-  * `trafficLightPosition` [Point](structures/point.md) (optional) - Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`
   * `fullscreenWindowTitle` Boolean (optional) - Shows the title in the
     title bar in full screen mode on macOS for all `titleBarStyle` options.
     Default is `false`.
@@ -270,6 +269,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       OS-level sandbox and disabling the Node.js engine. This is not the same as
       the `nodeIntegration` option and the APIs available to the preload script
       are more limited. Read more about the option [here](sandbox-option.md).
+      **Note:** This option is currently experimental and may change or be
+      removed in future Electron releases.
     * `enableRemoteModule` Boolean (optional) - Whether to enable the [`remote`](remote.md) module.
       Default is `true`.
     * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
@@ -289,7 +290,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       between the web pages even when you specified different values for them,
       including but not limited to `preload`, `sandbox` and `nodeIntegration`.
       So it is suggested to use exact same `webPreferences` for web pages with
-      the same `affinity`. _Deprecated_
+      the same `affinity`. _This property is experimental_
     * `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents
       `300%`. Default is `1.0`.
     * `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`.
@@ -369,8 +370,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       consecutive dialog protection is triggered. If not defined the default
       message would be used, note that currently the default message is in
       English and not localized.
-    * `disableDialogs` Boolean (optional) - Whether to disable dialogs
-      completely. Overrides `safeDialogs`. Default is `false`.
     * `navigateOnDragDrop` Boolean (optional) - Whether dragging and dropping a
       file or link onto the page causes a navigation. Default is `false`.
     * `autoplayPolicy` String (optional) - Autoplay policy to apply to
@@ -380,11 +379,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     * `disableHtmlFullscreenWindowResize` Boolean (optional) - Whether to
       prevent the window from resizing when entering HTML Fullscreen. Default
       is `false`.
-    * `accessibleTitle` String (optional) - An alternative title string provided only
-      to accessibility tools such as screen readers. This string is not directly
-      visible to users.
-    * `spellcheck` Boolean (optional) - Whether to enable the builtin spellchecker.
-      Default is `true`.
 
 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -491,9 +485,6 @@ Emitted when the window is hidden.
 Emitted when the web page has been rendered (while not being shown) and window can be displayed without
 a visual flash.
 
-Please note that using this event implies that the renderer will be considered "visible" and
-paint even though `show` is false.  This event will never fire if you use `paintWhenInitiallyHidden: false`
-
 #### Event: 'maximize'
 
 Emitted when window is maximized.
@@ -515,7 +506,7 @@ Emitted when the window is restored from a minimized state.
 Returns:
 
 * `event` Event
-* `newBounds` [Rectangle](structures/rectangle.md) - Size the window is being resized to.
+* `newBounds` [`Rectangle`](structures/rectangle.md) - Size the window is being resized to.
 
 Emitted before the window is resized. Calling `event.preventDefault()` will prevent the window from being resized.
 
@@ -525,14 +516,14 @@ Note that this is only emitted when the window is being resized manually. Resizi
 
 Emitted after the window has been resized.
 
-#### Event: 'will-move' _macOS_ _Windows_
+#### Event: 'will-move' _Windows_
 
 Returns:
 
 * `event` Event
-* `newBounds` [Rectangle](structures/rectangle.md) - Location the window is being moved to.
+* `newBounds` [`Rectangle`](structures/rectangle.md) - Location the window is being moved to.
 
-Emitted before the window is moved. On Windows, calling `event.preventDefault()` will prevent the window from being moved.
+Emitted before the window is moved. Calling `event.preventDefault()` will prevent the window from being moved.
 
 Note that this is only emitted when the window is being resized manually. Resizing the window with `setBounds`/`setSize` will not emit this event.
 
@@ -623,12 +614,6 @@ Returns:
 
 Emitted on 3-finger swipe. Possible directions are `up`, `right`, `down`, `left`.
 
-The method underlying this event is built to handle older macOS-style trackpad swiping,
-where the content on the screen doesn't move with the swipe. Most macOS trackpads are not
-configured to allow this kind of swiping anymore, so in order for it to emit properly the
-'Swipe between pages' preference in `System Preferences > Trackpad > More Gestures` must be
-set to 'Swipe with two or three fingers'.
-
 #### Event: 'rotate-gesture' _macOS_
 
 Returns:
@@ -670,8 +655,7 @@ Returns `BrowserWindow | null` - The window that is focused in this application,
 
 * `webContents` [WebContents](web-contents.md)
 
-Returns `BrowserWindow | null` - The window that owns the given `webContents`
-or `null` if the contents are not owned by a window.
+Returns `BrowserWindow` - The window that owns the given `webContents`.
 
 #### `BrowserWindow.fromBrowserView(browserView)`
 
@@ -685,7 +669,7 @@ Returns `BrowserWindow | null` - The window that owns the given `browserView`. I
 
 Returns `BrowserWindow` - The window with the given `id`.
 
-#### `BrowserWindow.addExtension(path)` _Deprecated_
+#### `BrowserWindow.addExtension(path)`
 
 * `path` String
 
@@ -696,10 +680,7 @@ The method will also not return if the extension's manifest is missing or incomp
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath).
-
-#### `BrowserWindow.removeExtension(name)` _Deprecated_
+#### `BrowserWindow.removeExtension(name)`
 
 * `name` String
 
@@ -708,10 +689,7 @@ Remove a Chrome extension by name.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Note:** This method is deprecated. Instead, use
-[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
-
-#### `BrowserWindow.getExtensions()` _Deprecated_
+#### `BrowserWindow.getExtensions()`
 
 Returns `Record<String, ExtensionInfo>` - The keys are the extension names and each value is
 an Object containing `name` and `version` properties.
@@ -719,10 +697,7 @@ an Object containing `name` and `version` properties.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Note:** This method is deprecated. Instead, use
-[`ses.getAllExtensions()`](session.md#sesgetallextensions).
-
-#### `BrowserWindow.addDevToolsExtension(path)` _Deprecated_
+#### `BrowserWindow.addDevToolsExtension(path)`
 
 * `path` String
 
@@ -738,10 +713,7 @@ The method will also not return if the extension's manifest is missing or incomp
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath).
-
-#### `BrowserWindow.removeDevToolsExtension(name)` _Deprecated_
+#### `BrowserWindow.removeDevToolsExtension(name)`
 
 * `name` String
 
@@ -750,10 +722,7 @@ Remove a DevTools extension by name.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Note:** This method is deprecated. Instead, use
-[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
-
-#### `BrowserWindow.getDevToolsExtensions()` _Deprecated_
+#### `BrowserWindow.getDevToolsExtensions()`
 
 Returns `Record<string, ExtensionInfo>` - The keys are the extension names and each value is
 an Object containing `name` and `version` properties.
@@ -770,9 +739,6 @@ console.log(installed)
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Note:** This method is deprecated. Instead, use
-[`ses.getAllExtensions()`](session.md#sesgetallextensions).
-
 ### Instance Properties
 
 Objects created with `new BrowserWindow` have the following properties:
@@ -794,7 +760,7 @@ events.
 
 #### `win.id` _Readonly_
 
-A `Integer` property representing the unique ID of the window. Each ID is unique among all `BrowserWindow` instances of the entire Electron application.
+A `Integer` property representing the unique ID of the window.
 
 #### `win.autoHideMenuBar`
 
@@ -803,47 +769,6 @@ A `Boolean` property that determines whether the window menu bar should hide its
 If the menu bar is already visible, setting this property to `true` won't
 hide it immediately.
 
-#### `win.simpleFullScreen`
-
-A `Boolean` property that determines whether the window is in simple (pre-Lion) fullscreen mode.
-
-#### `win.visibleOnAllWorkspaces`
-
-A `Boolean` property that determines whether the window is visible on all workspaces.
-
-**Note:** Always returns false on Windows.
-
-#### `win.shadow`
-
-A `Boolean` property that determines whether the window has a shadow.
-
-#### `win.menuBarVisible` _Windows_ _Linux_
-
-A `Boolean` property that determines whether the menu bar should be visible.
-
-**Note:** If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
-
-####  `win.kiosk`
-
-A `Boolean` property that determines whether the window is in kiosk mode.
-
-#### `win.documentEdited` _macOS_
-
-A `Boolean` property that specifies whether the window’s document has been edited.
-
-The icon in title bar will become gray when set to `true`.
-
-#### `win.representedFilename` _macOS_
-
-A `String` property that determines the pathname of the file the window represents,
-and the icon of the file will show in window's title bar.
-
-#### `win.title`
-
-A `String` property that determines the title of the native window.
-
-**Note:** The title of the web page can be different from the title of the native window.
-
 #### `win.minimizable`
 
 A `Boolean` property that determines whether the window can be manually minimized by user.
@@ -896,12 +821,6 @@ const menu = Menu.buildFromTemplate(template)
 Menu.setApplicationMenu(menu)
 ```
 
-#### `win.accessibleTitle`
-
-A `String` property that defines an alternative title provided only to
-accessibility tools such as screen readers. This string is not directly
-visible to users.
-
 ### Instance Methods
 
 Objects created with `new BrowserWindow` have the following instance methods:
@@ -999,7 +918,7 @@ Returns `Boolean` - Whether the window is in fullscreen mode.
 
 Enters or leaves simple fullscreen mode.
 
-Simple fullscreen mode emulates the native fullscreen behavior found in versions of macOS prior to Lion (10.7).
+Simple fullscreen mode emulates the native fullscreen behavior found in versions of Mac OS X prior to Lion (10.7).
 
 #### `win.isSimpleFullScreen()` _macOS_
 
@@ -1009,11 +928,11 @@ Returns `Boolean` - Whether the window is in simple (pre-Lion) fullscreen mode.
 
 Returns `Boolean` - Whether the window is in normal state (not maximized, not minimized, not in fullscreen mode).
 
-#### `win.setAspectRatio(aspectRatio[, extraSize])` _macOS_ _Linux_
+#### `win.setAspectRatio(aspectRatio[, extraSize])` _macOS_
 
 * `aspectRatio` Float - The aspect ratio to maintain for some portion of the
 content view.
- * `extraSize` [Size](structures/size.md) (optional) _macOS_ - The extra size not to be included while
+* `extraSize` [Size](structures/size.md) (optional) - The extra size not to be included while
 maintaining the aspect ratio.
 
 This will make a window maintain an aspect ratio. The extra size allows a
@@ -1026,10 +945,13 @@ Perhaps there are 15 pixels of controls on the left edge, 25 pixels of controls
 on the right edge and 50 pixels of controls below the player. In order to
 maintain a 16:9 aspect ratio (standard aspect ratio for HD @1920x1080) within
 the player itself we would call this function with arguments of 16/9 and
-{ width: 40, height: 50 }. The second argument doesn't care where the extra width and height
+[ 40, 50 ]. The second argument doesn't care where the extra width and height
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.
 
+Calling this function with a value of `0` will remove any previously set aspect
+ratios.
+
 #### `win.setBackgroundColor(backgroundColor)`
 
 * `backgroundColor` String - Window's background color as a hexadecimal value,
@@ -1079,11 +1001,6 @@ console.log(win.getBounds())
 
 Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `Object`.
 
-#### `win.getBackgroundColor()`
-
-Returns `String` - Gets the background color of the window. See [Setting
-`backgroundColor`](#setting-backgroundcolor).
-
 #### `win.setContentBounds(bounds[, animate])`
 
 * `bounds` [Rectangle](structures/rectangle.md)
@@ -1162,11 +1079,15 @@ Returns `Integer[]` - Contains the window's maximum width and height.
 
 * `resizable` Boolean
 
-Sets whether the window can be manually resized by the user.
+Sets whether the window can be manually resized by user.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isResizable()`
 
-Returns `Boolean` - Whether the window can be manually resized by the user.
+Returns `Boolean` - Whether the window can be manually resized by user.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.setMovable(movable)` _macOS_ _Windows_
 
@@ -1174,29 +1095,41 @@ Returns `Boolean` - Whether the window can be manually resized by the user.
 
 Sets whether the window can be moved by user. On Linux does nothing.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.isMovable()` _macOS_ _Windows_
 
 Returns `Boolean` - Whether the window can be moved by user.
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMinimizable(minimizable)` _macOS_ _Windows_
 
 * `minimizable` Boolean
 
-Sets whether the window can be manually minimized by user. On Linux does nothing.
+Sets whether the window can be manually minimized by user. On Linux does
+nothing.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isMinimizable()` _macOS_ _Windows_
 
-Returns `Boolean` - Whether the window can be manually minimized by the user.
+Returns `Boolean` - Whether the window can be manually minimized by user
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMaximizable(maximizable)` _macOS_ _Windows_
 
 * `maximizable` Boolean
 
-Sets whether the window can be manually maximized by user. On Linux does nothing.
+Sets whether the window can be manually maximized by user. On Linux does
+nothing.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isMaximizable()` _macOS_ _Windows_
 
@@ -1204,15 +1137,23 @@ Returns `Boolean` - Whether the window can be manually maximized by user.
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setFullScreenable(fullscreenable)`
 
 * `fullscreenable` Boolean
 
-Sets whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+Sets whether the maximize/zoom window button toggles fullscreen mode or
+maximizes the window.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isFullScreenable()`
 
-Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen mode or
+maximizes the window.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.setClosable(closable)` _macOS_ _Windows_
 
@@ -1220,12 +1161,16 @@ Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen m
 
 Sets whether the window can be manually closed by user. On Linux does nothing.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.isClosable()` _macOS_ _Windows_
 
 Returns `Boolean` - Whether the window can be manually closed by user.
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setAlwaysOnTop(flag[, level][, relativeLevel])`
 
 * `flag` Boolean
@@ -1249,14 +1194,6 @@ can not be focused on.
 
 Returns `Boolean` - Whether the window is always on top of other windows.
 
-#### `win.moveAbove(mediaSourceId)`
-
-* `mediaSourceId` String - Window id in the format of DesktopCapturerSource's id. For example "window:1869:0".
-
-Moves window above the source window in the sense of z-order. If the
-`mediaSourceId` is not of type window or if the window does not exist then
-this method throws an error.
-
 #### `win.moveTop()`
 
 Moves window to top(z-order) regardless of focus
@@ -1323,21 +1260,12 @@ Makes the window not show in the taskbar.
 
 * `flag` Boolean
 
-Enters or leaves kiosk mode.
+Enters or leaves the kiosk mode.
 
 #### `win.isKiosk()`
 
 Returns `Boolean` - Whether the window is in kiosk mode.
 
-#### `win.getMediaSourceId()`
-
-Returns `String` - Window id in the format of DesktopCapturerSource's id. For example "window:1234:0".
-
-More precisely the format is `window:id:other_id` where `id` is `HWND` on
-Windows, `CGWindowID` (`uint64_t`) on macOS and `Window` (`unsigned long`) on
-Linux. `other_id` is used to identify web contents (tabs) so within the same
-top level window.
-
 #### `win.getNativeWindowHandle()`
 
 Returns `Buffer` - The platform-specific handle of the window.
@@ -1509,27 +1437,29 @@ screen readers
 Sets a 16 x 16 pixel overlay onto the current taskbar icon, usually used to
 convey some sort of application status or to passively notify the user.
 
-#### `win.setHasShadow(hasShadow)`
+#### `win.setHasShadow(hasShadow)` _macOS_
 
 * `hasShadow` Boolean
 
-Sets whether the window should have a shadow.
+Sets whether the window should have a shadow. On Windows and Linux does
+nothing.
 
-#### `win.hasShadow()`
+#### `win.hasShadow()` _macOS_
 
 Returns `Boolean` - Whether the window has a shadow.
 
+On Windows and Linux always returns
+`true`.
+
 #### `win.setOpacity(opacity)` _Windows_ _macOS_
 
 * `opacity` Number - between 0.0 (fully transparent) and 1.0 (fully opaque)
 
-Sets the opacity of the window. On Linux, does nothing. Out of bound number
-values are clamped to the [0, 1] range.
+Sets the opacity of the window. On Linux does nothing.
 
-#### `win.getOpacity()`
+#### `win.getOpacity()` _Windows_ _macOS_
 
-Returns `Number` - between 0.0 (fully transparent) and 1.0 (fully opaque). On
-Linux, always returns 1.
+Returns `Number` - between 0.0 (fully transparent) and 1.0 (fully opaque)
 
 #### `win.setShape(rects)` _Windows_ _Linux_ _Experimental_
 
@@ -1618,7 +1548,7 @@ Same as `webContents.showDefinitionForSelection()`.
 
 #### `win.setIcon(icon)` _Windows_ _Linux_
 
-* `icon` [NativeImage](native-image.md) | String
+* `icon` [NativeImage](native-image.md)
 
 Changes window icon.
 
@@ -1637,25 +1567,34 @@ This cannot be called when `titleBarStyle` is set to `customButtonsOnHover`.
 Sets whether the window menu bar should hide itself automatically. Once set the
 menu bar will only show when users press the single `Alt` key.
 
-If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't hide it immediately.
+If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't
+hide it immediately.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isMenuBarAutoHide()`
 
 Returns `Boolean` - Whether menu bar automatically hides itself.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMenuBarVisibility(visible)` _Windows_ _Linux_
 
 * `visible` Boolean
 
-Sets whether the menu bar should be visible. If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
+Sets whether the menu bar should be visible. If the menu bar is auto-hide, users
+can still bring up the menu bar by pressing the single `Alt` key.
 
 #### `win.isMenuBarVisible()`
 
 Returns `Boolean` - Whether the menu bar is visible.
 
-#### `win.setVisibleOnAllWorkspaces(visible)`
+#### `win.setVisibleOnAllWorkspaces(visible[, options])`
 
 * `visible` Boolean
+* `options` Object (optional)
+  * `visibleOnFullScreen` Boolean (optional) _macOS_ - Sets whether
+    the window should be visible above fullscreen windows
 
 Sets whether the window should be visible on all workspaces.
 
@@ -1763,17 +1702,6 @@ will remove the vibrancy effect on the window.
 Note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` have been
 deprecated and will be removed in an upcoming version of macOS.
 
-#### `win.setTrafficLightPosition(position)` _macOS_
-
-* `position` [Point](structures/point.md)
-
-Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`.
-
-#### `win.getTrafficLightPosition()` _macOS_
-
-Returns `Point` - The current position for the traffic light buttons. Can only be used with `titleBarStyle`
-set to `hidden`.
-
 #### `win.setTouchBar(touchBar)` _macOS_ _Experimental_
 
 * `touchBar` TouchBar | null
@@ -1787,14 +1715,14 @@ removed in future Electron releases.
 
 #### `win.setBrowserView(browserView)` _Experimental_
 
-* `browserView` [BrowserView](browser-view.md) | null - Attach `browserView` to `win`.
-If there are other `BrowserView`s attached, they will be removed from
+* `browserView` [BrowserView](browser-view.md) | null - Attach browserView to win.
+If there is some other browserViews was attached they will be removed from
 this window.
 
 #### `win.getBrowserView()` _Experimental_
 
-Returns `BrowserView | null` - The `BrowserView` attached to `win`. Returns `null`
-if one is not attached. Throws an error if multiple `BrowserView`s are attached.
+Returns `BrowserView | null` - an BrowserView what is attached. Returns `null`
+if none is attached. Throw error if multiple BrowserViews is attached.
 
 #### `win.addBrowserView(browserView)` _Experimental_
 

docs/api/chrome-command-line-switches.md

@@ -1,4 +1,4 @@
-# Supported Command Line Switches
+# Supported Chrome Command Line Switches
 
 > Command line switches supported by Electron.
 
@@ -11,7 +11,7 @@ const { app } = require('electron')
 app.commandLine.appendSwitch('remote-debugging-port', '8315')
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   // Your code here
 })
 ```
@@ -181,16 +181,6 @@ logging level for all code in the source files under a `foo/bar` directory.
 
 This switch only works when `--enable-logging` is also passed.
 
-## --enable-api-filtering-logging
-
-Enables caller stack logging for the following APIs (filtering events):
-- `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
-- `remote.require()` / `remote-require`
-- `remote.getGlobal()` / `remote-get-builtin`
-- `remote.getBuiltin()` / `remote-get-global`
-- `remote.getCurrentWindow()` / `remote-get-current-window`
-- `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
-
 ## --no-sandbox
 
 Disables Chromium sandbox, which is now enabled by default.

docs/api/client-request.md

@@ -22,9 +22,6 @@ which the request is associated.
   with which the request is associated. Defaults to the empty string. The
 `session` option prevails on `partition`. Thus if a `session` is explicitly
 specified, `partition` is ignored.
-  * `useSessionCookies` Boolean (optional) - Whether to send cookies with this
-    request from the provided session.  This will make the `net` request's
-    cookie behavior match a `fetch` request. Default is `false`.
   * `protocol` String (optional) - The protocol scheme in the form 'scheme:'.
 Currently supported values are 'http:' or 'https:'. Defaults to 'http:'.
   * `host` String (optional) - The server host provided as a concatenation of
@@ -35,8 +32,8 @@ the hostname and the port number 'hostname:port'.
   * `redirect` String (optional) - The redirect mode for this request. Should be
 one of `follow`, `error` or `manual`. Defaults to `follow`. When mode is `error`,
 any redirection will be aborted. When mode is `manual` the redirection will be
-cancelled unless [`request.followRedirect`](#requestfollowredirect) is invoked
-synchronously during the [`redirect`](#event-redirect) event.
+deferred until [`request.followRedirect`](#requestfollowredirect) is invoked. Listen for the [`redirect`](#event-redirect) event in
+this mode to get more details about the redirect request.
 
 `options` properties such as `protocol`, `host`, `hostname`, `port` and `path`
 strictly follow the Node.js model as described in the
@@ -73,8 +70,8 @@ Returns:
   * `port` Integer
   * `realm` String
 * `callback` Function
-  * `username` String (optional)
-  * `password` String (optional)
+  * `username` String
+  * `password` String
 
 Emitted when an authenticating proxy is asking for user credentials.
 
@@ -139,11 +136,8 @@ Returns:
 * `redirectUrl` String
 * `responseHeaders` Record<String, String[]>
 
-Emitted when the server returns a redirect response (e.g. 301 Moved
-Permanently). Calling [`request.followRedirect`](#requestfollowredirect) will
-continue with the redirection.  If this event is handled,
-[`request.followRedirect`](#requestfollowredirect) must be called
-**synchronously**, otherwise the request will be cancelled.
+Emitted when there is redirection and the mode is `manual`. Calling
+[`request.followRedirect`](#requestfollowredirect) will continue with the redirection.
 
 ### Instance Properties
 
@@ -220,8 +214,7 @@ response object,it will emit the `aborted` event.
 
 #### `request.followRedirect()`
 
-Continues any pending redirection. Can only be called during a `'redirect'`
-event.
+Continues any deferred redirection request when the redirection mode is `manual`.
 
 #### `request.getUploadProgress()`
 

docs/api/clipboard.md

@@ -4,12 +4,18 @@
 
 Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process)
 
+The following example shows how to write a string to the clipboard:
+
+```javascript
+const { clipboard } = require('electron')
+clipboard.writeText('Example String')
+```
+
 On Linux, there is also a `selection` clipboard. To manipulate it
 you need to pass `selection` to each method:
 
 ```javascript
 const { clipboard } = require('electron')
-
 clipboard.writeText('Example String', 'selection')
 console.log(clipboard.readText('selection'))
 ```
@@ -22,106 +28,56 @@ The `clipboard` module has the following methods:
 
 ### `clipboard.readText([type])`
 
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Returns `String` - The content in the clipboard as plain text.
 
-```js
-const { clipboard } = require('electron')
-
-clipboard.writeText('hello i am a bit of text!')
-
-const text = clipboard.readText()
-console.log(text)
-// hello i am a bit of text!'
-```
-
 ### `clipboard.writeText(text[, type])`
 
 * `text` String
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Writes the `text` into the clipboard as plain text.
 
-```js
-const { clipboard } = require('electron')
-
-const text = 'hello i am a bit of text!'
-clipboard.writeText(text)
-```
-
 ### `clipboard.readHTML([type])`
 
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Returns `String` - The content in the clipboard as markup.
 
-```js
-const { clipboard } = require('electron')
-
-clipboard.writeHTML('<b>Hi</b>')
-const html = clipboard.readHTML()
-
-console.log(html)
-// <meta charset='utf-8'><b>Hi</b>
-```
-
 ### `clipboard.writeHTML(markup[, type])`
 
 * `markup` String
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Writes `markup` to the clipboard.
 
-```js
-const { clipboard } = require('electron')
-
-clipboard.writeHTML('<b>Hi</b')
-```
-
 ### `clipboard.readImage([type])`
 
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Returns [`NativeImage`](native-image.md) - The image content in the clipboard.
 
 ### `clipboard.writeImage(image[, type])`
 
 * `image` [NativeImage](native-image.md)
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Writes `image` to the clipboard.
 
 ### `clipboard.readRTF([type])`
 
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Returns `String` - The content in the clipboard as RTF.
 
-```js
-const { clipboard } = require('electron')
-
-clipboard.writeRTF('{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\f0\\pard\nThis is some {\\b bold} text.\\par\n}')
-
-const rtf = clipboard.readRTF()
-console.log(rtf)
-// {\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\f0\\pard\nThis is some {\\b bold} text.\\par\n}
-```
-
 ### `clipboard.writeRTF(text[, type])`
 
 * `text` String
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Writes the `text` into the clipboard in RTF.
 
-```js
-const { clipboard } = require('electron')
-
-const rtf = '{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\f0\\pard\nThis is some {\\b bold} text.\\par\n}'
-clipboard.writeRTF(rtf)
-```
-
 ### `clipboard.readBookmark()` _macOS_ _Windows_
 
 Returns `Object`:
@@ -137,7 +93,7 @@ bookmark is unavailable.
 
 * `title` String
 * `url` String
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Writes the `title` and `url` into the clipboard as a bookmark.
 
@@ -146,9 +102,7 @@ you can use `clipboard.write` to write both a bookmark and fallback text to the
 clipboard.
 
 ```js
-const { clipboard } = require('electron')
-
-clipboard.writeBookmark({
+clipboard.write({
   text: 'https://electronjs.org',
   bookmark: 'Electron Homepage'
 })
@@ -156,50 +110,39 @@ clipboard.writeBookmark({
 
 ### `clipboard.readFindText()` _macOS_
 
-Returns `String` - The text on the find pasteboard, which is the pasteboard that holds information about the current state of the active application’s find panel.
-
-This method uses synchronous IPC when called from the renderer process.
-The cached value is reread from the find pasteboard whenever the application is activated.
+Returns `String` - The text on the find pasteboard. This method uses synchronous
+IPC when called from the renderer process. The cached value is reread from the
+find pasteboard whenever the application is activated.
 
 ### `clipboard.writeFindText(text)` _macOS_
 
 * `text` String
 
-Writes the `text` into the find pasteboard (the pasteboard that holds information about the current state of the active application’s find panel) as plain text. This method uses synchronous IPC when called from the renderer process.
+Writes the `text` into the find pasteboard as plain text. This method uses
+synchronous IPC when called from the renderer process.
 
 ### `clipboard.clear([type])`
 
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Clears the clipboard content.
 
 ### `clipboard.availableFormats([type])`
 
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Returns `String[]` - An array of supported formats for the clipboard `type`.
 
-```js
-const { clipboard } = require('electron')
-
-const formats = clipboard.availableFormats()
-console.log(formats)
-// [ 'text/plain', 'text/html' ]
-```
-
 ### `clipboard.has(format[, type])` _Experimental_
 
 * `format` String
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Returns `Boolean` - Whether the clipboard supports the specified `format`.
 
-```js
+```javascript
 const { clipboard } = require('electron')
-
-const hasFormat = clipboard.has('<p>selection</p>')
-console.log(hasFormat)
-// 'true' or 'false
+console.log(clipboard.has('<p>selection</p>'))
 ```
 
 ### `clipboard.read(format)` _Experimental_
@@ -214,33 +157,14 @@ Returns `String` - Reads `format` type from the clipboard.
 
 Returns `Buffer` - Reads `format` type from the clipboard.
 
-```js
-const { clipboard } = require('electron')
-
-const buffer = Buffer.from('this is binary', 'utf8')
-clipboard.writeBuffer('public.utf8-plain-text', buffer)
-
-const ret = clipboard.readBuffer('public.utf8-plain-text')
-
-console.log(buffer.equals(out))
-// true
-```
-
 ### `clipboard.writeBuffer(format, buffer[, type])` _Experimental_
 
 * `format` String
 * `buffer` Buffer
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
 Writes the `buffer` into the clipboard as `format`.
 
-```js
-const { clipboard } = require('electron')
-
-const buffer = Buffer.from('writeBuffer', 'utf8')
-clipboard.writeBuffer('public.utf8-plain-text', buffer)
-```
-
 ### `clipboard.write(data[, type])`
 
 * `data` Object
@@ -249,29 +173,10 @@ clipboard.writeBuffer('public.utf8-plain-text', buffer)
   * `image` [NativeImage](native-image.md) (optional)
   * `rtf` String (optional)
   * `bookmark` String (optional) - The title of the URL at `text`.
-* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `type` String (optional) - Can be `selection` or `clipboard`. `selection` is only available on Linux.
 
-Writes `data` to the clipboard.
-
-```js
+```javascript
 const { clipboard } = require('electron')
-
-clipboard.write({
-  text: 'test',
-  html: '<b>Hi</b>',
-  rtf: '{\\rtf1\\utf8 text}',
-  bookmark: 'a title'
-})
-
-console.log(clipboard.readText())
-// 'test'
-
-console.log(clipboard.readHTML())
-// <meta charset='utf-8'><b>Hi</b>
-
-console.log(clipboard.readRTF())
-// '{\\rtf1\\utf8 text}'
-
-console.log(clipboard.readBookmark())
-// { title: 'a title', url: 'test' }
+clipboard.write({ text: 'test', html: '<b>test</b>' })
 ```
+Writes `data` to the clipboard.

docs/api/command-line.md

@@ -12,7 +12,7 @@ app.commandLine.hasSwitch('disable-gpu')
 ```
 
 For more information on what kinds of flags and switches you can use, check
-out the [Command Line Switches](./command-line-switches.md)
+out the [Chrome Command Line Switches](./chrome-command-line-switches.md)
 document.
 
 ### Instance Methods

docs/api/content-tracing.md

@@ -13,7 +13,7 @@ module is emitted.
 ```javascript
 const { app, contentTracing } = require('electron')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   (async () => {
     await contentTracing.startRecording({
       include_categories: ['*']
@@ -38,9 +38,6 @@ Get a set of category groups. The category groups can change as new code paths
 are reached. See also the [list of built-in tracing
 categories](https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h).
 
-> **NOTE:** Electron adds a non-default tracing category called `"electron"`.
-> This category can be used to capture Electron-specific tracing events.
-
 ### `contentTracing.startRecording(options)`
 
 * `options` ([TraceConfig](structures/trace-config.md) | [TraceCategoriesAndOptions](structures/trace-categories-and-options.md))

docs/api/context-bridge.md

@@ -1,112 +0,0 @@
-# contextBridge
-
-> Create a safe, bi-directional, synchronous bridge across isolated contexts
-
-Process: [Renderer](../glossary.md#renderer-process)
-
-An example of exposing an API to a renderer from an isolated preload script is given below:
-
-```javascript
-// Preload (Isolated World)
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld(
-  'electron',
-  {
-    doThing: () => ipcRenderer.send('do-a-thing')
-  }
-)
-```
-
-```javascript
-// Renderer (Main World)
-
-window.electron.doThing()
-```
-
-## Glossary
-
-### Main World
-
-The "Main World" is the JavaScript context that your main renderer code runs in. By default, the
-page you load in your renderer executes code in this world.
-
-### Isolated World
-
-When `contextIsolation` is enabled in your `webPreferences`, your `preload` scripts run in an
-"Isolated World".  You can read more about context isolation and what it affects in the
-[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.
-
-## Methods
-
-The `contextBridge` module has the following methods:
-
-### `contextBridge.exposeInMainWorld(apiKey, api)` _Experimental_
-
-* `apiKey` String - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
-* `api` Record<String, any> - Your API object, more information on what this API can be and how it works is available below.
-
-## Usage
-
-### API Objects
-
-The `api` object provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api-experimental) must be an object
-whose keys are strings and values are a `Function`, `String`, `Number`, `Array`, `Boolean`, or another nested object that meets the same conditions.
-
-`Function` values are proxied to the other context and all other values are **copied** and **frozen**. Any data / primitives sent in
-the API object become immutable and updates on either side of the bridge do not result in an update on the other side.
-
-An example of a complex API object is shown below:
-
-```javascript
-const { contextBridge } = require('electron')
-
-contextBridge.exposeInMainWorld(
-  'electron',
-  {
-    doThing: () => ipcRenderer.send('do-a-thing'),
-    myPromises: [Promise.resolve(), Promise.reject(new Error('whoops'))],
-    anAsyncFunction: async () => 123,
-    data: {
-      myFlags: ['a', 'b', 'c'],
-      bootTime: 1234
-    },
-    nestedAPI: {
-      evenDeeper: {
-        youCanDoThisAsMuchAsYouWant: {
-          fn: () => ({
-            returnData: 123
-          })
-        }
-      }
-    }
-  }
-)
-```
-
-### API Functions
-
-`Function` values that you bind through the `contextBridge` are proxied through Electron to ensure that contexts remain isolated.  This
-results in some key limitations that we've outlined below.
-
-#### Parameter / Error / Return Type support
-
-Because parameters, errors and return values are **copied** when they are sent over the bridge, there are only certain types that can be used.
-At a high level, if the type you want to use can be serialized and deserialized into the same object it will work.  A table of type support
-has been included below for completeness:
-
-| Type | Complexity | Parameter Support | Return Value Support | Limitations |
-| ---- | ---------- | ----------------- | -------------------- | ----------- |
-| `String` | Simple | ✅ | ✅ | N/A |
-| `Number` | Simple | ✅ | ✅ | N/A |
-| `Boolean` | Simple | ✅ | ✅ | N/A |
-| `Object` | Complex | ✅ | ✅ | Keys must be supported using only "Simple" types in this table.  Values must be supported in this table.  Prototype modifications are dropped.  Sending custom classes will copy values but not the prototype. |
-| `Array` | Complex | ✅ | ✅ | Same limitations as the `Object` type |
-| `Error` | Complex | ✅ | ✅ | Errors that are thrown are also copied, this can result in the message and stack trace of the error changing slightly due to being thrown in a different context |
-| `Promise` | Complex | ✅ | ✅ | Promises are only proxied if they are the return value or exact parameter.  Promises nested in arrays or objects will be dropped. |
-| `Function` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending classes or constructors will not work. |
-| [Cloneable Types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm) | Simple | ✅ | ✅ | See the linked document on cloneable types |
-| `Symbol` | N/A | ❌ | ❌ | Symbols cannot be copied across contexts so they are dropped |
-
-
-If the type you care about is not in the above table, it is probably not supported.

docs/api/crash-reporter.md

@@ -119,10 +119,6 @@ Remove a extra parameter from the current set of parameters so that it will not
 
 See all of the current parameters being passed to the crash reporter.
 
-### `crashReporter.getCrashesDirectory()`
-
-Returns `String` - The directory where crashes are temporarily stored before being uploaded.
-
 ## Crash Report Payload
 
 The crash reporter will send the following data to the `submitURL` as

docs/api/debugger.md

@@ -50,7 +50,7 @@ Returns:
 
 * `event` Event
 * `method` String - Method name.
-* `params` any - Event parameters defined by the 'parameters'
+* `params` unknown - Event parameters defined by the 'parameters'
    attribute in the remote debugging protocol.
 
 Emitted whenever the debugging target issues an instrumentation event.

docs/api/desktop-capturer.md

@@ -91,11 +91,7 @@ The `desktopCapturer` module has the following methods:
 
 Returns `Promise<DesktopCapturerSource[]>` - Resolves with an array of [`DesktopCapturerSource`](structures/desktop-capturer-source.md) objects, each `DesktopCapturerSource` represents a screen or an individual window that can be captured.
 
-**Note** Capturing the screen contents requires user consent on macOS 10.15 Catalina or higher,
-which can detected by [`systemPreferences.getMediaAccessStatus`].
-
 [`navigator.mediaDevices.getUserMedia`]: https://developer.mozilla.org/en/docs/Web/API/MediaDevices/getUserMedia
-[`systemPreferences.getMediaAccessStatus`]: system-preferences.md#systempreferencesgetmediaaccessstatusmediatype-macos
 
 ## Caveats
 

docs/api/dialog.md

@@ -48,13 +48,10 @@ The `dialog` module has the following methods:
       their target path.
     * `treatPackageAsDirectory` _macOS_ - Treat packages, such as `.app` folders,
       as a directory instead of a file.
-    * `dontAddToRecent` _Windows_ - Do not add the item being opened to the recent documents list.
   * `message` String (optional) _macOS_ - Message to display above input
     boxes.
   * `securityScopedBookmarks` Boolean (optional) _macOS_ _mas_ - Create [security scoped bookmarks](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store.
 
-Returns `String[] | undefined`, the file paths chosen by the user; if the dialog is cancelled it returns `undefined`.
-
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
 
 The `filters` specifies an array of file types that can be displayed or
@@ -111,7 +108,6 @@ dialog.showOpenDialogSync(mainWindow, {
       their target path.
     * `treatPackageAsDirectory` _macOS_ - Treat packages, such as `.app` folders,
       as a directory instead of a file.
-    * `dontAddToRecent` _Windows_ - Do not add the item being opened to the recent documents list.
   * `message` String (optional) _macOS_ - Message to display above input
     boxes.
   * `securityScopedBookmarks` Boolean (optional) _macOS_ _mas_ - Create [security scoped bookmarks](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store.
@@ -120,7 +116,7 @@ Returns `Promise<Object>` - Resolve with an object containing the following:
 
 * `canceled` Boolean - whether or not the dialog was canceled.
 * `filePaths` String[] - An array of file paths chosen by the user. If the dialog is cancelled this will be an empty array.
-* `bookmarks` String[] (optional) _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated. (For return values, see [table here](#bookmarks-array).)
+* `bookmarks` String[] (optional) _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated.
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
 
@@ -173,13 +169,6 @@ dialog.showOpenDialog(mainWindow, {
     displayed in front of the filename text field.
   * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box,
     defaults to `true`.
-  * `properties` String[] (optional)
-    * `showHiddenFiles` - Show hidden files in dialog.
-    * `createDirectory` _macOS_ - Allow creating new directories from dialog.
-    * `treatPackageAsDirectory` _macOS_ - Treat packages, such as `.app` folders,
-      as a directory instead of a file.
-    * `showOverwriteConfirmation` _Linux_ - Sets whether the user will be presented a confirmation dialog if the user types a file name that already exists.
-    * `dontAddToRecent` _Windows_ - Do not add the item being saved to the recent documents list.
   * `securityScopedBookmarks` Boolean (optional) _macOS_ _mas_ - Create a [security scoped bookmark](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store. If this option is enabled and the file doesn't already exist a blank file will be created at the chosen path.
 
 Returns `String | undefined`, the path of the file chosen by the user; if the dialog is cancelled it returns `undefined`.
@@ -202,20 +191,14 @@ The `filters` specifies an array of file types that can be displayed, see
   * `message` String (optional) _macOS_ - Message to display above text fields.
   * `nameFieldLabel` String (optional) _macOS_ - Custom label for the text
     displayed in front of the filename text field.
-  * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box, defaults to `true`.
-  * `properties` String[] (optional)
-    * `showHiddenFiles` - Show hidden files in dialog.
-    * `createDirectory` _macOS_ - Allow creating new directories from dialog.
-    * `treatPackageAsDirectory` _macOS_ - Treat packages, such as `.app` folders,
-      as a directory instead of a file.
-    * `showOverwriteConfirmation` _Linux_ - Sets whether the user will be presented a confirmation dialog if the user types a file name that already exists.
-    * `dontAddToRecent` _Windows_ - Do not add the item being saved to the recent documents list.
+  * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box,
+    defaults to `true`.
   * `securityScopedBookmarks` Boolean (optional) _macOS_ _mas_ - Create a [security scoped bookmark](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store. If this option is enabled and the file doesn't already exist a blank file will be created at the chosen path.
 
 Returns `Promise<Object>` - Resolve with an object containing the following:
   * `canceled` Boolean - whether or not the dialog was canceled.
   * `filePath` String (optional) - If the dialog is canceled, this will be `undefined`.
-  * `bookmark` String (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present. (For return values, see [table here](#bookmarks-array).)
+  * `bookmark` String (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present.
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
 
@@ -244,7 +227,7 @@ expanding and collapsing the dialog.
     include a checkbox with the given label.
   * `checkboxChecked` Boolean (optional) - Initial checked state of the
     checkbox. `false` by default.
-  * `icon` ([NativeImage](native-image.md) | String) (optional)
+  * `icon` [NativeImage](native-image.md) (optional)
   * `cancelId` Integer (optional) - The index of the button to be used to cancel the dialog, via
     the `Esc` key. By default this is assigned to the first button with "cancel" or "no" as the
     label. If no such labeled buttons exist and this option is not set, `0` will be used as the
@@ -269,7 +252,6 @@ Shows a message box, it will block the process until the message box is closed.
 It returns the index of the clicked button.
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
-If `browserWindow` is not shown dialog will not be attached to it. In such case It will be displayed as independed window.
 
 ### `dialog.showMessageBox([browserWindow, ]options)`
 
@@ -351,17 +333,6 @@ On Windows the options are more limited, due to the Win32 APIs used:
 * The `browserWindow` argument is ignored since it is not possible to make
    this confirmation dialog modal.
 
-## Bookmarks array
-
-`showOpenDialog`, `showOpenDialogSync`, `showSaveDialog`, and `showSaveDialogSync` will return a `bookmarks` array.
-
-| Build Type | securityScopedBookmarks boolean | Return Type | Return Value                   |
-|------------|---------------------------------|:-----------:|--------------------------------|
-| macOS mas  | True                            |   Success   | `['LONGBOOKMARKSTRING']`       |
-| macOS mas  | True                            |    Error    | `['']` (array of empty string) |
-| macOS mas  | False                           |      NA     | `[]` (empty array)             |
-| non mas    | any                             |      NA     | `[]` (empty array)             |
-
 ## Sheets
 
 On macOS, dialogs are presented as sheets attached to a window if you provide

docs/api/dock.md

@@ -18,8 +18,6 @@ app.dock.bounce()
 * `type` String (optional) - Can be `critical` or `informational`. The default is
  `informational`
 
-Returns `Integer` - an ID representing the request.
-
 When `critical` is passed, the dock icon will bounce until either the
 application becomes active or the request is canceled.
 
@@ -27,7 +25,7 @@ When `informational` is passed, the dock icon will bounce for one second.
 However, the request remains active until either the application becomes active
 or the request is canceled.
 
-**Nota Bene:** This method can only be used while the app is not focused; when the app is focused it will return -1.
+Returns `Integer` an ID representing the request.
 
 #### `dock.cancelBounce(id)` _macOS_
 

docs/api/download-item.md

@@ -82,12 +82,16 @@ The API is only available in session's `will-download` callback function.
 If user doesn't set the save path via the API, Electron will use the original
 routine to determine the save path; this usually prompts a save dialog.
 
+**[Deprecated](modernization/property-updates.md): use the `savePath` property instead.**
+
 #### `downloadItem.getSavePath()`
 
 Returns `String` - The save path of the download item. This will be either the path
 set via `downloadItem.setSavePath(path)` or the path selected from the shown
 save dialog.
 
+**[Deprecated](modernization/property-updates.md): use the `savePath` property instead.**
+
 #### `downloadItem.setSaveDialogOptions(options)`
 
 * `options` SaveDialogOptions - Set the save file dialog options. This object has the same

docs/api/environment-variables.md

@@ -44,32 +44,20 @@ Unsupported options are:
 --use-openssl-ca
 ```
 
-`NODE_OPTIONS` are explicitly disallowed in packaged apps, except for the following:
-
-```sh
---max-http-header-size
---http-parser
-```
+`NODE_OPTIONS` are explicitly disallowed in packaged apps.
 
 ### `GOOGLE_API_KEY`
 
-Geolocation support in Electron requires the use of Google Cloud Platform's
-geolocation webservice. To enable this feature, acquire a
-[Google API key](https://developers.google.com/maps/documentation/geolocation/get-api-key)
-and place the following code in your main process file, before opening any
-browser windows that will make geolocation requests:
+You can provide an API key for making requests to Google's geocoding webservice. To do this, place the following code in your main process
+file, before opening any browser windows that will make geocoding requests:
 
 ```javascript
 process.env.GOOGLE_API_KEY = 'YOUR_KEY_HERE'
 ```
 
-By default, a newly generated Google API key may not be allowed to make geolocation requests.
-To enable the geolocation webservice for your project, enable it through the
-[API library](https://console.cloud.google.com/apis/library).
-
-N.B. You will need to add a
-[Billing Account](https://cloud.google.com/billing/docs/how-to/payment-methods#add_a_payment_method)
-to the project associated to the API key for the geolocation webservice to work.
+For instructions on how to acquire a Google API key, visit [this page](https://developers.google.com/maps/documentation/javascript/get-api-key).
+By default, a newly generated Google API key may not be allowed to make
+geocoding requests. To enable geocoding requests, visit [this page](https://developers.google.com/maps/documentation/geocoding/get-api-key).
 
 ### `ELECTRON_NO_ASAR`
 
@@ -133,5 +121,5 @@ the `electron` command to use the specified build of Electron instead of
 the one downloaded by `npm install`. Usage:
 
 ```sh
-export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Testing
+export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Debug
 ```

docs/api/frameless-window.md

@@ -52,7 +52,7 @@ win.show()
 Uses custom drawn close, and miniaturize buttons that display
 when hovering in the top left of the window. The fullscreen button
 is not available due to restrictions of frameless windows as they
-interface with Apple's macOS window masks. These custom buttons prevent
+interface with Apple's MacOS window masks. These custom buttons prevent
 issues with mouse events that occur with the standard window toolbar buttons.
 This option is only applicable for frameless windows.
 
@@ -158,7 +158,7 @@ buttons in titlebar non-draggable.
 
 ## Text selection
 
-In a frameless window the dragging behavior may conflict with selecting text.
+In a frameless window the dragging behaviour may conflict with selecting text.
 For example, when you drag the titlebar you may accidentally select the text on
 the titlebar. To prevent this, you need to disable text selection within a
 draggable area like this:

docs/api/global-shortcut.md

@@ -15,7 +15,7 @@ event of the app module is emitted.
 ```javascript
 const { app, globalShortcut } = require('electron')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   // Register a 'CommandOrControl+X' shortcut listener.
   const ret = globalShortcut.register('CommandOrControl+X', () => {
     console.log('CommandOrControl+X is pressed')

docs/api/in-app-purchase.md

@@ -40,17 +40,11 @@ Retrieves the product descriptions.
 
 ### `inAppPurchase.canMakePayments()`
 
-Returns `Boolean` - whether a user can make a payment.
-
-### `inAppPurchase.restoreCompletedTransactions()`
-
-Restores finished transactions. This method can be called either to install purchases on additional devices, or to restore purchases for an application that the user deleted and reinstalled.
-
-[The payment queue](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc) delivers a new transaction for each previously completed transaction that can be restored. Each transaction includes a copy of the original transaction.
+Returns `Boolean`, whether a user can make a payment.
 
 ### `inAppPurchase.getReceiptURL()`
 
-Returns `String` - the path to the receipt.
+Returns `String`, the path to the receipt.
 
 ### `inAppPurchase.finishAllTransactions()`
 

docs/api/ipc-main.md

@@ -77,7 +77,6 @@ only the next time a message is sent to `channel`, after which it is removed.
 
 * `channel` String
 * `listener` Function
-  * `...args` any[]
 
 Removes the specified `listener` from the listener array for the specified
 `channel`.
@@ -148,4 +147,4 @@ found in the [`ipc-main-invoke-event`](structures/ipc-main-invoke-event.md)
 structure docs.
 
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-[web-contents-send]: web-contents.md#contentssendchannel-arg1-arg2-
+[web-contents-send]: web-contents.md#contentssendchannel-args

docs/api/ipc-renderer.md

@@ -55,15 +55,9 @@ Removes all listeners, or those of the specified `channel`.
 * `channel` String
 * `...args` any[]
 
-Send an asynchronous message to the main process via `channel`, along with
-arguments. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
-included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
-throw an exception.
-
-> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+Send a message to the main process asynchronously via `channel`, you can also
+send arbitrary arguments. Arguments will be serialized as JSON internally and
+hence no functions or prototype chain will be included.
 
 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.
@@ -75,15 +69,9 @@ The main process handles it by listening for `channel` with the
 
 Returns `Promise<any>` - Resolves with the response from the main process.
 
-Send a message to the main process via `channel` and expect a result
-asynchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
-included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
-throw an exception.
-
-> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+Send a message to the main process asynchronously via `channel` and expect an
+asynchronous result. Arguments will be serialized as JSON internally and
+hence no functions or prototype chain will be included.
 
 The main process should listen for `channel` with
 [`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).
@@ -109,23 +97,15 @@ ipcMain.handle('some-name', async (event, someArgument) => {
 
 Returns `any` - The value sent back by the [`ipcMain`](ipc-main.md) handler.
 
-Send a message to the main process via `channel` and expect a result
-synchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
-included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
-throw an exception.
-
-> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+Send a message to the main process synchronously via `channel`, you can also
+send arbitrary arguments. Arguments will be serialized in JSON internally and
+hence no functions or prototype chain will be included.
 
 The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
 and replies by setting `event.returnValue`.
 
-> :warning: **WARNING**: Sending a synchronous message will block the whole
-> renderer process until the reply is received, so use this method only as a
-> last resort. It's much better to use the asynchronous version,
-> [`invoke()`](ipc-renderer.md#ipcrendererinvokechannel-args).
+**Note:** Sending a synchronous message will block the whole renderer process,
+unless you know what you are doing you should never use it.
 
 ### `ipcRenderer.sendTo(webContentsId, channel, ...args)`
 
@@ -149,5 +129,3 @@ The documentation for the `event` object passed to the `callback` can be found
 in the [`ipc-renderer-event`](structures/ipc-renderer-event.md) structure docs.
 
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-[SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-[`postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage

docs/api/menu-item.md

@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
     * `menuItem` MenuItem
     * `browserWindow` [BrowserWindow](browser-window.md)
     * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `close`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
     `click` property will be ignored. See [roles](#roles).
   * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
     `radio`.
@@ -117,7 +117,7 @@ When specifying a `role` on macOS, `label` and `accelerator` are the only
 options that will affect the menu item. All other options will be ignored.
 Lowercase `role`, e.g. `toggledevtools`, is still supported.
 
-**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on macOS.
+**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on MacOS.
 
 ### Instance Properties
 
@@ -130,7 +130,8 @@ dynamically changed.
 
 #### `menuItem.label`
 
-A `String` indicating the item's visible label.
+A `String` indicating the item's visible label, this property can be
+dynamically changed.
 
 #### `menuItem.click`
 
@@ -164,7 +165,7 @@ item's icon, if set.
 
 #### `menuItem.sublabel`
 
-A `String` indicating the item's sublabel.
+A `String` indicating the item's sublabel, this property can be dynamically changed.
 
 #### `menuItem.toolTip` _macOS_
 
@@ -196,9 +197,7 @@ You can add a `click` function for additional behavior.
 #### `menuItem.registerAccelerator`
 
 A `Boolean` indicating if the accelerator should be registered with the
-system or just displayed.
-
-This property can be dynamically changed.
+system or just displayed, this property can be dynamically changed.
 
 #### `menuItem.commandId`
 

docs/api/modernization/promisification.md

@@ -1,6 +1,17 @@
 ## Promisification
 
-The Electron team recently underwent an initiative to convert callback-based APIs to Promise-based ones. See converted functions below:
+The Electron team is currently undergoing an initiative to convert callback-based functions in Electron to return Promises. During this transition period, both the callback and Promise-based versions of these functions will work correctly, and will both be documented.
+
+To enable deprecation warnings for these updated functions, use the `process.enablePromiseAPI` runtime flag.
+
+When a majority of affected functions are migrated, this flag will be enabled by default and all developers will be able to see these deprecation warnings. At that time, the callback-based versions will also be removed from documentation. This document will be continuously updated as more functions are converted.
+
+### Candidate Functions
+
+- [app.importCertificate(options, callback)](https://github.com/electron/electron/blob/master/docs/api/app.md#importCertificate)
+- [contents.print([options], [callback])](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#print)
+
+### Converted Functions
 
 - [app.getFileIcon(path[, options], callback)](https://github.com/electron/electron/blob/master/docs/api/app.md#getFileIcon)
 - [contents.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#capturePage)

docs/api/modernization/property-updates.md

@@ -5,7 +5,14 @@ The Electron team is currently undergoing an initiative to convert separate gett
 ## Candidates
 
 * `BrowserWindow`
+  * `fullscreen`
+  * `simpleFullscreen`
+  * `alwaysOnTop`
+  * `title`
+  * `documentEdited`
+  * `hasShadow`
   * `menubarVisible`
+  * `visibleOnAllWorkspaces`
 * `crashReporter` module
   * `uploadToServer`
 * `webFrame` modules
@@ -38,3 +45,9 @@ The Electron team is currently undergoing an initiative to convert separate gett
   * `isMacTemplateImage`
 * `SystemPreferences` module
   * `appLevelAppearance`
+* `webContents` module
+  * `audioMuted`
+  * `frameRate`
+  * `userAgent`
+  * `zoomFactor`
+  * `zoomLevel`

docs/api/native-image.md

@@ -14,11 +14,11 @@ image file path as a `String`:
 const { BrowserWindow, Tray } = require('electron')
 
 const appIcon = new Tray('/Users/somebody/images/icon.png')
-const win = new BrowserWindow({ icon: '/Users/somebody/images/window.png' })
+let win = new BrowserWindow({ icon: '/Users/somebody/images/window.png' })
 console.log(appIcon, win)
 ```
 
-Or read the image from the clipboard, which returns a `NativeImage`:
+Or read the image from the clipboard which returns a `NativeImage`:
 
 ```javascript
 const { clipboard, Tray } = require('electron')
@@ -33,19 +33,19 @@ Currently `PNG` and `JPEG` image formats are supported. `PNG` is recommended
 because of its support for transparency and lossless compression.
 
 On Windows, you can also load `ICO` icons from file paths. For best visual
-quality, it is recommended to include at least the following sizes in the:
+quality it is recommended to include at least the following sizes in the:
 
 * Small icon
-  * 16x16 (100% DPI scale)
-  * 20x20 (125% DPI scale)
-  * 24x24 (150% DPI scale)
-  * 32x32 (200% DPI scale)
+ * 16x16 (100% DPI scale)
+ * 20x20 (125% DPI scale)
+ * 24x24 (150% DPI scale)
+ * 32x32 (200% DPI scale)
 * Large icon
-  * 32x32 (100% DPI scale)
-  * 40x40 (125% DPI scale)
-  * 48x48 (150% DPI scale)
-  * 64x64 (200% DPI scale)
-  * 256x256
+ * 32x32 (100% DPI scale)
+ * 40x40 (125% DPI scale)
+ * 48x48 (150% DPI scale)
+ * 64x64 (200% DPI scale)
+* 256x256
 
 Check the *Size requirements* section in [this article][icons].
 
@@ -56,7 +56,7 @@ Check the *Size requirements* section in [this article][icons].
 On platforms that have high-DPI support such as Apple Retina displays, you can
 append `@2x` after image's base filename to mark it as a high resolution image.
 
-For example, if `icon.png` is a normal image that has standard resolution, then
+For example if `icon.png` is a normal image that has standard resolution, then
 `icon@2x.png` will be treated as a high resolution image that has double DPI
 density.
 
@@ -73,11 +73,11 @@ images/
 
 ```javascript
 const { Tray } = require('electron')
-const appIcon = new Tray('/Users/somebody/images/icon.png')
+let appIcon = new Tray('/Users/somebody/images/icon.png')
 console.log(appIcon)
 ```
 
-The following suffixes for DPI are also supported:
+Following suffixes for DPI are also supported:
 
 * `@1x`
 * `@1.25x`
@@ -97,7 +97,7 @@ Template images consist of black and an alpha channel.
 Template images are not intended to be used as standalone images and are usually
 mixed with other content to create the desired final appearance.
 
-The most common case is to use template images for a menu bar icon, so it can
+The most common case is to use template images for a menu bar icon so it can
 adapt to both light and dark menu bars.
 
 **Note:** Template image is only supported on macOS.
@@ -132,7 +132,7 @@ a valid image.
 ```javascript
 const nativeImage = require('electron').nativeImage
 
-const image = nativeImage.createFromPath('/Users/somebody/images/icon.png')
+let image = nativeImage.createFromPath('/Users/somebody/images/icon.png')
 console.log(image)
 ```
 
@@ -180,8 +180,7 @@ Creates a new `NativeImage` instance from the NSImage that maps to the
 given image name. See [`System Icons`](https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/system-icons/)
 for a list of possible values.
 
-The `hslShift` is applied to the image with the following rules:
-
+The `hslShift` is applied to the image with the following rules
 * `hsl_shift[0]` (hue): The absolute hue value for the image - 0 and 1 map
      to 0 and 360 on the hue color wheel (red).
 * `hsl_shift[1]` (saturation): A saturation shift for the image, with the
@@ -249,9 +248,9 @@ Returns `String` - The data URL of the image.
 
 Returns `Buffer` - A [Buffer][buffer] that contains the image's raw bitmap pixel data.
 
-The difference between `getBitmap()` and `toBitmap()` is that `getBitmap()` does not
+The difference between `getBitmap()` and `toBitmap()` is, `getBitmap()` does not
 copy the bitmap data, so you have to use the returned Buffer immediately in
-current event loop tick; otherwise the data might be changed or destroyed.
+current event loop tick, otherwise the data might be changed or destroyed.
 
 #### `image.getNativeHandle()` _macOS_
 
@@ -276,10 +275,14 @@ Returns [`Size`](structures/size.md)
 
 Marks the image as a template image.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `image.isTemplateImage()`
 
 Returns `Boolean` - Whether the image is a template image.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `image.crop(rect)`
 
 * `rect` [Rectangle](structures/rectangle.md) - The area of the image to crop.
@@ -292,7 +295,7 @@ Returns `NativeImage` - The cropped image.
   * `width` Integer (optional) - Defaults to the image's width.
   * `height` Integer (optional) - Defaults to the image's height.
   * `quality` String (optional) - The desired quality of the resize image.
-    Possible values are `good`, `better`, or `best`. The default is `best`.
+    Possible values are `good`, `better` or `best`. The default is `best`.
     These values express a desired quality/speed tradeoff. They are translated
     into an algorithm-specific method that depends on the capabilities
     (CPU, GPU) of the underlying platform. It is possible for all three methods
@@ -325,9 +328,9 @@ can be called on empty images.
 
 [buffer]: https://nodejs.org/api/buffer.html#buffer_class_buffer
 
-### Instance Properties
+## Properties
 
-#### `nativeImage.isMacTemplateImage` _macOS_
+### `nativeImage.isMacTemplateImage` _macOS_
 
 A `Boolean` property that determines whether the image is considered a [template image](https://developer.apple.com/documentation/appkit/nsimage/1520017-template).
 

docs/api/native-theme.md

@@ -1,66 +0,0 @@
-# nativeTheme
-
-> Read and respond to changes in Chromium's native color theme.
-
-Process: [Main](../glossary.md#main-process)
-
-## Events
-
-The `nativeTheme` module emits the following events:
-
-### Event: 'updated'
-
-Emitted when something in the underlying NativeTheme has changed. This normally
-means that either the value of `shouldUseDarkColors`,
-`shouldUseHighContrastColors` or `shouldUseInvertedColorScheme` has changed.
-You will have to check them to determine which one has changed.
-
-## Properties
-
-The `nativeTheme` module has the following properties:
-
-### `nativeTheme.shouldUseDarkColors` _Readonly_
-
-A `Boolean` for if the OS / Chromium currently has a dark mode enabled or is
-being instructed to show a dark-style UI.  If you want to modify this value you
-should use `themeSource` below.
-
-### `nativeTheme.themeSource`
-
-A `String` property that can be `system`, `light` or `dark`.  It is used to override and supersede
-the value that Chromium has chosen to use internally.
-
-Setting this property to `system` will remove the override and
-everything will be reset to the OS default.  By default `themeSource` is `system`.
-
-Settings this property to `dark` will have the following effects:
-* `nativeTheme.shouldUseDarkColors` will be `true` when accessed
-* Any UI Electron renders on Linux and Windows including context menus, devtools, etc. will use the dark UI.
-* Any UI the OS renders on macOS including menus, window frames, etc. will use the dark UI.
-* The [`prefers-color-scheme`](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) CSS query will match `dark` mode.
-* The `updated` event will be emitted
-
-Settings this property to `light` will have the following effects:
-* `nativeTheme.shouldUseDarkColors` will be `false` when accessed
-* Any UI Electron renders on Linux and Windows including context menus, devtools, etc. will use the light UI.
-* Any UI the OS renders on macOS including menus, window frames, etc. will use the light UI.
-* The [`prefers-color-scheme`](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) CSS query will match `light` mode.
-* The `updated` event will be emitted
-
-The usage of this property should align with a classic "dark mode" state machine in your application
-where the user has three options.
-* `Follow OS` --> `themeSource = 'system'`
-* `Dark Mode` --> `themeSource = 'dark'`
-* `Light Mode` --> `themeSource = 'light'`
-
-Your application should then always use `shouldUseDarkColors` to determine what CSS to apply.
-
-### `nativeTheme.shouldUseHighContrastColors` _macOS_ _Windows_ _Readonly_
-
-A `Boolean` for if the OS / Chromium currently has high-contrast mode enabled
-or is being instructed to show a high-constrast UI.
-
-### `nativeTheme.shouldUseInvertedColorScheme` _macOS_ _Windows_ _Readonly_
-
-A `Boolean` for if the OS / Chromium currently has an inverted color scheme
-or is being instructed to use an inverted color scheme.

docs/api/net-log.md

@@ -7,7 +7,7 @@ Process: [Main](../glossary.md#main-process)
 ```javascript
 const { netLog } = require('electron')
 
-app.whenReady().then(async () => {
+app.on('ready', async () => {
   await netLog.startLogging('/path/to/net-log')
   // After some network events
   const path = await netLog.stopLogging()
@@ -15,7 +15,7 @@ app.whenReady().then(async () => {
 })
 ```
 
-See [`--log-net-log`](command-line-switches.md#--log-net-logpath) to log network events throughout the app's lifecycle.
+See [`--log-net-log`](chrome-command-line-switches.md#--log-net-logpath) to log network events throughout the app's lifecycle.
 
 **Note:** All methods unless specified can only be used after the `ready` event
 of the `app` module gets emitted.

docs/api/net.md

@@ -28,7 +28,7 @@ Example usage:
 
 ```javascript
 const { app } = require('electron')
-app.whenReady().then(() => {
+app.on('ready', () => {
   const { net } = require('electron')
   const request = net.request('https://github.com')
   request.on('response', (response) => {

docs/api/notification.md

@@ -35,10 +35,8 @@ Returns `Boolean` - Whether or not desktop notifications are supported on the cu
   * `silent` Boolean (optional) - Whether or not to emit an OS notification noise when showing the notification.
   * `icon` (String | [NativeImage](native-image.md)) (optional) - An icon to use in the notification.
   * `hasReply` Boolean (optional) _macOS_ - Whether or not to add an inline reply option to the notification.
-  * `timeoutType` String (optional) _Linux_ _Windows_ - The timeout duration of the notification. Can be 'default' or 'never'.
   * `replyPlaceholder` String (optional) _macOS_ - The placeholder to write in the inline reply input field.
   * `sound` String (optional) _macOS_ - The name of the sound file to play when the notification is shown.
-  * `urgency` String (optional) _Linux_ - The urgency level of the notification. Can be 'normal', 'critical', or 'low'.
   * `actions` [NotificationAction[]](structures/notification-action.md) (optional) _macOS_ - Actions to add to the notification. Please read the available actions and limitations in the `NotificationAction` documentation.
   * `closeButtonText` String (optional) _macOS_ - A custom title for the close button of an alert. An empty string will cause the default localized text to be used.
 
@@ -146,18 +144,6 @@ A `Boolean` property representing whether the notification is silent.
 
 A `Boolean` property representing whether the notification has a reply action.
 
-#### `notification.urgency` _Linux_
-
-A `String` property representing the urgency level of the notification. Can be 'normal', 'critical', or 'low'.
-
-Default is 'low' - see [NotifyUrgency](https://developer.gnome.org/notification-spec/#urgency-levels) for more information.
-
-#### `notification.timeoutType` _Linux_ _Windows_
-
-A `String` property representing the type of timeout duration for the notification. Can be 'default' or 'never'.
-
-If `timeoutType` is set to 'never', the notification never expires. It stays open until closed by the calling API or the user.
-
 #### `notification.actions`
 
 A [`NotificationAction[]`](structures/notification-action.md) property representing the actions of the notification.

docs/api/power-monitor.md

@@ -13,7 +13,7 @@ For example:
 ```javascript
 const { app, powerMonitor } = require('electron')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   powerMonitor.on('suspend', () => {
     console.log('The system is going to sleep')
   })

docs/api/process.md

@@ -82,6 +82,12 @@ A `Boolean` that controls whether or not deprecation warnings are printed to `st
 Setting this to `true` will silence deprecation warnings. This property is used
 instead of the `--no-deprecation` command line flag.
 
+### `process.enablePromiseAPIs`
+
+A `Boolean` that controls whether or not deprecation warnings are printed to `stderr` when
+formerly callback-based APIs converted to Promises are invoked using callbacks. Setting this to `true`
+will enable deprecation warnings.
+
 ### `process.resourcesPath` _Readonly_
 
 A `String` representing the path to the resources directory.
@@ -211,15 +217,11 @@ that all statistics are reported in Kilobytes.
 
 Returns `String` - The version of the host operating system.
 
-Example:
+Examples:
 
-```js
-const version = process.getSystemVersion()
-console.log(version)
-// On macOS -> '10.13.6'
-// On Windows -> '10.0.17763'
-// On Linux -> '4.15.0-45-generic'
-```
+* `macOS` -> `10.13.6`
+* `Windows` -> `10.0.17763`
+* `Linux` -> `4.15.0-45-generic`
 
 **Note:** It returns the actual operating system version instead of kernel version on macOS unlike `os.release()`.
 

docs/api/protocol-ns.md

@@ -20,7 +20,7 @@ An example of implementing a protocol that has the same effect as the
 const { app, protocol } = require('electron')
 const path = require('path')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   protocol.registerFileProtocol('atom', (request, callback) => {
     const url = request.url.substr(7)
     callback({ path: path.normalize(`${__dirname}/${url}`) })
@@ -47,7 +47,7 @@ to register it to that session explicitly.
 const { session, app, protocol } = require('electron')
 const path = require('path')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   const partition = 'persist:example'
   const ses = session.fromPartition(partition)
 

docs/api/protocol.md

@@ -11,7 +11,7 @@ An example of implementing a protocol that has the same effect as the
 const { app, protocol } = require('electron')
 const path = require('path')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   protocol.registerFileProtocol('atom', (request, callback) => {
     const url = request.url.substr(7)
     callback({ path: path.normalize(`${__dirname}/${url}`) })
@@ -34,7 +34,7 @@ To have your custom protocol work in combination with a custom session, you need
 const { session, app, protocol } = require('electron')
 const path = require('path')
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   const partition = 'persist:example'
   const ses = session.fromPartition(partition)
 
@@ -389,7 +389,9 @@ which sends a `Buffer` as a response.
       * `url` String
       * `method` String (optional)
       * `session` Session | null (optional)
-      * `uploadData` [ProtocolResponseUploadData](structures/protocol-response-upload-data.md) (optional)
+      * `uploadData` Object (optional)
+        * `contentType` String - MIME type of the content.
+        * `data` String - Content to be sent.
 * `completion` Function (optional)
   * `error` Error
 

docs/api/remote.md

@@ -163,7 +163,7 @@ project/
 ```js
 // main process: main/index.js
 const { app } = require('electron')
-app.whenReady().then(() => { /* ... */ })
+app.on('ready', () => { /* ... */ })
 ```
 
 ```js

docs/api/sandbox-option.md

@@ -39,7 +39,7 @@ To create a sandboxed window, pass `sandbox: true` to `webPreferences`:
 
 ```js
 let win
-app.whenReady().then(() => {
+app.on('ready', () => {
   win = new BrowserWindow({
     webPreferences: {
       sandbox: true
@@ -51,7 +51,7 @@ app.whenReady().then(() => {
 
 In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
 only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
-within this new window `window.open` follows the native behavior (by default Electron creates a [`BrowserWindow`](browser-window.md)
+within this new window `window.open` follows the native behaviour (by default Electron creates a [`BrowserWindow`](browser-window.md)
 and returns a proxy to this via `window.open`).
 
 [`app.enableSandbox`](app.md#appenablesandbox-experimental) can be used to force `sandbox: true` for all `BrowserWindow` instances.
@@ -59,7 +59,7 @@ and returns a proxy to this via `window.open`).
 ```js
 let win
 app.enableSandbox()
-app.whenReady().then(() => {
+app.on('ready', () => {
   // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
   win = new BrowserWindow()
   win.loadURL('http://google.com')
@@ -73,7 +73,7 @@ Here's an example:
 
 ```js
 let win
-app.whenReady().then(() => {
+app.on('ready', () => {
   win = new BrowserWindow({
     webPreferences: {
       sandbox: true,

docs/api/screen.md

@@ -14,11 +14,11 @@ property, so writing `let { screen } = require('electron')` will not work.
 
 An example of creating a window that fills the whole screen:
 
-```javascript fiddle='docs/fiddles/screen/fit-screen'
+```javascript
 const { app, BrowserWindow, screen } = require('electron')
 
 let win
-app.whenReady().then(() => {
+app.on('ready', () => {
   const { width, height } = screen.getPrimaryDisplay().workAreaSize
   win = new BrowserWindow({ width, height })
   win.loadURL('https://github.com')
@@ -32,7 +32,7 @@ const { app, BrowserWindow, screen } = require('electron')
 
 let win
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   let displays = screen.getAllDisplays()
   let externalDisplay = displays.find((display) => {
     return display.bounds.x !== 0 || display.bounds.y !== 0

docs/api/service-workers.md

@@ -1,62 +0,0 @@
-## Class: ServiceWorkers
-
-> Query and receive events from a sessions active service workers.
-
-Process: [Main](../glossary.md#main-process)
-
-Instances of the `ServiceWorkers` class are accessed by using `serviceWorkers` property of
-a `Session`.
-
-For example:
-
-```javascript
-const { session } = require('electron')
-
-// Get all service workers.
-console.log(session.defaultSession.serviceWorkers.getAllRunning())
-
-// Handle logs and get service worker info
-session.defaultSession.serviceWorkers.on('console-message', (event, messageDetails) => {
-  console.log(
-    'Got service worker message',
-    messageDetails,
-    'from',
-    session.defaultSession.serviceWorkers.getFromVersionID(messageDetails.versionId)
-  )
-})
-```
-
-### Instance Events
-
-The following events are available on instances of `ServiceWorkers`:
-
-#### Event: 'console-message'
-
-Returns:
-
-* `event` Event
-* `messageDetails` Object - Information about the console message
-  * `message` String - The actual console message
-  * `versionId` Number - The version ID of the service worker that sent the log message
-  * `source` String - The type of source for this message.  Can be `javascript`, `xml`, `network`, `console-api`, `storage`, `app-cache`, `rendering`, `security`, `deprecation`, `worker`, `violation`, `intervention`, `recommendation` or `other`.
-  * `level` Number - The log level, from 0 to 3.  In order it matches `verbose`, `info`, `warning` and `error`.
-  * `sourceUrl` String - The URL the message came from
-  * `lineNumber` Number - The line number of the source that triggered this console message
-
-Emitted when a service worker logs something to the console.
-
-### Instance Methods
-
-The following methods are available on instances of `ServiceWorkers`:
-
-#### `serviceWorkers.getAllRunning()`
-
-Returns `Record<Number, ServiceWorkerInfo>` - A [ServiceWorkerInfo](structures/service-worker-info.md) object where the keys are the service worker version ID and the values are the information about that service worker.
-
-#### `serviceWorkers.getFromVersionID(versionId)`
-
-* `versionId` Number
-
-Returns [`ServiceWorkerInfo`](structures/service-worker-info.md) - Information about this service worker
-
-If the service worker does not exist or is not running this method will throw an exception.

docs/api/session.md

@@ -91,59 +91,6 @@ session.defaultSession.on('will-download', (event, item, webContents) => {
 })
 ```
 
-#### Event: 'preconnect'
-
-Returns:
-
-* `event` Event
-* `preconnectUrl` String - The URL being requested for preconnection by the
-  renderer.
-* `allowCredentials` Boolean - True if the renderer is requesting that the
-  connection include credentials (see the
-  [spec](https://w3c.github.io/resource-hints/#preconnect) for more details.)
-
-Emitted when a render process requests preconnection to a URL, generally due to
-a [resource hint](https://w3c.github.io/resource-hints/).
-
-#### Event: 'spellcheck-dictionary-initialized'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file has been successfully initialized. This
-occurs after the file has been downloaded.
-
-#### Event: 'spellcheck-dictionary-download-begin'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file starts downloading
-
-#### Event: 'spellcheck-dictionary-download-success'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file has been successfully downloaded
-
-#### Event: 'spellcheck-dictionary-download-failure'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file download fails.  For details
-on the failure you should collect a netlog and inspect the download
-request.
-
 ### Instance Methods
 
 The following methods are available on instances of `Session`:
@@ -165,10 +112,9 @@ Clears the session’s HTTP cache.
     `scheme://host:port`.
   * `storages` String[] (optional) - The types of storages to clear, can contain:
     `appcache`, `cookies`, `filesystem`, `indexdb`, `localstorage`,
-    `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
-    specified, clear all storage types.
+    `shadercache`, `websql`, `serviceworkers`, `cachestorage`.
   * `quotas` String[] (optional) - The types of quotas to clear, can contain:
-    `temporary`, `persistent`, `syncable`. If not specified, clear all quotas.
+    `temporary`, `persistent`, `syncable`.
 
 Returns `Promise<void>` - resolves when the storage data has been cleared.
 
@@ -179,9 +125,9 @@ Writes any unwritten DOMStorage data to disk.
 #### `ses.setProxy(config)`
 
 * `config` Object
-  * `pacScript` String (optional) - The URL associated with the PAC file.
-  * `proxyRules` String (optional) - Rules indicating which proxies to use.
-  * `proxyBypassRules` String (optional) - Rules indicating which URLs should
+  * `pacScript` String - The URL associated with the PAC file.
+  * `proxyRules` String - Rules indicating which proxies to use.
+  * `proxyBypassRules` String - Rules indicating which URLs should
     bypass the proxy settings.
 
 Returns `Promise<void>` - Resolves when the proxy setting process is complete.
@@ -292,14 +238,6 @@ window.webContents.session.enableNetworkEmulation({
 window.webContents.session.enableNetworkEmulation({ offline: true })
 ```
 
-#### `ses.preconnect(options)`
-
-* `options` Object
-  * `url` String - URL for preconnect. Only the origin is relevant for opening the socket.
-  * `numSockets` Number (optional) - number of sockets to preconnect. Must be between 1 and 6. Defaults to 1.
-
-Preconnects the given number of sockets to an origin.
-
 #### `ses.disableNetworkEmulation()`
 
 Disables any network emulation already active for the `session`. Resets to
@@ -307,11 +245,10 @@ the original network configuration.
 
 #### `ses.setCertificateVerifyProc(proc)`
 
-* `proc` Function | null
+* `proc` Function
   * `request` Object
     * `hostname` String
     * `certificate` [Certificate](structures/certificate.md)
-    * `validatedCertificate` [Certificate](structures/certificate.md)
     * `verificationResult` String - Verification result from chromium.
     * `errorCode` Integer - Error code.
   * `callback` Function
@@ -449,17 +386,6 @@ Returns `String` - The user agent for this session.
 
 Returns `Promise<Buffer>` - resolves with blob data.
 
-#### `ses.downloadURL(url)`
-
-* `url` String
-
-Initiates a download of the resource at `url`.
-The API will generate a [DownloadItem](download-item.md) that can be accessed
-with the [will-download](#event-will-download) event.
-
-**Note:** This does not perform any security checks that relate to a page's origin,
-unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl).
-
 #### `ses.createInterruptedDownload(options)`
 
 * `options` Object
@@ -468,8 +394,8 @@ unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl).
   * `mimeType` String (optional)
   * `offset` Integer - Start range for the download.
   * `length` Integer - Total length of the download.
-  * `lastModified` String (optional) - Last-Modified header value.
-  * `eTag` String (optional) - ETag header value.
+  * `lastModified` String - Last-Modified header value.
+  * `eTag` String - ETag header value.
   * `startTime` Double (optional) - Time when download was started in
     number of seconds since UNIX epoch.
 
@@ -497,139 +423,14 @@ this session just before normal `preload` scripts run.
 Returns `String[]` an array of paths to preload scripts that have been
 registered.
 
-#### `ses.setSpellCheckerLanguages(languages)`
-
-* `languages` String[] - An array of language codes to enable the spellchecker for.
-
-The built in spellchecker does not automatically detect what language a user is typing in.  In order for the
-spell checker to correctly check their words you must call this API with an array of language codes.  You can
-get the list of supported language codes with the `ses.availableSpellCheckerLanguages` property.
-
-**Note:** On macOS the OS spellchecker is used and will detect your language automatically.  This API is a no-op on macOS.
-
-#### `ses.getSpellCheckerLanguages()`
-
-Returns `String[]` - An array of language codes the spellchecker is enabled for.  If this list is empty the spellchecker
-will fallback to using `en-US`.  By default on launch if this setting is an empty list Electron will try to populate this
-setting with the current OS locale.  This setting is persisted across restarts.
-
-**Note:** On macOS the OS spellchecker is used and has it's own list of languages.  This API is a no-op on macOS.
-
-#### `ses.setSpellCheckerDictionaryDownloadURL(url)`
-
-* `url` String - A base URL for Electron to download hunspell dictionaries from.
-
-By default Electron will download hunspell dictionaries from the Chromium CDN.  If you want to override this
-behavior you can use this API to point the dictionary downloader at your own hosted version of the hunspell
-dictionaries.  We publish a `hunspell_dictionaries.zip` file with each release which contains the files you need
-to host here, the file server must be **case insensitive** you must upload each file twice, once with the case it
-has in the ZIP file and once with the filename as all lower case.
-
-If the files present in `hunspell_dictionaries.zip` are available at `https://example.com/dictionaries/language-code.bdic`
-then you should call this api with `ses.setSpellCheckerDictionaryDownloadURL('https://example.com/dictionaries/')`.  Please
-note the trailing slash.  The URL to the dictionaries is formed as `${url}${filename}`.
-
-**Note:** On macOS the OS spellchecker is used and therefore we do not download any dictionary files.  This API is a no-op on macOS.
-
-#### `ses.listWordsInSpellCheckerDictionary()`
-
-Returns `Promise<String[]>` - An array of all words in app's custom dictionary.
-Resolves when the full dictionary is loaded from disk.
-
-#### `ses.addWordToSpellCheckerDictionary(word)`
-
-* `word` String - The word you want to add to the dictionary
-
-Returns `Boolean` - Whether the word was successfully written to the custom dictionary. This API
-will not work on non-persistent (in-memory) sessions.
-
-**Note:** On macOS and Windows 10 this word will be written to the OS custom dictionary as well
-
-#### `ses.removeWordFromSpellCheckerDictionary(word)`
-
-* `word` String - The word you want to remove from the dictionary
-
-Returns `Boolean` - Whether the word was successfully removed from the custom dictionary. This API
-will not work on non-persistent (in-memory) sessions.
-
-**Note:** On macOS and Windows 10 this word will be removed from the OS custom dictionary as well
-
-#### `ses.loadExtension(path)`
-
-* `path` String - Path to a directory containing an unpacked Chrome extension
-
-Returns `Promise<Extension>` - resolves when the extension is loaded.
-
-This method will raise an exception if the extension could not be loaded. If
-there are warnings when installing the extension (e.g. if the extension
-requests an API that Electron does not support) then they will be logged to the
-console.
-
-Note that Electron does not support the full range of Chrome extensions APIs.
-
-Note that in previous versions of Electron, extensions that were loaded would
-be remembered for future runs of the application. This is no longer the case:
-`loadExtension` must be called on every boot of your app if you want the
-extension to be loaded.
-
-```js
-const { app, session } = require('electron')
-const path = require('path')
-
-app.on('ready', async () => {
-  await session.defaultSession.loadExtension(path.join(__dirname, 'react-devtools'))
-  // Note that in order to use the React DevTools extension, you'll need to
-  // download and unzip a copy of the extension.
-})
-```
-
-This API does not support loading packed (.crx) extensions.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `ses.removeExtension(extensionId)`
-
-* `extensionId` String - ID of extension to remove
-
-Unloads an extension.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `ses.getExtension(extensionId)`
-
-* `extensionId` String - ID of extension to query
-
-Returns `Extension` | `null` - The loaded extension with the given ID.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `ses.getAllExtensions()`
-
-Returns `Extension[]` - A list of all loaded extensions.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
 ### Instance Properties
 
 The following properties are available on instances of `Session`:
 
-#### `ses.availableSpellCheckerLanguages` _Readonly_
-
-A `String[]` array which consists of all the known available spell checker languages.  Providing a language
-code to the `setSpellCheckerLanaguages` API that isn't in this array will result in an error.
-
 #### `ses.cookies` _Readonly_
 
 A [`Cookies`](cookies.md) object for this session.
 
-#### `ses.serviceWorkers` _Readonly_
-
-A [`ServiceWorkers`](service-workers.md) object for this session.
-
 #### `ses.webRequest` _Readonly_
 
 A [`WebRequest`](web-request.md) object for this session.
@@ -642,12 +443,12 @@ A [`Protocol`](protocol.md) object for this session.
 const { app, session } = require('electron')
 const path = require('path')
 
-app.whenReady().then(() => {
+app.on('ready', function () {
   const protocol = session.fromPartition('some-partition').protocol
-  protocol.registerFileProtocol('atom', (request, callback) => {
-    let url = request.url.substr(7)
+  protocol.registerFileProtocol('atom', function (request, callback) {
+    var url = request.url.substr(7)
     callback({ path: path.normalize(`${__dirname}/${url}`) })
-  }, (error) => {
+  }, function (error) {
     if (error) console.error('Failed to register protocol')
   })
 })
@@ -660,7 +461,7 @@ A [`NetLog`](net-log.md) object for this session.
 ```javascript
 const { app, session } = require('electron')
 
-app.whenReady().then(async () => {
+app.on('ready', async function () {
   const netLog = session.fromPartition('some-partition').netLog
   netLog.startLogging('/path/to/net-log')
   // After some network events

docs/api/shell.md

@@ -24,11 +24,11 @@ The `shell` module has the following methods:
 
 Show the given file in a file manager. If possible, select the file.
 
-### `shell.openPath(path)`
+### `shell.openItem(fullPath)`
 
-* `path` String
+* `fullPath` String
 
-Returns `Promise<String>` - Resolves with an string containing the error message corresponding to the failure if a failure occurred, otherwise "".
+Returns `Boolean` - Whether the item was successfully opened.
 
 Open the given file in the desktop's default manner.
 
@@ -43,12 +43,11 @@ Returns `Promise<void>`
 
 Open the given external protocol URL in the desktop's default manner. (For example, mailto: URLs in the user's default mail agent).
 
-### `shell.moveItemToTrash(fullPath[, deleteOnFail])`
+### `shell.moveItemToTrash(fullPath)`
 
 * `fullPath` String
-* `deleteOnFail` Boolean (optional) - Whether or not to unilaterally remove the item if the Trash is disabled or unsupported on the volume. _macOS_
 
-Returns `Boolean` - Whether the item was successfully moved to the trash or otherwise deleted.
+Returns `Boolean` - Whether the item was successfully moved to the trash.
 
 Move the given file to trash and returns a boolean status for the operation.
 

docs/api/structures/extension.md

@@ -1,8 +0,0 @@
-# Extension Object
-
-* `id` String
-* `manifest` any - Copy of the [extension's manifest data](https://developer.chrome.com/extensions/manifest).
-* `name` String
-* `path` String - The extension's file path.
-* `version` String
-* `url` String - The extension's `chrome-extension://` URL.

docs/api/structures/input-event.md

@@ -1,6 +1,6 @@
 # InputEvent Object
 
-* `modifiers` String[] (optional) - An array of modifiers of the event, can
-  be `shift`, `control`, `ctrl`, `alt`, `meta`, `command`, `cmd`, `isKeypad`,
-  `isAutoRepeat`, `leftButtonDown`, `middleButtonDown`, `rightButtonDown`,
-  `capsLock`, `numLock`, `left`, `right`.
+* `modifiers` String[] - An array of modifiers of the event, can
+  be `shift`, `control`, `alt`, `meta`, `isKeypad`, `isAutoRepeat`,
+  `leftButtonDown`, `middleButtonDown`, `rightButtonDown`, `capsLock`,
+  `numLock`, `left`, `right`.

docs/api/structures/ipc-main-event.md

@@ -4,5 +4,4 @@
 * `returnValue` any - Set this to the value to be returned in a synchronous message
 * `sender` WebContents - Returns the `webContents` that sent the message
 * `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
-  * `channel` String
   * `...args` any[]

docs/api/structures/printer-info.md

@@ -1,13 +1,9 @@
 # PrinterInfo Object
 
-* `name` String - the name of the printer as understood by the OS.
-* `displayName` String - the name of the printer as shown in Print Preview.
-* `description` String - a longer description of the printer's type.
-* `status` Number - the current status of the printer.
-* `isDefault` Boolean - whether or not a given printer is set as the default printer on the OS.
-* `options` Object - an object containing a variable number of platform-specific printer information.
-
-The number represented by `status` means different things on different platforms: on Windows it's potential values can be found [here](https://docs.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).
+* `name` String
+* `description` String
+* `status` Number
+* `isDefault` Boolean
 
 ## Example
 
@@ -16,14 +12,13 @@ may be different on each platform.
 
 ```javascript
 {
-  name: 'Austin_4th_Floor_Printer___C02XK13BJHD4',
-  displayName: 'Austin 4th Floor Printer @ C02XK13BJHD4',
-  description: 'TOSHIBA ColorMFP',
+  name: 'Zebra_LP2844',
+  description: 'Zebra LP2844',
   status: 3,
   isDefault: false,
   options: {
     copies: '1',
-    'device-uri': 'dnssd://Austin%204th%20Floor%20Printer%20%40%20C02XK13BJHD4._ipps._tcp.local./?uuid=71687f1e-1147-3274-6674-22de61b110bd',
+    'device-uri': 'usb://Zebra/LP2844?location=14200000',
     finishings: '3',
     'job-cancel-after': '10800',
     'job-hold-until': 'no-hold',
@@ -31,19 +26,18 @@ may be different on each platform.
     'job-sheets': 'none,none',
     'marker-change-time': '0',
     'number-up': '1',
-    'printer-commands': 'ReportLevels,PrintSelfTestPage,com.toshiba.ColourProfiles.update,com.toshiba.EFiling.update,com.toshiba.EFiling.checkPassword',
-    'printer-info': 'Austin 4th Floor Printer @ C02XK13BJHD4',
+    'printer-commands': 'none',
+    'printer-info': 'Zebra LP2844',
     'printer-is-accepting-jobs': 'true',
-    'printer-is-shared': 'false',
-    'printer-is-temporary': 'false',
+    'printer-is-shared': 'true',
     'printer-location': '',
-    'printer-make-and-model': 'TOSHIBA ColorMFP',
+    'printer-make-and-model': 'Zebra EPL2 Label Printer',
     'printer-state': '3',
-    'printer-state-change-time': '1573472937',
-    'printer-state-reasons': 'offline-report,com.toshiba.snmp.failed',
-    'printer-type': '10531038',
-    'printer-uri-supported': 'ipp://localhost/printers/Austin_4th_Floor_Printer___C02XK13BJHD4',
-    system_driverinfo: 'T'
+    'printer-state-change-time': '1484872644',
+    'printer-state-reasons': 'offline-report',
+    'printer-type': '36932',
+    'printer-uri-supported': 'ipp://localhost/printers/Zebra_LP2844',
+    system_driverinfo: 'Z'
   }
 }
 ```

docs/api/structures/protocol-response-upload-data.md

@@ -1,4 +1,4 @@
 # ProtocolResponseUploadData Object
 
 * `contentType` String - MIME type of the content.
-* `data` String | Buffer - Content to be sent.
+* `data` String - Content to be sent.

docs/api/structures/service-worker-info.md

@@ -1,5 +0,0 @@
-# ServiceWorkerInfo Object
-
-* `scriptUrl` String - The full URL to the script that this service worker runs
-* `scope` String - The base URL that this service worker is active for.
-* `renderProcessId` Number - The virtual ID of the process that this service worker is running in.  This is not an OS level PID.  This aligns with the ID set used for `webContents.getProcessId()`.

docs/api/structures/shared-worker-info.md

@@ -1,4 +0,0 @@
-# SharedWorkerInfo Object
-
-* `id` String - The unique id of the shared worker.
-* `url` String - The url of the shared worker.

docs/api/synopsis.md

@@ -22,7 +22,7 @@ The main process script is like a normal Node.js script:
 const { app, BrowserWindow } = require('electron')
 let win = null
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   win = new BrowserWindow({ width: 800, height: 600 })
   win.loadURL('https://github.com')
 })
@@ -56,7 +56,7 @@ const { app, BrowserWindow } = require('electron')
 
 let win
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   win = new BrowserWindow()
   win.loadURL('https://github.com')
 })
@@ -71,7 +71,7 @@ const { app, BrowserWindow } = electron
 
 let win
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   win = new BrowserWindow()
   win.loadURL('https://github.com')
 })
@@ -85,7 +85,7 @@ const app = electron.app
 const BrowserWindow = electron.BrowserWindow
 let win
 
-app.whenReady().then(() => {
+app.on('ready', () => {
   win = new BrowserWindow()
   win.loadURL('https://github.com')
 })

docs/api/system-preferences.md

@@ -27,34 +27,28 @@ Returns:
 
 * `event` Event
 
-### Event: 'inverted-color-scheme-changed' _Windows_ _Deprecated_
+### Event: 'inverted-color-scheme-changed' _Windows_
 
 Returns:
 
 * `event` Event
 * `invertedColorScheme` Boolean - `true` if an inverted color scheme (a high contrast color scheme with light text and dark backgrounds) is being used, `false` otherwise.
 
-**Deprecated:** Should use the new [`updated`](native-theme.md#event-updated) event on the `nativeTheme` module.
-
-### Event: 'high-contrast-color-scheme-changed' _Windows_ _Deprecated_
+### Event: 'high-contrast-color-scheme-changed' _Windows_
 
 Returns:
 
 * `event` Event
 * `highContrastColorScheme` Boolean - `true` if a high contrast theme is being used, `false` otherwise.
 
-**Deprecated:** Should use the new [`updated`](native-theme.md#event-updated) event on the `nativeTheme` module.
-
 ## Methods
 
-### `systemPreferences.isDarkMode()` _macOS_ _Windows_ _Deprecated_
+### `systemPreferences.isDarkMode()` _macOS_ _Windows_
 
 Returns `Boolean` - Whether the system is in Dark Mode.
 
 **Note:** On macOS 10.15 Catalina in order for this API to return the correct value when in the "automatic" dark mode setting you must either have `NSRequiresAquaSystemAppearance=false` in your `Info.plist` or be on Electron `>=7.0.0`.  See the [dark mode guide](../tutorial/mojave-dark-mode-guide.md) for more information.
 
-**Deprecated:** Should use the new [`nativeTheme.shouldUseDarkColors`](native-theme.md#nativethemeshouldusedarkcolors-readonly) API.
-
 ### `systemPreferences.isSwipeTrackingFromScrollEventsEnabled()` _macOS_
 
 Returns `Boolean` - Whether the Swipe between pages setting is on.
@@ -291,7 +285,7 @@ This API is only available on macOS 10.14 Mojave or newer.
     * `window-frame` - Window frame.
     * `window-text` - Text in windows.
   * On **macOS**
-    * `alternate-selected-control-text` - The text on a selected surface in a list or table. _deprecated_
+    * `alternate-selected-control-text` - The text on a selected surface in a list or table.
     * `control-background` - The background of a large interface element, such as a browser or table.
     * `control` - The surface of a control.
     * `control-text` -The text of a control that isn’t disabled.
@@ -310,7 +304,7 @@ This API is only available on macOS 10.14 Mojave or newer.
     * `selected-content-background` - The background for selected content in a key window or view.
     * `selected-control` - The surface of a selected control.
     * `selected-control-text` - The text of a selected control.
-    * `selected-menu-item-text` - The text of a selected menu.
+    * `selected-menu-item` - The text of a selected menu.
     * `selected-text-background` - The background of selected text.
     * `selected-text` - Selected text.
     * `separator` - A separator between different sections of content.
@@ -326,9 +320,7 @@ This API is only available on macOS 10.14 Mojave or newer.
     * `window-frame-text` - The text in the window's titlebar area.
 
 Returns `String` - The system color setting in RGB hexadecimal form (`#ABCDEF`).
-See the [Windows docs][windows-colors] and the [macOS docs][macos-colors] for more details.
-
-The following colors are only available on macOS 10.14: `find-highlight`, `selected-content-background`, `separator`, `unemphasized-selected-content-background`, `unemphasized-selected-text-background`, and `unemphasized-selected-text`.
+See the [Windows docs][windows-colors] and the [MacOS docs][macos-colors] for more details.
 
 [windows-colors]:https://msdn.microsoft.com/en-us/library/windows/desktop/ms724371(v=vs.85).aspx
 [macos-colors]:https://developer.apple.com/design/human-interface-guidelines/macos/visual-design/color#dynamic-system-colors
@@ -350,18 +342,14 @@ Returns `String` - The standard system color formatted as `#RRGGBBAA`.
 
 Returns one of several standard system colors that automatically adapt to vibrancy and changes in accessibility settings like 'Increase contrast' and 'Reduce transparency'. See [Apple Documentation](https://developer.apple.com/design/human-interface-guidelines/macos/visual-design/color#system-colors) for  more details.
 
-### `systemPreferences.isInvertedColorScheme()` _Windows_ _Deprecated_
+### `systemPreferences.isInvertedColorScheme()` _Windows_
 
 Returns `Boolean` - `true` if an inverted color scheme (a high contrast color scheme with light text and dark backgrounds) is active, `false` otherwise.
 
-**Deprecated:** Should use the new [`nativeTheme.shouldUseInvertedColorScheme`](native-theme.md#nativethemeshoulduseinvertedcolorscheme-macos-windows-readonly) API.
-
-### `systemPreferences.isHighContrastColorScheme()` _macOS_ _Windows_ _Deprecated_
+### `systemPreferences.isHighContrastColorScheme()` _macOS_ _Windows_
 
 Returns `Boolean` - `true` if a high contrast theme is active, `false` otherwise.
 
-**Deprecated:** Should use the new [`nativeTheme.shouldUseHighContrastColors`](native-theme.md#nativethemeshouldusehighcontrastcolors-macos-windows-readonly) API.
-
 ### `systemPreferences.getEffectiveAppearance()` _macOS_
 
 Returns `String` - Can be `dark`, `light` or `unknown`.
@@ -369,7 +357,15 @@ Returns `String` - Can be `dark`, `light` or `unknown`.
 Gets the macOS appearance setting that is currently applied to your application,
 maps to [NSApplication.effectiveAppearance](https://developer.apple.com/documentation/appkit/nsapplication/2967171-effectiveappearance?language=objc)
 
-### `systemPreferences.getAppLevelAppearance()` _macOS_ _Deprecated_
+Please note that until Electron is built targeting the 10.14 SDK, your application's
+`effectiveAppearance` will default to 'light' and won't inherit the OS preference. In
+the interim in order for your application to inherit the OS preference you must set the
+`NSRequiresAquaSystemAppearance` key in your apps `Info.plist` to `false`.  If you are
+using `electron-packager` or `electron-forge` just set the `enableDarwinDarkMode`
+packager option to `true`.  See the [Electron Packager API](https://github.com/electron/electron-packager/blob/master/docs/api.md#darwindarkmodesupport)
+for more details.
+
+### `systemPreferences.getAppLevelAppearance()` _macOS_
 
 Returns `String` | `null` - Can be `dark`, `light` or `unknown`.
 
@@ -377,19 +373,25 @@ Gets the macOS appearance setting that you have declared you want for
 your application, maps to [NSApplication.appearance](https://developer.apple.com/documentation/appkit/nsapplication/2967170-appearance?language=objc).
 You can use the `setAppLevelAppearance` API to set this value.
 
-### `systemPreferences.setAppLevelAppearance(appearance)` _macOS_ _Deprecated_
+**[Deprecated](modernization/property-updates.md)**
+
+### `systemPreferences.setAppLevelAppearance(appearance)` _macOS_
 
 * `appearance` String | null - Can be `dark` or `light`
 
 Sets the appearance setting for your application, this should override the
 system default and override the value of `getEffectiveAppearance`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.canPromptTouchID()` _macOS_
 
 Returns `Boolean` - whether or not this device has the ability to use Touch ID.
 
 **NOTE:** This API will return `false` on macOS systems older than Sierra 10.12.2.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.promptTouchID(reason)` _macOS_
 
 * `reason` String - The reason you are asking for Touch ID authentication
@@ -418,13 +420,11 @@ Returns `Boolean` - `true` if the current process is a trusted accessibility cli
 
 ### `systemPreferences.getMediaAccessStatus(mediaType)` _macOS_
 
-* `mediaType` String - Can be `microphone`, `camera` or `screen`.
+* `mediaType` String - `microphone` or `camera`.
 
 Returns `String` - Can be `not-determined`, `granted`, `denied`, `restricted` or `unknown`.
 
-This user consent was not required on macOS 10.13 High Sierra or lower so this method will always return `granted`.
-macOS 10.14 Mojave or higher requires consent for `microphone` and `camera` access.
-macOS 10.15 Catalina or higher requires consent for `screen` access.
+This user consent was not required until macOS 10.14 Mojave, so this method will always return `granted` if your system is running 10.13 High Sierra or lower.
 
 ### `systemPreferences.askForMediaAccess(mediaType)` _macOS_
 
@@ -450,17 +450,10 @@ Returns an object with system animation settings.
 
 ### `systemPreferences.appLevelAppearance` _macOS_
 
-A `String` property that can be `dark`, `light` or `unknown`. It determines the macOS appearance setting for
+A `String` property that determines the macOS appearance setting for
 your application. This maps to values in: [NSApplication.appearance](https://developer.apple.com/documentation/appkit/nsapplication/2967170-appearance?language=objc). Setting this will override the
 system default as well as the value of `getEffectiveAppearance`.
 
 Possible values that can be set are `dark` and `light`, and possible return values are `dark`, `light`, and `unknown`.
 
 This property is only available on macOS 10.14 Mojave or newer.
-
-### `systemPreferences.effectiveAppearance` _macOS_ _Readonly_
-
-A `String` property that can be `dark`, `light` or `unknown`.
-
-Returns the macOS appearance setting that is currently applied to your application,
-maps to [NSApplication.effectiveAppearance](https://developer.apple.com/documentation/appkit/nsapplication/2967171-effectiveappearance?language=objc)

docs/api/touch-bar-button.md

@@ -8,24 +8,16 @@ Process: [Main](../tutorial/application-architecture.md#main-and-renderer-proces
 
 * `options` Object
   * `label` String (optional) - Button text.
-  * `accessibilityLabel` String (optional) - A short description of the button for use by screenreaders like VoiceOver.
   * `backgroundColor` String (optional) - Button background color in hex format,
     i.e `#ABCDEF`.
   * `icon` [NativeImage](native-image.md) | String (optional) - Button icon.
-  * `iconPosition` String (optional) - Can be `left`, `right` or `overlay`. Defaults to `overlay`.
+  * `iconPosition` String (optional) - Can be `left`, `right` or `overlay`.
   * `click` Function (optional) - Function to call when the button is clicked.
-  * `enabled` Boolean (optional) - Whether the button is in an enabled state.  Default is `true`.
-
-When defining `accessibilityLabel`, ensure you have considered macOS [best practices](https://developer.apple.com/documentation/appkit/nsaccessibilitybutton/1524910-accessibilitylabel?language=objc).
 
 ### Instance Properties
 
 The following properties are available on instances of `TouchBarButton`:
 
-#### `touchBarButton.accessibilityLabel`
-
-A `String` representing the description of the button to be read by a screen reader. Will only be read by screen readers if no label is set.
-
 #### `touchBarButton.label`
 
 A `String` representing the button's current text. Changing this value immediately updates the button
@@ -40,7 +32,3 @@ the button in the touch bar.
 
 A `NativeImage` representing the button's current icon. Changing this value immediately updates the button
 in the touch bar.
-
-#### `touchBarButton.enabled`
-
-A `Boolean` representing whether the button is in an enabled state.

docs/api/touch-bar-label.md

@@ -8,11 +8,8 @@ Process: [Main](../tutorial/application-architecture.md#main-and-renderer-proces
 
 * `options` Object
   * `label` String (optional) - Text to display.
-  * `accessibilityLabel` String (optional) - A short description of the button for use by screenreaders like VoiceOver.
   * `textColor` String (optional) - Hex color of text, i.e `#ABCDEF`.
 
-When defining `accessibilityLabel`, ensure you have considered macOS [best practices](https://developer.apple.com/documentation/appkit/nsaccessibilitybutton/1524910-accessibilitylabel?language=objc).
-
 ### Instance Properties
 
 The following properties are available on instances of `TouchBarLabel`:
@@ -22,10 +19,6 @@ The following properties are available on instances of `TouchBarLabel`:
 A `String` representing the label's current text. Changing this value immediately updates the label in
 the touch bar.
 
-#### `touchBarLabel.accessibilityLabel`
-
-A `String` representing the description of the label to be read by a screen reader.
-
 #### `touchBarLabel.textColor`
 
 A `String` hex code representing the label's current text color. Changing this value immediately updates the

docs/api/touch-bar-popover.md

@@ -9,7 +9,7 @@ Process: [Main](../tutorial/application-architecture.md#main-and-renderer-proces
 * `options` Object
   * `label` String (optional) - Popover button text.
   * `icon` [NativeImage](native-image.md) (optional) - Popover button icon.
-  * `items` [TouchBar](touch-bar.md) - Items to display in the popover.
+  * `items` [TouchBar](touch-bar.md) (optional) - Items to display in the popover.
   * `showCloseButton` Boolean (optional) - `true` to display a close button
     on the left of the popover, `false` to not show it. Default is `true`.