fix: initial frame on frameless windows

2026-02-19 03:14:51 -05:00 · 2021-09-02 14:47:12 +02:00
1951 changed files with 45354 additions and 66622 deletions
--- a/.circleci/.gitignore
+++ b/.circleci/.gitignore
@@ -1 +0,0 @@
-config-staging
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
--- a/.circleci/config/build.js
+++ b/.circleci/config/build.js
@@ -1,34 +0,0 @@
-const cp = require('child_process');
-const fs = require('fs-extra');
-const path = require('path');
-const yaml = require('js-yaml');
-
-const STAGING_DIR = path.resolve(__dirname, '..', 'config-staging');
-
-function copyAndExpand(dir = './') {
-    const absDir = path.resolve(__dirname, dir);
-    const targetDir = path.resolve(STAGING_DIR, dir);
-
-    if (!fs.existsSync(targetDir)) {
-        fs.mkdirSync(targetDir);
-    }
-
-    for (const file of fs.readdirSync(absDir)) {
-        if (!file.endsWith('.yml')) {
-            if (fs.statSync(path.resolve(absDir, file)).isDirectory()) {
-                copyAndExpand(path.join(dir, file));
-            }
-            continue;
-        }
-
-        fs.writeFileSync(path.resolve(targetDir, file), yaml.dump(yaml.load(fs.readFileSync(path.resolve(absDir, file), 'utf8')), {
-            noRefs: true,
-        }));
-    }
-}
-
-if (fs.pathExists(STAGING_DIR)) fs.removeSync(STAGING_DIR);
-copyAndExpand();
-
-const output = cp.spawnSync(process.env.CIRCLECI_BINARY || 'circleci', ['config', 'pack', STAGING_DIR]);
-fs.writeFileSync(path.resolve(STAGING_DIR, 'built.yml'), output.stdout.toString());
--- a/.circleci/config/jobs/lint.yml
+++ b/.circleci/config/jobs/lint.yml
@@ -1,51 +0,0 @@
-executor:
-  name: linux-docker
-  size: medium
-steps:
-  - checkout:
-      path: src/electron
-  - run:
-      name: Setup third_party Depot Tools
-      command: |
-        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
-        echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
-  - run:
-      name: Download GN Binary
-      command: |
-        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-        gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
-
-        cipd ensure -ensure-file - -root . \<<-CIPD
-        \$ServiceURL https://chrome-infra-packages.appspot.com/
-        @Subdir src/buildtools/linux64
-        gn/gn/linux-amd64 $gn_version
-        CIPD
-
-        echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
-  - run:
-      name: Download clang-format Binary
-      command: |
-        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-
-        sha1_path='buildtools/linux64/clang-format.sha1'
-        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
-
-        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
-  - run:
-      name: Run Lint
-      command: |
-        # gn.py tries to find a gclient root folder starting from the current dir.
-        # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
-        touch .gclient
-        # Another option would be to checkout "buildtools" inside the Electron checkout,
-        # but then we would lint its contents (at least gn format), and it doesn't pass it.
-
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-        node script/yarn lint
-  - run:
-      name: Run Script Typechecker
-      command: |
-        cd src/electron
-        node script/yarn tsc -p tsconfig.script.json
--- a/.circleci/config/package.json
+++ b/.circleci/config/package.json
@@ -1,10 +0,0 @@
-{
-  "name": "@electron/circleci-config",
-  "version": "0.0.0",
-  "private": true,
-  "license": "MIT",
-  "dependencies": {
-    "fs-extra": "^10.1.0",
-    "js-yaml": "^4.1.0"
-  }
-}
--- a/.circleci/config/yarn.lock
+++ b/.circleci/config/yarn.lock
@@ -1,43 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-fs-extra@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
-  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -4,13 +4,14 @@ Welcome to the Codespaces Electron Developer Environment.

 ## Quick Start

-Upon creation of your codespace you should have [build tools](https://github.com/electron/build-tools) installed and an initialized gclient checkout of Electron.  In order to build electron you'll need to run the following command.
+Upon creation of your codespace you should have [build tools](https://github.com/electron/build-tools) installed and an initialized gclient checkout of Electron.  In order to build electron you'll need to run the following commands.

 ```bash
+e sync -vv
 e build
 ```

-The initial build will take ~8 minutes.  Incremental builds are substantially quicker.  If you pull changes from upstream that touch either the `patches` folder or the `DEPS` folder you will have to run `e sync` in order to keep your checkout up to date.
+The initial sync will take approximately ~30 minutes and the build will take ~8 minutes.  Incremental syncs and incremental builds are substantially quicker.

 ## Directory Structure

--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,6 @@
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "buildtools",
 	"onCreateCommand": ".devcontainer/on-create-command.sh",
-	"updateContentCommand": ".devcontainer/update-content-command.sh",
 	"workspaceFolder": "/workspaces/gclient/src/electron",
 	"extensions": [
 		"joeleinbinder.mojom-language",
@@ -12,28 +11,14 @@
 		"mutantdino.resourcemonitor",
 		"dbaeumer.vscode-eslint",
 		"shakram02.bash-beautify",
-		"marshallofsound.gnls-electron",
-		"CircleCI.circleci"
+		"marshallofsound.gnls-electron"
 	],
 	"settings": {
-		"editor.tabSize": 2,
-		"bashBeautify.tabSize": 2,
-		"typescript.tsdk": "node_modules/typescript/lib",
 		"[gn]": {
 			"editor.formatOnSave": true
 		},
-		"[javascript]": {
-			"editor.codeActionsOnSave": {
-				"source.fixAll.eslint": true
-			}
-		},
-		"[typescript]": {
-			"editor.codeActionsOnSave": {
-				"source.fixAll.eslint": true
-			}
-		},
-		"javascript.preferences.quoteStyle": "single",
-		"typescript.preferences.quoteStyle": "single"
+		"editor.tabSize": 2,
+		"bashBeautify.tabSize": 2
 	},
 	"forwardPorts": [8088, 6080, 5901],
 	"portsAttributes": {
@@ -51,15 +36,8 @@
 		}
 	},
 	"hostRequirements": {
-		"storage": "128gb",
-		"cpus": 16
+		"storage": "32gb",
+		"cpus": 8
 	},
-	"remoteUser": "builduser",
-	"customizations": {
-		"codespaces": {
-			"openFiles": [
-				".devcontainer/README.md"
-			]
-		}
-	}
+	"remoteUser": "builduser"
 }
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'

 services:
  buildtools:
-    image: ghcr.io/electron/devcontainer:3d8d44d0f15b05bef6149e448f9cc522111847e9
+    image: ghcr.io/electron/devcontainer:27db4a3e3512bfd2e47f58cea69922da0835f1d9

    volumes:
      - ..:/workspaces/gclient/src/electron:cached
--- a/.devcontainer/on-create-command.sh
+++ b/.devcontainer/on-create-command.sh
@@ -10,7 +10,6 @@ export PATH="$PATH:$buildtools/src"

 # Create the persisted buildtools config folder
 mkdir -p $buildtools_configs
-mkdir -p $gclient_root/.git-cache
 rm -f $buildtools/configs
 ln -s $buildtools_configs $buildtools/configs

@@ -35,13 +34,8 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
  write_config() {
    echo "
        {
-            \"goma\": \"$1\",
            \"root\": \"/workspaces/gclient\",
-            \"remotes\": {
-                \"electron\": {
-                    \"origin\": \"https://github.com/electron/electron.git\"
-                }
-            }
+            \"goma\": \"$1\",
            \"gen\": {
                \"args\": [
                    \"import(\\\"//electron/build/args/testing.gn\\\")\",
@@ -53,7 +47,11 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
                \"CHROMIUM_BUILDTOOLS_PATH\": \"/workspaces/gclient/src/buildtools\",
                \"GIT_CACHE_PATH\": \"/workspaces/gclient/.git-cache\"
            },
-            \"$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\"
+            \"remotes\": {
+                \"electron\": {
+                    \"origin\": \"https://github.com/electron/electron.git\"
+                }
+            }
        }
    " >$buildtools/configs/evm.testing.json
  }
--- a/.devcontainer/update-content-command.sh
+++ b/.devcontainer/update-content-command.sh
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-buildtools=$HOME/.electron_build_tools
-
-export PATH="$PATH:$buildtools/src"
-
-# Sync latest
-e d gclient sync --with_branch_heads --with_tags
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,4 @@
 {
-  "root": true,
  "extends": "standard",
  "parser": "@typescript-eslint/parser",
  "plugins": ["@typescript-eslint"],
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,5 +0,0 @@
-# Atom --> Electron rename
-d9321f4df751fa32813fab1b6387bbd61bd681d0
-34c4c8d5088fa183f56baea28809de6f2a427e02
-# Enable JS Semicolons
-5d657dece4102e5e5304d42e8004b6ad64c0fcda
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,7 +4,7 @@
 # https://git-scm.com/docs/gitignore

 # Upgrades WG
-/patches/                               @electron/patch-owners
+/patches/                               @electron/wg-upgrades
 DEPS                                    @electron/wg-upgrades

 # Releases WG
@@ -16,4 +16,3 @@ DEPS                                    @electron/wg-upgrades
 /lib/browser/guest-view-manager.ts      @electron/wg-security
 /lib/browser/guest-window-proxy.ts      @electron/wg-security
 /lib/browser/rpc-server.ts              @electron/wg-security
-/lib/renderer/security-warnings.ts      @electron/wg-security
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,20 +8,17 @@ body:
    label: Preflight Checklist
    description: Please ensure you've completed all of the following.
    options:
-      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/main/CONTRIBUTING.md) for this project.
+      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
        required: true
-      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project adheres to.
+      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
        required: true
-      - label: I have searched the [issue tracker](https://www.github.com/electron/electron/issues) for a bug report that matches the one I want to file, without success.
+      - label: I have searched the [issue tracker](https://www.github.com/electron/electron/issues) for a feature request that matches the one I want to file, without success.
        required: true
 - type: input
  attributes:
    label: Electron Version
-    description: |
-      What version of Electron are you using?
-      
-      Note: Please only report issues for [currently supported versions of Electron](https://www.electronjs.org/docs/latest/tutorial/support#currently-supported-versions).
-    placeholder: 17.0.0
+    description: What version of Electron are you using?
+    placeholder: 12.0.0
  validations:
    required: true
 - type: dropdown
@@ -56,7 +53,7 @@ body:
  attributes:
    label: Last Known Working Electron version
    description: What is the last version of Electron this worked in, if applicable?
-    placeholder: 16.0.0
+    placeholder: 11.0.0
 - type: textarea
  attributes:
    label: Expected Behavior
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -8,9 +8,9 @@ body:
    label: Preflight Checklist
    description: Please ensure you've completed all of the following.
    options:
-      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/main/CONTRIBUTING.md) for this project.
+      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
        required: true
-      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project adheres to.
+      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
        required: true
      - label: I have searched the [issue tracker](https://www.github.com/electron/electron/issues) for a feature request that matches the one I want to file, without success.
        required: true
--- a/.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.yml
+++ b/.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.yml
@@ -7,9 +7,9 @@ body:
    label: Preflight Checklist
    description: Please ensure you've completed all of the following.
    options:
-      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/main/CONTRIBUTING.md) for this project.
+      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
        required: true
-      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project adheres to.
+      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
        required: true
 - type: input
  attributes:
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,9 @@
 #### Description of Change
-
 <!--
 Thank you for your Pull Request. Please provide a description above and review
 the requirements below.

-Contributors guide: https://github.com/electron/electron/blob/main/CONTRIBUTING.md
+Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTING.md
 -->

 #### Checklist
@@ -12,8 +11,8 @@ Contributors guide: https://github.com/electron/electron/blob/main/CONTRIBUTING.

 - [ ] PR description included and stakeholders cc'd
 - [ ] `npm test` passes
- [ ] tests are [changed or added](https://github.com/electron/electron/blob/main/docs/development/testing.md)
- [ ] relevant documentation, tutorials, templates and examples are changed or added
+- [ ] tests are [changed or added](https://github.com/electron/electron/blob/master/docs/development/testing.md)
+- [ ] relevant documentation is changed or added
 - [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).

 #### Release Notes
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -2,7 +2,7 @@
 newPRWelcomeComment: |
  💖 Thanks for opening this pull request! 💖

-  We use [semantic commit messages](https://github.com/electron/electron/blob/main/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix.
+  We use [semantic commit messages](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix.

  Examples of commit messages with semantic prefixes:

@@ -12,9 +12,9 @@ newPRWelcomeComment: |

  Things that will help get your PR across the finish line:

-  - Follow the JavaScript, C++, and Python [coding style](https://github.com/electron/electron/blob/main/docs/development/coding-style.md).
+  - Follow the JavaScript, C++, and Python [coding style](https://github.com/electron/electron/blob/master/docs/development/coding-style.md).
  - Run `npm run lint` locally to catch formatting errors earlier.
-  - Document any user-facing changes you've made following the [documentation styleguide](https://github.com/electron/electron/blob/main/docs/styleguide.md).
+  - Document any user-facing changes you've made following the [documentation styleguide](https://github.com/electron/electron/blob/master/docs/styleguide.md).
  - Include tests when adding/changing behavior.
  - Include screenshots and animated GIFs whenever possible.

--- a/.github/semantic.yml
+++ b/.github/semantic.yml
@@ -0,0 +1,2 @@
+# Always validate the PR title, and ignore the commits
+titleOnly: true
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -1,30 +0,0 @@
-name: Issue Labeled
-
-on:
-  issues:
-    types: [labeled]
-
-permissions:  # added using https://github.com/step-security/secure-workflows
-  contents: read
-
-jobs:
-  issue-labeled:
-    permissions:
-      issues: write  # for actions-cool/issues-helper to update issues
-      pull-requests: write  # for actions-cool/issues-helper to update PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: blocked/need-repro
-        if: github.event.label.name == 'blocked/need-repro'
-        uses: actions-cool/issues-helper@dad28fdb88da5f082c04659b7373d85790f9b135 # v3.3.0
-        with:
-          actions: 'create-comment'
-          body: |
-            Hello @${{ github.event.issue.user.login }}. Thanks for reporting this and helping to make Electron better!
-
-            Would it be possible for you to make a standalone testcase with only the code necessary to reproduce the issue? For example, [Electron Fiddle](https://www.electronjs.org/fiddle) is a great tool for making small test cases and makes it easy to publish your test case to a [gist](https://gist.github.com) that Electron maintainers can use.
-
-            Stand-alone test cases make fixing issues go more smoothly: it ensure everyone's looking at the same issue, it removes all unnecessary variables from the equation, and it can also provide the basis for automated regression tests. 
-
-            Now adding the `blocked/need-repro` label for this reason. After you make a test case, please link to it in a followup comment. This issue will be closed in 10 days if the above is not addressed.
-  
--- a/.github/workflows/release_dependency_versions.yml
+++ b/.github/workflows/release_dependency_versions.yml
@@ -1,33 +0,0 @@
-name: Trigger Major Release Dependency Updates
-
-on:
-  release:
-    types: [published]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  trigger_chromedriver:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag: v3
-    - name: Trigger New chromedriver Release
-      run: |
-        if [[ ${{ github.event.release.tag_name }} =~ ^v\d+\.\d+\.\d+$ ]]; then
-          gh api /repos/:owner/chromedriver/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
-        else
-          echo "Not releasing for version ${{ github.event.release.tag_name }}"
-        fi
-
-  trigger_mksnapshot:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag: v3
-      - name: Trigger New mksnapshot Release
-        run: |
-          if [[ ${{ github.event.release.tag_name }} =~ ^v\d+\.\d+\.\d+$ ]]; then
-            gh api /repos/:owner/mksnapshot/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
-          else
-            echo "Not releasing for version ${{ github.event.release.tag_name }}"
-          fi
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -1,54 +0,0 @@
-name: Scorecards supply-chain security
-on:
-  # Only the default branch is supported.
-  branch_protection_rule:
-  schedule:
-    - cron: '44 17 * * 0'
-  push:
-    branches: [ "main" ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecards analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Used to receive a badge.
-      id-token: write
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # tag=v2.0.6
-        with:
-          results_file: results.sarif
-          results_format: sarif
-
-          # Publish the results for public repositories to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories, `publish_results` will automatically be set to `false`, regardless
-          # of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # tag=v3.0.0
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # tag=v1.0.26
-        with:
-          sarif_file: results.sarif
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -1,26 +0,0 @@
-name: "Check Semantic Commit"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-
-permissions:
-  contents: read
-
-jobs:
-  main:
-    permissions:
-      pull-requests: read  # for amannn/action-semantic-pull-request to analyze PRs
-      statuses: write  # for amannn/action-semantic-pull-request to mark status of analyzed PR
-    name: Validate PR Title
-    runs-on: ubuntu-latest
-    steps:
-      - name: semantic-pull-request
-        uses: amannn/action-semantic-pull-request@505e44b4f33b4c801f063838b3f053990ee46ea7 # tag: v4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          validateSingleCommit: false
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,25 +0,0 @@
-name: 'Close stale issues'
-on:
-  schedule:
-    # 1:30am every day
-    - cron: '30 1 * * *'
-
-permissions:
-  issues: write
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@3de2653986ebd134983c79fe2be5d45cc3d9f4e1
-        with:
-          days-before-stale: 90
-          days-before-close: 30
-          stale-issue-label: stale
-          operations-per-run: 1750
-          stale-issue-message: >
-            This issue has been automatically marked as stale. **If this issue is still affecting you, please leave any comment** (for example, "bump"), and we'll keep it open. If you have any new additional information—in particular, if this is still reproducible in the [latest version of Electron](https://www.electronjs.org/releases/stable) or in the [beta](https://www.electronjs.org/releases/beta)—please include it with your comment!
-          close-issue-message: >
-            This issue has been closed due to inactivity, and will not be monitored.  If this is a bug and you can reproduce this issue on a [supported version of Electron](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline) please open a new issue and include instructions for reproducing the issue.
-          exempt-issue-labels: "discussion,security \U0001F512,enhancement :sparkles:"
-          only-pr-labels: not-a-real-label
--- a/.github/workflows/update_appveyor_image.yml
+++ b/.github/workflows/update_appveyor_image.yml
@@ -1,62 +0,0 @@
-name: Update AppVeyor Image
-
-# Run chron daily Mon-Fri
-on:
-  schedule:
-    - cron: '0 8 * * 1-5' # runs 8:00 every business day (see https://crontab.guru)
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  bake-appveyor-image:
-    name: Bake AppVeyor Image
-    permissions:
-      contents: write
-      pull-requests: write  # to create a new PR with updated Appveyor images
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-      with:
-        fetch-depth: 0
-    - name: Yarn install
-      run: |
-        node script/yarn.js install --frozen-lockfile
-    - name: Set Repo for Commit
-      run: git config --global --add safe.directory $GITHUB_WORKSPACE
-    - name: Check AppVeyor Image
-      env:
-        APPVEYOR_TOKEN: ${{ secrets.APPVEYOR_TOKEN }}
-      run: |
-        node ./script/prepare-appveyor
-        if [ -f ./image_version.txt ]; then
-          echo "APPVEYOR_IMAGE_VERSION="$(cat image_version.txt)"" >> $GITHUB_ENV
-          rm image_version.txt
-        fi
-    - name: (Optionally) Update Appveyor Image
-      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: mikefarah/yq@1c7dc0e88aad311c89889bc5ce5d8f96931a1bd0 # v4.27.2
-      with:
-        cmd: yq '.image = "${{ env.APPVEYOR_IMAGE_VERSION }}"' "appveyor.yml" > "appveyor2.yml"
-    - name: (Optionally) Generate Commit Diff
-      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      run: |
-        diff -w -B appveyor.yml appveyor2.yml > appveyor.diff || true
-        patch -f appveyor.yml < appveyor.diff
-        rm appveyor2.yml appveyor.diff
-    - name: (Optionally) Commit and Pull Request
-      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
-      with:
-        token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
-        commit-message: 'build: update appveyor image to latest version'
-        committer: GitHub <noreply@github.com>
-        author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-        signoff: false
-        branch: bump-appveyor-image
-        delete-branch: true
-        title: 'build: update appveyor image to latest version'
-        body: |
-          This PR updates appveyor.yml to the latest baked image, ${{ env.APPVEYOR_IMAGE_VERSION }}.
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ spec/.hash
 .eslintcache*

 # Generated native addon files
-/spec/fixtures/native-addon/echo/build/
+/spec-main/fixtures/native-addon/echo/build/

 # If someone runs tsc this is where stuff will end up
 ts-gen
@@ -53,4 +53,4 @@ ts-gen
 # Used to accelerate builds after sync
 patches/mtime-cache.json

-spec/fixtures/logo.png
+spec/fixtures/logo.png
--- a/.husky/.gitignore
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -23,5 +23,7 @@
    "br_spaces": 0
  },
  "single-h1": false,
-  "no-inline-html": false
+  "no-inline-html": {
+    "allowed_elements": ["br"]
+  }
 }
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16
+14
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -37,13 +37,12 @@ if (is_mac) {
  import("build/rules.gni")

  assert(
-      mac_deployment_target == "10.13",
+      mac_deployment_target == "10.11.0",
      "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }

 if (is_linux) {
  import("//build/config/linux/pkg_config.gni")
-  import("//tools/generate_stubs/rules.gni")

  pkg_config("gio_unix") {
    packages = [ "gio-unix-2.0" ]
@@ -55,48 +54,6 @@ if (is_linux) {
      "gdk-pixbuf-2.0",
    ]
  }
-
-  generate_library_loader("libnotify_loader") {
-    name = "LibNotifyLoader"
-    output_h = "libnotify_loader.h"
-    output_cc = "libnotify_loader.cc"
-    header = "<libnotify/notify.h>"
-    config = ":libnotify_config"
-
-    functions = [
-      "notify_is_initted",
-      "notify_init",
-      "notify_get_server_caps",
-      "notify_get_server_info",
-      "notify_notification_new",
-      "notify_notification_add_action",
-      "notify_notification_set_image_from_pixbuf",
-      "notify_notification_set_timeout",
-      "notify_notification_set_urgency",
-      "notify_notification_set_hint_string",
-      "notify_notification_show",
-      "notify_notification_close",
-    ]
-  }
-
-  # Generates electron_gtk_stubs.h header which contains
-  # stubs for extracting function ptrs from the gtk library.
-  # Function signatures for which stubs are required should be
-  # declared in electron_gtk.sigs, currently this file contains
-  # signatures for the functions used with native file chooser
-  # implementation. In future, this file can be extended to contain
-  # gtk4 stubs to switch gtk version in runtime.
-  generate_stubs("electron_gtk_stubs") {
-    sigs = [
-      "shell/browser/ui/electron_gdk_pixbuf.sigs",
-      "shell/browser/ui/electron_gtk.sigs",
-    ]
-    extra_header = "shell/browser/ui/electron_gtk.fragment"
-    output_name = "electron_gtk_stubs"
-    public_deps = [ "//ui/gtk:gtk_config" ]
-    logging_function = "LogNoop()"
-    logging_include = "ui/gtk/log_noop.h"
-  }
 }

 declare_args() {
@@ -107,14 +64,6 @@ branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
 electron_mac_bundle_id = branding.mac_bundle_id
-electron_version = exec_script("script/print-version.py",
-                               [],
-                               "trim string",
-                               [
-                                 ".git/packed-refs",
-                                 ".git/HEAD",
-                                 "script/lib/get-version.js",
-                               ])

 if (is_mas_build) {
  assert(is_mac,
@@ -143,7 +92,7 @@ config("electron_lib_config") {
  include_dirs = [ "." ]
 }

-# We generate the definitions twice here, once in //electron/electron.d.ts
+# We geneate the definitions twice here, once in //electron/electron.d.ts
 # and once in $target_gen_dir
 # The one in $target_gen_dir is used for the actual TSC build later one
 # and the one in //electron/electron.d.ts is used by your IDE (vscode)
@@ -210,15 +159,6 @@ webpack_build("electron_isolated_renderer_bundle") {
  out_file = "$target_gen_dir/js2c/isolated_bundle.js"
 }

-webpack_build("electron_utility_bundle") {
-  deps = [ ":build_electron_definitions" ]
-
-  inputs = auto_filenames.utility_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.utility.js"
-  out_file = "$target_gen_dir/js2c/utility_init.js"
-}
-
 action("electron_js2c") {
  deps = [
    ":electron_asar_bundle",
@@ -226,7 +166,6 @@ action("electron_js2c") {
    ":electron_isolated_renderer_bundle",
    ":electron_renderer_bundle",
    ":electron_sandboxed_renderer_bundle",
-    ":electron_utility_bundle",
    ":electron_worker_bundle",
  ]

@@ -236,7 +175,6 @@ action("electron_js2c") {
    "$target_gen_dir/js2c/isolated_bundle.js",
    "$target_gen_dir/js2c/renderer_init.js",
    "$target_gen_dir/js2c/sandbox_bundle.js",
-    "$target_gen_dir/js2c/utility_init.js",
    "$target_gen_dir/js2c/worker_init.js",
  ]

@@ -249,13 +187,6 @@ action("electron_js2c") {
         rebase_path(sources, root_build_dir)
 }

-action("generate_config_gypi") {
-  outputs = [ "$root_gen_dir/config.gypi" ]
-  script = "script/generate-config-gypi.py"
-  inputs = [ "//third_party/electron_node/configure.py" ]
-  args = rebase_path(outputs) + [ target_cpu ]
-}
-
 target_gen_default_app_js = "$target_gen_dir/js/default_app"

 typescript_build("default_app_js") {
@@ -316,14 +247,42 @@ copy("copy_shell_devtools_discovery_page") {
  outputs = [ "$target_gen_dir/shell_devtools_discovery_page.html" ]
 }

+if (is_linux) {
+  generate_library_loader("libnotify_loader") {
+    name = "LibNotifyLoader"
+    output_h = "libnotify_loader.h"
+    output_cc = "libnotify_loader.cc"
+    header = "<libnotify/notify.h>"
+    config = ":libnotify_config"
+
+    functions = [
+      "notify_is_initted",
+      "notify_init",
+      "notify_get_server_caps",
+      "notify_get_server_info",
+      "notify_notification_new",
+      "notify_notification_add_action",
+      "notify_notification_set_image_from_pixbuf",
+      "notify_notification_set_timeout",
+      "notify_notification_set_urgency",
+      "notify_notification_set_hint_string",
+      "notify_notification_show",
+      "notify_notification_close",
+    ]
+  }
+}
+
 npm_action("electron_version_args") {
  script = "generate-version-json"

  outputs = [ "$target_gen_dir/electron_version.args" ]

-  args = rebase_path(outputs) + [ "$electron_version" ]
+  args = rebase_path(outputs)

-  inputs = [ "script/generate-version-json.js" ]
+  inputs = [
+    "ELECTRON_VERSION",
+    "script/generate-version-json.js",
+  ]
 }

 templated_file("electron_version_header") {
@@ -335,39 +294,6 @@ templated_file("electron_version_header") {
  args_files = get_target_outputs(":electron_version_args")
 }

-templated_file("electron_win_rc") {
-  deps = [ ":electron_version_args" ]
-
-  template = "build/templates/electron_rc.tmpl"
-  output = "$target_gen_dir/win-resources/electron.rc"
-
-  args_files = get_target_outputs(":electron_version_args")
-}
-
-copy("electron_win_resource_files") {
-  sources = [
-    "shell/browser/resources/win/electron.ico",
-    "shell/browser/resources/win/resource.h",
-  ]
-  outputs = [ "$target_gen_dir/win-resources/{{source_file_part}}" ]
-}
-
-templated_file("electron_version_file") {
-  deps = [ ":electron_version_args" ]
-
-  template = "build/templates/version_string.tmpl"
-  output = "$root_build_dir/version"
-
-  args_files = get_target_outputs(":electron_version_args")
-}
-
-group("electron_win32_resources") {
-  public_deps = [
-    ":electron_win_rc",
-    ":electron_win_resource_files",
-  ]
-}
-
 action("electron_fuses") {
  script = "build/fuses/build.py"

@@ -417,22 +343,17 @@ source_set("electron_lib") {
    "chromium_src:chrome",
    "chromium_src:chrome_spellchecker",
    "shell/common/api:mojo",
-    "shell/services/node/public/mojom",
    "//base:base_static",
    "//base/allocator:buildflags",
-    "//chrome:strings",
    "//chrome/app:command_ids",
    "//chrome/app/resources:platform_locale_settings",
-    "//components/autofill/core/common:features",
    "//components/certificate_transparency",
-    "//components/embedder_support:browser_util",
    "//components/language/core/browser",
    "//components/net_log",
    "//components/network_hints/browser",
    "//components/network_hints/common:mojo_bindings",
    "//components/network_hints/renderer",
    "//components/network_session_configurator/common",
-    "//components/omnibox/browser:buildflags",
    "//components/os_crypt",
    "//components/pref_registry",
    "//components/prefs",
@@ -441,7 +362,6 @@ source_set("electron_lib") {
    "//components/user_prefs",
    "//components/viz/host",
    "//components/viz/service",
-    "//components/webrtc",
    "//content/public/browser",
    "//content/public/child",
    "//content/public/gpu",
@@ -454,9 +374,11 @@ source_set("electron_lib") {
    "//media/mojo/mojom",
    "//net:extras",
    "//net:net_resources",
+    "//ppapi/host",
+    "//ppapi/proxy",
+    "//ppapi/shared_impl",
    "//printing/buildflags",
    "//services/device/public/cpp/geolocation",
-    "//services/device/public/cpp/hid",
    "//services/device/public/mojom",
    "//services/proxy_resolver:lib",
    "//services/video_capture/public/mojom:constants",
@@ -490,6 +412,7 @@ source_set("electron_lib") {
  ]

  include_dirs = [
+    "chromium_src",
    ".",
    "$target_gen_dir",

@@ -512,8 +435,6 @@ source_set("electron_lib") {
    ]
  }

-  configs += [ "//electron/build/config:mas_build" ]
-
  sources = filenames.lib_sources
  if (is_win) {
    sources += filenames.lib_sources_win
@@ -542,6 +463,13 @@ source_set("electron_lib") {
    ]
  }

+  if (is_linux) {
+    deps += [
+      "//build/config/linux/gtk:gtkprint",
+      "//components/crash/content/browser",
+    ]
+  }
+
  if (is_mac) {
    deps += [
      "//components/remote_cocoa/app_shim",
@@ -566,8 +494,6 @@ source_set("electron_lib") {
      "StoreKit.framework",
    ]

-    weak_frameworks = [ "QuickLookThumbnailing.framework" ]
-
    sources += [
      "shell/browser/ui/views/autofill_popup_view.cc",
      "shell/browser/ui/views/autofill_popup_view.h",
@@ -575,6 +501,7 @@ source_set("electron_lib") {
    if (is_mas_build) {
      sources += [ "shell/browser/api/electron_api_app_mas.mm" ]
      sources -= [ "shell/browser/auto_updater_mac.mm" ]
+      defines += [ "MAS_BUILD" ]
      sources -= [
        "shell/app/electron_crash_reporter_client.cc",
        "shell/app/electron_crash_reporter_client.h",
@@ -600,28 +527,18 @@ source_set("electron_lib") {
  if (is_linux) {
    libs = [ "xshmfence" ]
    deps += [
-      ":electron_gtk_stubs",
      ":libnotify_loader",
      "//build/config/linux/gtk",
-      "//components/crash/content/browser",
      "//dbus",
      "//device/bluetooth",
-      "//third_party/crashpad/crashpad/client",
-      "//ui/base/ime/linux",
      "//ui/events/devices/x11",
      "//ui/events/platform/x11",
-      "//ui/gtk:gtk_config",
-      "//ui/linux:linux_ui",
-      "//ui/linux:linux_ui_factory",
+      "//ui/gtk",
      "//ui/views/controls/webview",
      "//ui/wm",
    ]
-    if (ozone_platform_x11) {
+    if (use_x11) {
      sources += filenames.lib_sources_linux_x11
-      public_deps += [
-        "//ui/base/x",
-        "//ui/ozone/platform/x11",
-      ]
    }
    configs += [ ":gio_unix" ]
    defines += [
@@ -629,9 +546,18 @@ source_set("electron_lib") {
      "GLIB_DISABLE_DEPRECATION_WARNINGS",
    ]

+    sources += filenames.lib_sources_nss
    sources += [
-      "shell/browser/certificate_manager_model.cc",
-      "shell/browser/certificate_manager_model.h",
+      "shell/browser/ui/gtk/app_indicator_icon.cc",
+      "shell/browser/ui/gtk/app_indicator_icon.h",
+      "shell/browser/ui/gtk/app_indicator_icon_menu.cc",
+      "shell/browser/ui/gtk/app_indicator_icon_menu.h",
+      "shell/browser/ui/gtk/gtk_status_icon.cc",
+      "shell/browser/ui/gtk/gtk_status_icon.h",
+      "shell/browser/ui/gtk/menu_util.cc",
+      "shell/browser/ui/gtk/menu_util.h",
+      "shell/browser/ui/gtk/status_icon.cc",
+      "shell/browser/ui/gtk/status_icon.h",
      "shell/browser/ui/gtk_util.cc",
      "shell/browser/ui/gtk_util.h",
    ]
@@ -654,23 +580,11 @@ source_set("electron_lib") {
  if (enable_plugins) {
    deps += [ "chromium_src:plugins" ]
    sources += [
-      "shell/common/plugin_info.cc",
-      "shell/common/plugin_info.h",
-      "shell/renderer/electron_renderer_pepper_host_factory.cc",
-      "shell/renderer/electron_renderer_pepper_host_factory.h",
      "shell/renderer/pepper_helper.cc",
      "shell/renderer/pepper_helper.h",
    ]
  }

-  if (enable_ppapi) {
-    deps += [
-      "//ppapi/host",
-      "//ppapi/proxy",
-      "//ppapi/shared_impl",
-    ]
-  }
-
  if (enable_run_as_node) {
    sources += [
      "shell/app/node_main.cc",
@@ -705,6 +619,12 @@ source_set("electron_lib") {
  }

  if (enable_desktop_capturer) {
+    if (is_component_build && !is_linux) {
+      # On windows the implementation relies on unexported
+      # DxgiDuplicatorController class.  On macOS the implementation
+      # relies on unexported webrtc::GetWindowOwnerPid method.
+      deps += [ "//third_party/webrtc/modules/desktop_capture" ]
+    }
    sources += [
      "shell/browser/api/electron_api_desktop_capturer.cc",
      "shell/browser/api/electron_api_desktop_capturer.h",
@@ -718,8 +638,10 @@ source_set("electron_lib") {
    ]
  }

-  if (enable_printing) {
+  if (enable_basic_printing) {
    sources += [
+      "shell/browser/printing/print_preview_message_handler.cc",
+      "shell/browser/printing/print_preview_message_handler.h",
      "shell/browser/printing/print_view_manager_electron.cc",
      "shell/browser/printing/print_view_manager_electron.h",
      "shell/renderer/printing/print_render_frame_helper_delegate.cc",
@@ -744,7 +666,7 @@ source_set("electron_lib") {
      "//components/update_client:update_client",
      "//components/zoom",
      "//extensions/browser",
-      "//extensions/browser/api:api_provider",
+      "//extensions/browser:core_api_provider",
      "//extensions/browser/updater",
      "//extensions/common",
      "//extensions/common:core_api_provider",
@@ -764,10 +686,8 @@ source_set("electron_lib") {
    deps += [
      "//chrome/browser/resources/pdf:resources",
      "//components/pdf/browser",
-      "//components/pdf/browser:interceptors",
-      "//components/pdf/common",
      "//components/pdf/renderer",
-      "//pdf",
+      "//pdf:pdf_ppapi",
    ]
    sources += [
      "shell/browser/electron_pdf_web_contents_helper_client.cc",
@@ -777,6 +697,14 @@ source_set("electron_lib") {

  sources += get_target_outputs(":electron_fuses")

+  if (is_win && enable_win_dark_mode_window_ui) {
+    sources += [
+      "shell/browser/win/dark_mode.cc",
+      "shell/browser/win/dark_mode.h",
+    ]
+    libs += [ "uxtheme.lib" ]
+  }
+
  if (allow_runtime_configurable_key_storage) {
    defines += [ "ALLOW_RUNTIME_CONFIGURABLE_KEY_STORAGE" ]
  }
@@ -796,6 +724,7 @@ if (is_mac) {
  electron_helper_name = "$electron_product_name Helper"
  electron_login_helper_name = "$electron_product_name Login Helper"
  electron_framework_version = "A"
+  electron_version = read_file("ELECTRON_VERSION", "trim string")

  mac_xib_bundle_data("electron_xibs") {
    sources = [ "shell/common/resources/mac/MainMenu.xib" ]
@@ -860,11 +789,16 @@ if (is_mac) {
    # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
    bundle_data("electron_swiftshader_binaries") {
      sources = [
+        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
      ]
      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-      public_deps = [ "//ui/gl:swiftshader_vk_library_copy" ]
+      public_deps = [
+        "//ui/gl:swiftshader_egl_library_copy",
+        "//ui/gl:swiftshader_vk_library_copy",
+      ]
    }
  }
  group("electron_angle_library") {
@@ -946,13 +880,6 @@ if (is_mac) {
        "@executable_path/../../../../../..",
      ]
    }
-
-    # For component ffmpeg under non-component build, it is linked from
-    # @loader_path. However the ffmpeg.dylib is moved to a different place
-    # when generating app bundle, and we should change to link from @rpath.
-    if (is_component_ffmpeg && !is_component_build) {
-      ldflags += [ "-Wcrl,installnametool,-change,@loader_path/libffmpeg.dylib,@rpath/libffmpeg.dylib" ]
-    }
  }

  template("electron_helper_app") {
@@ -960,21 +887,13 @@ if (is_mac) {
      assert(defined(invoker.helper_name_suffix))

      output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [
-        ":electron_framework+link",
-        "//base/allocator:early_zone_registration_mac",
-      ]
+      deps = [ ":electron_framework+link" ]
      if (!is_mas_build) {
        deps += [ "//sandbox/mac:seatbelt" ]
      }
      defines = [ "HELPER_EXECUTABLE" ]
-      extra_configs = [ "//electron/build/config:mas_build" ]
-      sources = [
-        "shell/app/electron_main_mac.cc",
-        "shell/app/uv_stdio_fix.cc",
-        "shell/app/uv_stdio_fix.h",
-        "shell/common/electron_constants.cc",
-      ]
+      sources = filenames.app_sources
+      sources += [ "shell/common/electron_constants.cc" ]
      include_dirs = [ "." ]
      info_plist = "shell/renderer/resources/mac/Info.plist"
      extra_substitutions =
@@ -1072,14 +991,14 @@ if (is_mac) {
  action("electron_app_lproj_dirs") {
    outputs = []

-    foreach(locale, locales_as_apple_outputs) {
+    foreach(locale, locales_as_mac_outputs) {
      outputs += [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
    }
    script = "build/mac/make_locale_dirs.py"
    args = rebase_path(outputs)
  }

-  foreach(locale, locales_as_apple_outputs) {
+  foreach(locale, locales_as_mac_outputs) {
    bundle_data("electron_app_strings_${locale}_bundle_data") {
      sources = [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
      outputs = [ "{{bundle_resources_dir}}/$locale.lproj" ]
@@ -1088,7 +1007,7 @@ if (is_mac) {
  }
  group("electron_app_strings_bundle_data") {
    public_deps = []
-    foreach(locale, locales_as_apple_outputs) {
+    foreach(locale, locales_as_mac_outputs) {
      public_deps += [ ":electron_app_strings_${locale}_bundle_data" ]
    }
  }
@@ -1105,32 +1024,22 @@ if (is_mac) {
    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
  }

-  asar_hashed_info_plist("electron_app_plist") {
-    keys = [ "DEFAULT_APP_ASAR_HEADER_SHA" ]
-    hash_targets = [ ":default_app_asar_header_hash" ]
-    plist_file = "shell/browser/resources/mac/Info.plist"
-  }
-
  mac_app_bundle("electron_app") {
    output_name = electron_product_name
-    sources = [
-      "shell/app/electron_main_mac.cc",
-      "shell/app/uv_stdio_fix.cc",
-      "shell/app/uv_stdio_fix.h",
-    ]
+    sources = filenames.app_sources
+    sources += [ "shell/common/electron_constants.cc" ]
    include_dirs = [ "." ]
    deps = [
      ":electron_app_framework_bundle_data",
-      ":electron_app_plist",
      ":electron_app_resources",
      ":electron_fuses",
-      "//base/allocator:early_zone_registration_mac",
+      "//base",
      "//electron/buildflags",
    ]
    if (is_mas_build) {
      deps += [ ":electron_login_helper_app" ]
    }
-    info_plist_target = ":electron_app_plist"
+    info_plist = "shell/browser/resources/mac/Info.plist"
    extra_substitutions = [
      "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id",
      "ELECTRON_VERSION=$electron_version",
@@ -1139,7 +1048,6 @@ if (is_mac) {
      "-rpath",
      "@executable_path/../Frameworks",
    ]
-    extra_configs = [ "//electron/build/config:mas_build" ]
  }

  if (enable_dsyms) {
@@ -1169,18 +1077,21 @@ if (is_mac) {
      deps = [ ":electron_app" ]
    }

-    extract_symbols("egl_syms") {
-      binary = "$root_out_dir/libEGL.dylib"
+    extract_symbols("swiftshader_egl_syms") {
+      binary = "$root_out_dir/libswiftshader_libEGL.dylib"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      dsym_file = "$root_out_dir/libEGL.dylib.dSYM/Contents/Resources/DWARF/libEGL.dylib"
-      deps = [ "//third_party/angle:libEGL" ]
+      dsym_file = "$root_out_dir/libswiftshader_libEGL.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libEGL.dylib"
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
    }

-    extract_symbols("gles_syms") {
-      binary = "$root_out_dir/libGLESv2.dylib"
+    extract_symbols("swiftshader_gles_syms") {
+      binary = "$root_out_dir/libswiftshader_libGLESv2.dylib"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      dsym_file = "$root_out_dir/libGLESv2.dylib.dSYM/Contents/Resources/DWARF/libGLESv2.dylib"
-      deps = [ "//third_party/angle:libGLESv2" ]
+      dsym_file = "$root_out_dir/libswiftshader_libGLESv2.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libGLESv2.dylib"
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
+      ]
    }

    extract_symbols("crashpad_handler_syms") {
@@ -1192,10 +1103,10 @@ if (is_mac) {

    group("electron_symbols") {
      deps = [
-        ":egl_syms",
        ":electron_app_syms",
        ":electron_framework_syms",
-        ":gles_syms",
+        ":swiftshader_egl_syms",
+        ":swiftshader_gles_syms",
      ]

      if (!is_mas_build) {
@@ -1224,21 +1135,12 @@ if (is_mac) {

  executable("electron_app") {
    output_name = electron_project_name
-    if (is_win) {
-      sources = [ "shell/app/electron_main_win.cc" ]
-    } else if (is_linux) {
-      sources = [
-        "shell/app/electron_main_linux.cc",
-        "shell/app/uv_stdio_fix.cc",
-        "shell/app/uv_stdio_fix.h",
-      ]
-    }
+    sources = filenames.app_sources
    include_dirs = [ "." ]
    deps = [
      ":default_app_asar",
      ":electron_app_manifest",
      ":electron_lib",
-      ":electron_win32_resources",
      ":packed_resources",
      "//components/crash/core/app",
      "//content:sandbox_helper_win",
@@ -1254,7 +1156,7 @@ if (is_mac) {
    if (enable_hidpi) {
      data += [ "$root_out_dir/chrome_200_percent.pak" ]
    }
-    foreach(locale, platform_pak_locales) {
+    foreach(locale, locales) {
      data += [ "$root_out_dir/locales/$locale.pak" ]
    }

@@ -1272,7 +1174,8 @@ if (is_mac) {

    if (is_win) {
      sources += [
-        "$target_gen_dir/win-resources/electron.rc",
+        # TODO: we should be generating our .rc files more like how chrome does
+        "shell/browser/resources/win/electron.rc",
        "shell/browser/resources/win/resource.h",
      ]

@@ -1332,10 +1235,6 @@ if (is_mac) {
      if (!is_component_build && is_component_ffmpeg) {
        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
      }
-
-      if (is_linux) {
-        deps += [ "//sandbox/linux:chrome_sandbox" ]
-      }
    }
  }

@@ -1354,23 +1253,27 @@ if (is_mac) {
      deps = [ ":electron_app" ]
    }

-    extract_symbols("egl_symbols") {
-      binary = "$root_out_dir/libEGL$_target_shared_library_suffix"
+    extract_symbols("swiftshader_egl_symbols") {
+      binary = "$root_out_dir/swiftshader/libEGL$_target_shared_library_suffix"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [ "//third_party/angle:libEGL" ]
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
    }

-    extract_symbols("gles_symbols") {
-      binary = "$root_out_dir/libGLESv2$_target_shared_library_suffix"
+    extract_symbols("swiftshader_gles_symbols") {
+      binary =
+          "$root_out_dir/swiftshader/libGLESv2$_target_shared_library_suffix"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [ "//third_party/angle:libGLESv2" ]
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
+      ]
    }

    group("electron_symbols") {
      deps = [
-        ":egl_symbols",
        ":electron_app_symbols",
-        ":gles_symbols",
+        ":swiftshader_egl_symbols",
+        ":swiftshader_gles_symbols",
      ]
    }
  }
@@ -1454,28 +1357,31 @@ group("licenses") {
  ]
 }

+copy("electron_version") {
+  sources = [ "ELECTRON_VERSION" ]
+  outputs = [ "$root_build_dir/version" ]
+}
+
 dist_zip("electron_dist_zip") {
  data_deps = [
    ":electron_app",
-    ":electron_version_file",
+    ":electron_version",
    ":licenses",
  ]
  if (is_linux) {
    data_deps += [ "//sandbox/linux:chrome_sandbox" ]
  }
-  deps = data_deps
  outputs = [ "$root_build_dir/dist.zip" ]
 }

 dist_zip("electron_ffmpeg_zip") {
  data_deps = [ "//third_party/ffmpeg" ]
-  deps = data_deps
  outputs = [ "$root_build_dir/ffmpeg.zip" ]
 }

 electron_chromedriver_deps = [
  ":licenses",
-  "//chrome/test/chromedriver:chromedriver_server",
+  "//chrome/test/chromedriver",
  "//electron/buildflags",
 ]

@@ -1487,7 +1393,6 @@ group("electron_chromedriver") {
 dist_zip("electron_chromedriver_zip") {
  testonly = true
  data_deps = electron_chromedriver_deps
-  deps = data_deps
  outputs = [ "$root_build_dir/chromedriver.zip" ]
 }

@@ -1506,7 +1411,6 @@ group("electron_mksnapshot") {

 dist_zip("electron_mksnapshot_zip") {
  data_deps = mksnapshot_deps
-  deps = data_deps
  outputs = [ "$root_build_dir/mksnapshot.zip" ]
 }

@@ -1517,7 +1421,6 @@ copy("hunspell_dictionaries") {

 dist_zip("hunspell_dictionaries_zip") {
  data_deps = [ ":hunspell_dictionaries" ]
-  deps = data_deps
  flatten = true

  outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
@@ -1531,7 +1434,6 @@ copy("libcxx_headers") {

 dist_zip("libcxx_headers_zip") {
  data_deps = [ ":libcxx_headers" ]
-  deps = data_deps
  flatten = true
  flatten_relative_to = rebase_path(
          "$target_gen_dir/electron_libcxx_include/buildtools/third_party/libc++/trunk",
@@ -1547,7 +1449,6 @@ copy("libcxxabi_headers") {

 dist_zip("libcxxabi_headers_zip") {
  data_deps = [ ":libcxxabi_headers" ]
-  deps = data_deps
  flatten = true
  flatten_relative_to = rebase_path(
          "$target_gen_dir/electron_libcxxabi_include/buildtools/third_party/libc++abi/trunk",
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Having the original text _as well as_ the translation can help mitigate translat

 Responses to posted issues may or may not be in the original language.

-**Please note** that using non-English as an attempt to circumvent our [Code of Conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) will be an immediate, and possibly indefinite, ban from the project.
+**Please note** that using non-English as an attempt to circumvent our [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) will be an immediate, and possibly indefinite, ban from the project.

 ## [Pull Requests](https://electronjs.org/docs/development/pull-requests)

--- a/24
+++ b/24
@@ -1,12 +1,28 @@
-gclient_gn_args_from = 'src'
+gclient_gn_args_file = 'src/build/config/gclient_args.gni'
+gclient_gn_args = [
+  'build_with_chromium',
+  'checkout_android',
+  'checkout_android_native_support',
+  'checkout_libaom',
+  'checkout_nacl',
+  'checkout_pgo_profiles',
+  'checkout_oculus_sdk',
+  'checkout_openxr',
+  'checkout_google_benchmark',
+  'mac_xcode_version',
+  'generate_location_tags',
+]

 vars = {
  'chromium_version':
-    '110.0.5481.208',
+    '95.0.4629.0',
  'node_version':
-    'v18.12.1',
+    'v16.8.0',
  'nan_version':
-    '16fa32231e2ccd89d2804b3f765319128b20c4ac',
+    # The following commit hash of NAN is v2.14.2 with *only* changes to the
+    # test suite. This should be updated to a specific tag when one becomes
+    # available.
+    '65b32af46e9d7fab2e4ff657751205b3865f4920',
  'squirrel.mac_version':
    '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',

--- a/1
+++ b/1
@@ -0,0 +1 @@
+16.0.0-nightly.20210901
--- a/README.md
+++ b/README.md
@@ -1,22 +1,22 @@
 [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)

-[![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/main.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/main)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/main?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/main)
-[![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.gg/electronjs)
+[![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/master.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/master)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/master?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/master)
+[![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.com/invite/electron)

 :memo: Available Translations: 🇨🇳 🇧🇷 🇪🇸 🇯🇵 🇷🇺 🇫🇷 🇺🇸 🇩🇪.
-View these docs in other languages on our [Crowdin](https://crowdin.com/project/electron) project.
+View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).

 The Electron framework lets you write cross-platform desktop applications
 using JavaScript, HTML and CSS. It is based on [Node.js](https://nodejs.org/) and
 [Chromium](https://www.chromium.org) and is used by the [Atom
 editor](https://github.com/atom/atom) and many other [apps](https://electronjs.org/apps).

-Follow [@electronjs](https://twitter.com/electronjs) on Twitter for important
+Follow [@ElectronJS](https://twitter.com/electronjs) on Twitter for important
 announcements.

 This project adheres to the Contributor Covenant
-[code of conduct](https://github.com/electron/electron/tree/main/CODE_OF_CONDUCT.md).
+[code of conduct](https://github.com/electron/electron/tree/master/CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code. Please report unacceptable
 behavior to [coc@electronjs.org](mailto:coc@electronjs.org).

@@ -34,17 +34,6 @@ For more installation options and troubleshooting tips, see
 [installation](docs/tutorial/installation.md). For info on how to manage Electron versions in your apps, see
 [Electron versioning](docs/tutorial/electron-versioning.md).

-## Platform support
-
-Each Electron release provides binaries for macOS, Windows, and Linux.
-
-* macOS (High Sierra and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
-* Windows (Windows 10 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8. Support for Windows 7, 8 and 8.1 was [removed in Electron 23, in line with Chromium's Windows deprecation policy](https://www.electronjs.org/blog/windows-7-to-8-1-deprecation-notice).
-* Linux: The prebuilt binaries of Electron are built on Ubuntu 20.04. They have also been verified to work on:
-  * Ubuntu 14.04 and newer
-  * Fedora 24 and newer
-  * Debian 8 and newer
-
 ## Quick start & Electron Fiddle

 Use [`Electron Fiddle`](https://github.com/electron/fiddle)
@@ -65,10 +54,12 @@ npm start

 ## Resources for learning Electron

-* [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
+- [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

 ## Programmatic usage

@@ -89,15 +80,11 @@ const child = proc.spawn(electron)

 ### Mirrors

-* [China](https://npmmirror.com/mirrors/electron/)
+- [China](https://npm.taobao.org/mirrors/electron)

-See the [Advanced Installation Instructions](https://www.electronjs.org/docs/latest/tutorial/installation#mirror) to learn how to use a custom mirror.
+## Documentation Translations

-## Documentation translations
-
-We crowdsource translations for our documentation via [Crowdin](https://crowdin.com/project/electron).
-We currently accept translations for Chinese (Simplified), French, German, Japanese, Portuguese,
-Russian, and Spanish.
+Find documentation translations in [electron/i18n](https://github.com/electron/i18n).

 ## Contributing

@@ -106,10 +93,10 @@ If you are interested in reporting/fixing issues and contributing directly to th
 ## Community

 Info on reporting bugs, getting help, finding third-party tools and sample apps,
-and more can be found on the [Community page](https://www.electronjs.org/community).
+and more can be found in the [support document](docs/tutorial/support.md#finding-support).

 ## License

-[MIT](https://github.com/electron/electron/blob/main/LICENSE)
+[MIT](https://github.com/electron/electron/blob/master/LICENSE)

-When using Electron logos, make sure to follow [OpenJS Foundation Trademark Policy](https://openjsf.org/wp-content/uploads/sites/84/2021/01/OpenJS-Foundation-Trademark-Policy-2021-01-12.docx.pdf).
+When using the Electron or other GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,7 +2,7 @@

 The Electron team and community take security bugs in Electron seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.

-To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/electron/electron/security/advisories/new) tab.
+To report a security issue, email [security@electronjs.org](mailto:security@electronjs.org) and include the word "SECURITY" in the subject line.

 The Electron team will send a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.

@@ -10,7 +10,7 @@ Report security bugs in third-party modules to the person or team maintaining th

 ## The Electron Security Notification Process

-For context on Electron's security notification process, please see the [Notifications](https://github.com/electron/governance/blob/main/wg-security/membership-and-notifications.md#notifications) section of the Security WG's [Membership and Notifications](https://github.com/electron/governance/blob/main/wg-security/membership-and-notifications.md) Governance document.
+For context on Electron's security notification process, please see the [Notifications](https://github.com/electron/governance/blob/master/wg-security/membership-and-notifications.md#notifications) section of the Security WG's [Membership and Notifications](https://github.com/electron/governance/blob/master/wg-security/membership-and-notifications.md) Governance document.

 ## Learning More About Security

--- a/appveyor-bake.yml
+++ b/appveyor-bake.yml
@@ -1,107 +0,0 @@
-# The config is used to bake appveyor images, not for running CI jobs.
-# The config expects the following environment variables to be set:
-#  - "APPVEYOR_BAKE_IMAGE" e.g. 'electron-99.0.4767.0'. Name of the image to be baked.
-#      Typically named after the Chromium version on which the image is built.
-#      This can be set dynamically in the prepare-appveyor script.
-
-version: 1.0.{build}
-build_cloud: electronhq-16-core
-image: e-110.0.5481.208
-environment:
-  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
-  ELECTRON_OUT_DIR: Default
-  ELECTRON_ENABLE_STACK_DUMPING: 1
-  MOCHA_REPORTER: mocha-multi-reporters
-  MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
-  GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-  PYTHONIOENCODING: UTF-8
-
-# The following lines are needed when baking from a completely new image (eg MicrosoftWindowsServer:WindowsServer:2019-Datacenter:latest via image: base-windows-server2019)
-# init:
-#   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-#   - appveyor version
-#   - ps: $ErrorActionPreference = 'Stop'
-#   - ps: 'Write-Host "OS Build: $((Get-CimInstance Win32_OperatingSystem).BuildNumber)"'
-
-# clone_folder: '%USERPROFILE%\image-bake-scripts'
-
-# clone_script:  
-#   - ps: Invoke-WebRequest "https://github.com/appveyor/build-images/archive/1f90d94e74c8243c909a09b994e527584dfcb838.zip" -OutFile "$env:temp\scripts.zip"
-#   - ps: Expand-Archive -Path "$env:temp\scripts.zip" -DestinationPath "$env:temp\scripts" -Force
-#   - ps: Copy-Item -Path "$env:temp\scripts\build-images-1f90d94e74c8243c909a09b994e527584dfcb838\scripts\Windows\*" -Destination $env:APPVEYOR_BUILD_FOLDER -Recurse  
-
-build_script:
-# The following lines are needed when baking from a completely new image (eg MicrosoftWindowsServer:WindowsServer:2019-Datacenter:latest via image: base-windows-server2019)
-  # - ps: .\init_server.ps1
-  # - ps: .\extend_system_volume.ps1
-
-  # # Restart VM
-  # - ps: Start-Sleep -s 5; Restart-Computer
-  # - ps: Start-Sleep -s 5
-
-  # - appveyor version
-  # - ps: .\install_path_utils.ps1
-  # - ps: .\install_powershell_core.ps1
-  # - ps: .\install_powershell_get.ps1
-  # - ps: .\install_7zip.ps1
-  # - ps: .\install_chocolatey.ps1
-  # - ps: .\install_webpi.ps1
-  # - ps: .\install_nuget.ps1
-  # - ps: .\install_pstools.ps1
-
-  # - ps: .\install_git.ps1
-  # - ps: .\install_git_lfs.ps1
-
-  # # Restart VM
-  # - ps: Start-Sleep -s 5; Restart-Computer
-  # - ps: Start-Sleep -s 5
-# END LINES FOR COMPLETELY NEW IMAGE
-
-  - git config --global core.longpaths true
-  - ps: >-
-      if (-not (Test-Path -Path C:\projects\src)) {
-        New-Item -Path C:\projects\src -ItemType Directory
-      }
-  - cd C:\projects\
-  - git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/electron/electron.git C:\projects\src\electron
-  - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-  - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
-  - update_depot_tools.bat
-  # Uncomment the following line if windows deps change
-  # - src\electron\script\setup-win-for-dev.bat
-  - >-
-      gclient config
-      --name "src\electron"
-      --unmanaged
-      %GCLIENT_EXTRA_ARGS%
-      "https://github.com/electron/electron"
-  - ps: cd src\electron
-  - ps: node script\generate-deps-hash.js
-  - ps: $depshash = Get-Content .\.depshash -Raw
-  - ps: Copy-Item -path .\.depshash -destination ..\.depshash
-  - ps: cd ..\..
-  - gclient sync --with_branch_heads --with_tags --nohooks
-  - ps: regsvr32 /s "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\DIA SDK\bin\amd64\msdia140.dll"
-
-# The following lines are needed when baking from a completely new image (eg MicrosoftWindowsServer:WindowsServer:2019-Datacenter:latest via image: base-windows-server2019)
-  # # Restart VM
-  # - ps: Start-Sleep -s 5; Restart-Computer 
-  # - ps: Start-Sleep -s 5
-
-  # - cd %USERPROFILE%\image-bake-scripts
-  # - appveyor version
-  # - ps: .\optimize_dotnet_runtime.ps1
-  # - ps: .\disable_windows_background_services.ps1
-  # - ps: .\enforce_windows_firewall.ps1
-  # - ps: .\cleanup_windows.ps1  
-# END LINES FOR COMPLETELY NEW IMAGE  
-on_image_bake:
-  - ps: >-
-      echo "Baking image: $env:APPVEYOR_BAKE_IMAGE at dir $PWD"
-  - ps: Remove-Item -Recurse -Force C:\projects\depot_tools
-  - ps: Remove-Item -Recurse -Force C:\projects\src\electron
-# Uncomment these lines and set APPVEYOR_RDP_PASSWORD in project settings to enable RDP after bake is done
-# # on_finish:
-#   - ps: >-
-#        $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
--- a/appveyor-woa.yml
+++ b/appveyor-woa.yml
@@ -1,279 +0,0 @@
-# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor.yml 
-# IF APPLICABLE!!!! 
-#
-#
-# The config expects the following environment variables to be set:
-#  - "GN_CONFIG" Build type. One of {'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
-#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordingly
-#      if you pass a custom value for 'target_cpu'.
-#  - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
-#  - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
-#      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "TARGET_ARCH" value.
-#  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
-#      Is used in some publishing scripts, but does NOT affect the Electron binary.
-#      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
-#  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
-#      Otherwise the release will be uploaded to the GitHub Releases.
-#      (The value is only checked if "ELECTRON_RELEASE" is defined.)
-#
-# The publishing scripts expect access tokens to be defined as env vars,
-# but those are not covered here.
-#
-# AppVeyor docs on variables:
-# https://www.appveyor.com/docs/environment-variables/
-# https://www.appveyor.com/docs/build-configuration/#secure-variables
-# https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
-
-version: 1.0.{build}
-build_cloud: electronhq-16-core
-image: e-110.0.5481.208
-environment:
-  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
-  ELECTRON_OUT_DIR: Default
-  ELECTRON_ENABLE_STACK_DUMPING: 1
-  ELECTRON_ALSO_LOG_TO_STDERR: 1
-  MOCHA_REPORTER: mocha-multi-reporters
-  MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
-  GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-  PYTHONIOENCODING: UTF-8
-
-  matrix:
-
-    - job_name: Build Arm on X64 Windows
-    - job_name: Test On Windows On Arm Hardware
-      job_depends_on: Build Arm on X64 Windows
-      APPVEYOR_BUILD_WORKER_IMAGE: base-woa
-      APPVEYOR_BUILD_WORKER_CLOUD: electronhq-woa
-
-clone_folder: C:\projects\src\electron
-
-skip_branch_with_pr: true
-
-# the first failed job cancels other jobs and fails entire build
-matrix:
-  fast_finish: true
-
-for:
-
-  - matrix:
-      only:
-        - job_name: Build Arm on X64 Windows
-
-    build_script:
-      - ps: |
-          node script/yarn.js install --frozen-lockfile
-          node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-          if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
-          }
-          $global:LASTEXITCODE = 0
-      - cd ..
-      - ps: Write-Host "Building $env:GN_CONFIG build"
-      - git config --global core.longpaths true
-      - ps: >-
-          if (Test-Path -Path "$pwd\depot_tools") {
-            Remove-Item -Recurse -Force $pwd\depot_tools
-          }
-      - ps: >-
-          if (Test-Path -Path "$pwd\build-tools") {
-            Remove-Item -Recurse -Force $pwd\build-tools
-          }
-      - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
-      - ps: >-
-          if (Test-Path -Path "$pwd\src\electron") {
-            Remove-Item -Recurse -Force $pwd\src\electron
-          }
-      - ps: >-
-          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
-      - ps: >-
-          node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-      - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-      - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-      - cd ..\..
-      - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
-      - ps: >-
-          if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
-            if ($goma_login -eq 'Login as Fermi Planck') {
-              Write-warning "Goma authentication is correct";
-            } else {
-              Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
-              $host.SetShouldExit(1)
-            }
-          }
-      - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
-      - ps: >-
-          if ($env:GN_CONFIG -ne 'release') {
-            $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-          }
-      - gclient config --name "src\electron" --unmanaged %GCLIENT_EXTRA_ARGS% "https://github.com/electron/electron"
-      # Patches are applied in the image bake. Check depshash to see if patches have changed. 
-      - ps: $env:RUN_GCLIENT_SYNC="false"
-      - ps: $depshash_baked = Get-Content .\src\.depshash -Raw
-      - ps: cd src\electron
-      - ps: node script\generate-deps-hash.js
-      - ps: $depshash = Get-Content .\.depshash -Raw
-      - ps: cd ..\..
-      - ps: >-
-          if ($depshash_baked -ne $depshash) {
-            $env:RUN_GCLIENT_SYNC="true"
-          }
-      - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags ) else ( gclient runhooks )
-      - cd src
-      - ps: $env:PATH="$pwd\third_party\ninja;$env:PATH"
-      - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn
-      - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
-      - gn check out/Default //electron:electron_lib
-      - gn check out/Default //electron:electron_app
-      - 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 )
-      - 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
-      - gn desc out/Default v8:run_mksnapshot_default args > out/Default/default_mksnapshot_args
-      # Remove unused args from mksnapshot_args
-      - ps: >-
-          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content out/Default/mksnapshot_args
-      - ninja -C out/Default electron:electron_mksnapshot_zip
-      - cd out\Default
-      - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
-      - cd ..\..
-      - 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
-      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
-      - ps: >-
-          Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
-      - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-      - 7z a node_headers.zip out\Default\gen\node_headers
-      - ps: >-
-          if ($env:GN_CONFIG -eq 'release') {
-            # Needed for msdia140.dll on 64-bit windows
-            $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
-            ninja -C out/Default electron:electron_symbols
-          }
-      - ps: >-
-          if ($env:GN_CONFIG -eq 'release') {
-            python3 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
-          }
-      - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
-
-    deploy_script:
-      - cd electron
-      - ps: >-
-          if (Test-Path Env:\ELECTRON_RELEASE) {
-            if (Test-Path Env:\UPLOAD_TO_STORAGE) {
-              Write-Output "Uploading Electron release distribution to azure"
-              & python3 script\release\uploaders\upload.py --verbose --upload_to_storage
-            } else {
-              Write-Output "Uploading Electron release distribution to github releases"
-              & python3 script\release\uploaders\upload.py --verbose
-            }
-          }
-    on_finish:
-      # Uncomment this lines to enable RDP
-      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - cd C:\projects\src
-      - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
-      - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
-      - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
-      - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
-      - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
-      - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
-      - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
-      - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
-      - ps: >-
-          if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
-            appveyor-retry appveyor PushArtifact pdb.zip
-          }
-  - matrix:
-      only:
-        - job_name: Test On Windows On Arm Hardware
-
-    environment:
-        IGNORE_YARN_INSTALL_ERROR: 1
-        ELECTRON_TEST_RESULTS_DIR: junit
-        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-        MOCHA_REPORTER: mocha-multi-reporters
-        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-
-    build_script:
-      - ps: |
-          node script/yarn.js install --frozen-lockfile
-          node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-          if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
-          }
-          $global:LASTEXITCODE = 0
-      - cd ..
-      - mkdir out\Default
-      - cd ..
-      - ps: |
-          # Download build artifacts
-          $apiUrl = 'https://ci.appveyor.com/api'
-          $build_info = Invoke-RestMethod -Method Get -Uri "$apiUrl/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/builds/$env:APPVEYOR_BUILD_ID"
-          $artifacts_to_download = @('dist.zip','ffmpeg.zip','node_headers.zip','pdb.zip','electron.lib')
-          foreach ($job in $build_info.build.jobs) {
-            if ($job.name -eq "Build Arm on X64 Windows") {
-              $jobId = $job.jobId
-              foreach($artifact_name in $artifacts_to_download) {
-                if ($artifact_name -eq 'shell_browser_ui_unittests.exe' -Or $artifact_name -eq 'electron.lib') {
-                  $outfile = "src\out\Default\$artifact_name"
-                } else {
-                  $outfile = $artifact_name
-                }
-                Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
-              }
-            }
-          }
-      - ps: |
-          $out_default_zips = @('dist.zip','pdb.zip')
-          foreach($zip_name in $out_default_zips) {
-            7z x -y -osrc\out\Default $zip_name
-          }
-      - ps: 7z x -y -osrc\out\ffmpeg ffmpeg.zip
-      - ps: 7z x -y -osrc node_headers.zip
-
-    test_script:
-      # Workaround for https://github.com/appveyor/ci/issues/2420
-      - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
-      - ps: |
-          cd src
-          New-Item .\out\Default\gen\node_headers\Release -Type directory
-          Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
-      - set npm_config_nodedir=%cd%\out\Default\gen\node_headers          
-      - set npm_config_arch=arm64
-      - cd electron
-      # Explicitly set npm_config_arch because the .env doesn't persist
-      - ps: >-
-          if ($env:TARGET_ARCH -eq 'ia32') {
-            $env:npm_config_arch = "ia32"
-          }
-      - echo Running main test suite & node script/yarn test  --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion
-      - cd ..
-      - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-    
-    on_finish:
-      # Uncomment these lines to enable RDP
-      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,13 +1,9 @@
-# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor-woa.yml 
-# IF APPLICABLE!!!! 
-#
-#
 # The config expects the following environment variables to be set:
 #  - "GN_CONFIG" Build type. One of {'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
-#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordingly
+#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordningly
 #      if you pass a custom value for 'target_cpu'.
 #  - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
 #  - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
@@ -15,8 +11,8 @@
 #  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
-#  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
-#      Otherwise the release will be uploaded to the GitHub Releases.
+#  - "UPLOAD_TO_S3" Set it to '1' upload a release to the S3 bucket.
+#      Otherwise the release will be uploaded to the Github Releases.
 #      (The value is only checked if "ELECTRON_RELEASE" is defined.)
 #
 # The publishing scripts expect access tokens to be defined as env vars,
@@ -27,253 +23,211 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables

+# Uncomment these lines to enable RDP
+#on_finish:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 version: 1.0.{build}
-build_cloud: electronhq-16-core
-image: e-110.0.5481.208
+build_cloud: electron-16-core
+image: vs2019bt-16.6.2
 environment:
-  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
+  GIT_CACHE_PATH: C:\Users\electron\libcc_cache
  ELECTRON_OUT_DIR: Default
  ELECTRON_ENABLE_STACK_DUMPING: 1
-  ELECTRON_ALSO_LOG_TO_STDERR: 1
  MOCHA_REPORTER: mocha-multi-reporters
  MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
  GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-  PYTHONIOENCODING: UTF-8
+notifications:
+  - provider: Webhook
+    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
+    method: POST
+    headers:
+      x-mission-control-secret:
+        secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: false
+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

-  matrix:
-
-    - job_name: Build
-    - job_name: Test
-      job_depends_on: Build
-
-clone_folder: C:\projects\src\electron
-
-skip_branch_with_pr: true
-
-# the first failed job cancels other jobs and fails entire build
-matrix:
-  fast_finish: true
-
-for:
-
-  - matrix:
-      only:
-        - job_name: Build
-
-    build_script:
-      - ps: |
-          node script/yarn.js install --frozen-lockfile
-          node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-          if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
-          }
-          $global:LASTEXITCODE = 0
-      - cd ..
-      - ps: Write-Host "Building $env:GN_CONFIG build"
-      - git config --global core.longpaths true
-      - ps: >-
-          if (Test-Path -Path "$pwd\depot_tools") {
-            Remove-Item -Recurse -Force $pwd\depot_tools
-          }
-      - ps: >-
-          if (Test-Path -Path "$pwd\build-tools") {
-            Remove-Item -Recurse -Force $pwd\build-tools
-          }
-      - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
-      - ps: >-
-          if (Test-Path -Path "$pwd\src\electron") {
-            Remove-Item -Recurse -Force $pwd\src\electron
-          }
-      - ps: >-
-          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
-      - ps: >-
-          node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-      - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-      - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-      - cd ..\..
-      - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
-      - ps: >-
-          if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
-            if ($goma_login -eq 'Login as Fermi Planck') {
-              Write-warning "Goma authentication is correct";
-            } else {
-              Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
-              $host.SetShouldExit(1)
-            }
-          }
-      - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
-      - ps: >-
-          if ($env:GN_CONFIG -ne 'release') {
-            $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-          }
-      - gclient config --name "src\electron" --unmanaged %GCLIENT_EXTRA_ARGS% "https://github.com/electron/electron"
-      # Patches are applied in the image bake. Check depshash to see if patches have changed. 
-      - ps: $env:RUN_GCLIENT_SYNC="false"
-      - ps: $depshash_baked = Get-Content .\src\.depshash -Raw
-      - ps: cd src\electron
-      - ps: node script\generate-deps-hash.js
-      - ps: $depshash = Get-Content .\.depshash -Raw
-      - ps: cd ..\..
-      - ps: >-
-          if ($depshash_baked -ne $depshash) {
+        $result = node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
+        Write-Output $result
+        if ($result.ExitCode -eq 0) {
+          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
+        }
+      }
+  - echo "Building $env:GN_CONFIG build"
+  - git config --global core.longpaths true
+  - cd ..
+  - mkdir src
+  - update_depot_tools.bat
+  - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
+  - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
+  - ps: >-
+      if ($env:GN_CONFIG -ne 'release') {
+        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+      }
+  - >-
+      gclient config
+      --name "src\electron"
+      --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 "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags ) else ( gclient runhooks )
-      - cd src
-      - ps: $env:PATH="$pwd\third_party\ninja;$env:PATH"
-      - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn
-      - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
-      - gn check out/Default //electron:electron_lib
-      - gn check out/Default //electron:electron_app
-      - 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 )
-      - 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
-      - gn desc out/Default v8:run_mksnapshot_default args > out/Default/default_mksnapshot_args
-      # Remove unused args from mksnapshot_args
-      - ps: >-
-          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content out/Default/mksnapshot_args
-      - ninja -C out/Default electron:electron_mksnapshot_zip
-      - cd out\Default
-      - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
-      - cd ..\..
-      - 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
-      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
-      - ps: >-
-          Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
-      - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-      - 7z a node_headers.zip out\Default\gen\node_headers
-      - ps: >-
-          if ($env:GN_CONFIG -eq 'release') {
-            # Needed for msdia140.dll on 64-bit windows
-            $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
-            ninja -C out/Default electron:electron_symbols
-          }
-      - ps: >-
-          if ($env:GN_CONFIG -eq 'release') {
-            python3 electron\script\zip-symbols.py
-            appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+            if ($env:TARGET_ARCH -ne 'ia32') {
+              # only save on x64/woa to avoid contention saving
+              $env:SAVE_GCLIENT_SRC="true"
+            }
          } else {
-            # It's useful to have pdb files when debugging testing builds that are
-            # built on CI.
-            7z a pdb.zip out\Default\*.pdb
+            # update angle
+            cd src\third_party\angle
+            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
+            git fetch
+            cd ..\..\..
          }
-      - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
-
-    deploy_script:
-      - cd electron
-      - ps: >-
-          if (Test-Path Env:\ELECTRON_RELEASE) {
-            if (Test-Path Env:\UPLOAD_TO_STORAGE) {
-              Write-Output "Uploading Electron release distribution to azure"
-              & python3 script\release\uploaders\upload.py --verbose --upload_to_storage
-            } else {
-              Write-Output "Uploading Electron release distribution to github releases"
-              & python3 script\release\uploaders\upload.py --verbose
-            }
+        } 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"
          }
-    on_finish:
-      # Uncomment this lines to enable RDP
-      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - cd C:\projects\src
-      - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
-      - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
-      - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
-      - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
-      - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
-      - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
-      - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
-      - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
-      - ps: >-
-          if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
-            appveyor-retry appveyor PushArtifact pdb.zip
-          }
-  - matrix:
-      only:
-        - job_name: Test
-
-    init:
-      - ps: |
-          if ($env:RUN_TESTS -ne 'true') {
-            Write-warning "Skipping tests for $env:APPVEYOR_PROJECT_NAME"; Exit-AppveyorBuild
-          }
-    build_script:
-      - ps: |
-          node script/yarn.js install --frozen-lockfile
-          node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-          if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
-          }
-          $global:LASTEXITCODE = 0
-      - cd ..
-      - mkdir out\Default
-      - cd ..
-      - ps: |
-          # Download build artifacts
-          $apiUrl = 'https://ci.appveyor.com/api'
-          $build_info = Invoke-RestMethod -Method Get -Uri "$apiUrl/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/builds/$env:APPVEYOR_BUILD_ID"
-          $artifacts_to_download = @('dist.zip','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib')
-          foreach ($job in $build_info.build.jobs) {
-            if ($job.name -eq "Build") {
-              $jobId = $job.jobId
-              foreach($artifact_name in $artifacts_to_download) {
-                if ($artifact_name -eq 'shell_browser_ui_unittests.exe' -Or $artifact_name -eq 'electron.lib') {
-                  $outfile = "src\out\Default\$artifact_name"
-                } else {
-                  $outfile = $artifact_name
-                }
-                Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
-              }
-            }
-          }
-      - ps: |
-          $out_default_zips = @('dist.zip','chromedriver.zip','mksnapshot.zip')
-          foreach($zip_name in $out_default_zips) {
-            7z x -y -osrc\out\Default $zip_name
-          }
-      - ps: 7z x -y -osrc\out\ffmpeg ffmpeg.zip
-      - ps: 7z x -y -osrc node_headers.zip
-
-    test_script:
-      # Workaround for https://github.com/appveyor/ci/issues/2420
-      - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
-      - ps: |
-          cd src
-          New-Item .\out\Default\gen\node_headers\Release -Type directory
-          Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
-      - cd electron
-      # Explicitly set npm_config_arch because the .env doesn't persist
-      - ps: >-
-          if ($env:TARGET_ARCH -eq 'ia32') {
-            $env:npm_config_arch = "ia32"
-          }
-      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log
-      - echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log
-      - cd ..
-      - 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"
-      - echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
-      - echo "Done verifying mksnapshot"
-      - echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd%
-      - echo "Done verifying chromedriver"
-    
-    on_finish:
-      # Uncomment these lines to enable RDP
-      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
+        }
+      }
+  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync )
+  - ps: >-
+      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
+        # archive current source for future use 
+        # only run on x64/woa to avoid contention saving
+        $(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)
+        if ($LASTEXITCODE -ne 0) {
+          Write-warning "Could not save source to shared drive; continuing anyway"
+        }
+        # build time generation of file gen/angle/angle_commit.h depends on
+        # third_party/angle/.git
+        # https://chromium-review.googlesource.com/c/angle/angle/+/2074924       
+        $(7z a $zipfile src\third_party\angle\.git)
+        if ($LASTEXITCODE -ne 0) {
+          Write-warning "Failed to add third_party\angle\.git; continuing anyway"
+        }
+      }
+  - ps: >-
+      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
+  - ps: >-
+      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
+  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
+  - cd ..
+  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
+  - cd src
+  - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
+  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
+  - gn check out/Default //electron:electron_lib
+  - gn check out/Default //electron:electron_app
+  - 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 )
+  - 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
+  - gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
+  - ninja -C out/Default electron:electron_mksnapshot_zip
+  - cd out\Default
+  - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
+  - cd ..\..
+  - 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
+  - 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
+        $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
+        ninja -C out/Default electron:electron_symbols
+      }
+  - 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
+      }
+  - 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")) {
+        $env:RUN_TESTS="true"
+      }
+  - ps: >-
+      if ($env:RUN_TESTS -eq 'true') {
+        New-Item .\out\Default\gen\node_headers\Release -Type directory
+        Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
+      } else {
+        echo "Skipping tests for $env:GN_CONFIG build"
+      }
+  - cd electron
+  # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
+  - 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" ( 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: >-
+      if (Test-Path Env:\ELECTRON_RELEASE) {
+        if (Test-Path Env:\UPLOAD_TO_S3) {
+          Write-Output "Uploading Electron release distribution to s3"
+          & python script\release\uploaders\upload.py --verbose --upload_to_s3
+        } else {
+          Write-Output "Uploading Electron release distribution to github releases"
+          & python script\release\uploaders\upload.py --verbose
+        }
+      } 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
+      }
--- a/azure-pipelines-arm.yml
+++ b/azure-pipelines-arm.yml
@@ -0,0 +1,121 @@
+steps:
+- task: CopyFiles@2
+  displayName: 'Copy Files to: src/electron'
+  inputs:
+    TargetFolder: src/electron
+
+- bash: |
+    cd src/electron
+    node script/yarn.js install --frozen-lockfile
+  displayName: 'Yarn install'
+
+- bash: |
+    export ZIP_DEST=$PWD/src/out/Default
+    echo "##vso[task.setvariable variable=ZIP_DEST]$ZIP_DEST"
+    mkdir -p $ZIP_DEST
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
+    cd $ZIP_DEST
+    unzip -o dist.zip
+    xattr -cr Electron.app    
+  displayName: 'Download and unzip dist files for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+    export FFMPEG_ZIP_DEST=$PWD/src/out/ffmpeg
+    mkdir -p $FFMPEG_ZIP_DEST
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=ffmpeg.zip --dest=$FFMPEG_ZIP_DEST
+    cd $FFMPEG_ZIP_DEST
+    unzip -o ffmpeg.zip
+  displayName: 'Download and unzip ffmpeg for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+   export NODE_HEADERS_DEST=$PWD/src/out/Default/gen
+   mkdir -p $NODE_HEADERS_DEST
+   cd src/electron
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=node_headers.tar.gz --dest=$NODE_HEADERS_DEST
+   cd $NODE_HEADERS_DEST
+   tar xzf node_headers.tar.gz
+  displayName: 'Download and untar node header files for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+   export CROSS_ARCH_SNAPSHOTS=$PWD/src/out/Default/cross-arch-snapshots
+   mkdir -p $CROSS_ARCH_SNAPSHOTS
+   cd src/electron
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/snapshot_blob.bin --dest=$CROSS_ARCH_SNAPSHOTS
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.arm64.bin --dest=$CROSS_ARCH_SNAPSHOTS
+  displayName: 'Download cross arch snapshot files'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+    cd src
+    export ELECTRON_OUT_DIR=Default
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners main)
+  displayName: 'Run Electron main tests'
+  timeoutInMinutes: 20
+  env:
+    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+
+- bash: |
+    cd src
+    export ELECTRON_OUT_DIR=Default
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners remote)
+  displayName: 'Run Electron remote tests'
+  timeoutInMinutes: 20
+  condition: succeededOrFailed()
+  env:
+    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+
+- bash: |
+    cd src
+    python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
+  displayName: Verify non proprietary ffmpeg
+  timeoutInMinutes: 5
+  condition: succeededOrFailed()
+  env:
+    TARGET_ARCH: arm64
+
+- bash: |
+    cd src
+    echo Verify cross arch snapshot
+    python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/out/Default/cross-arch-snapshots
+  displayName: Verify cross arch snapshot
+  timeoutInMinutes: 5
+  condition: succeededOrFailed()
+
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFiles: '*.xml'
+
+    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
+
+  condition: succeededOrFailed()
+
+- bash: killall Electron || echo "No Electron processes left running"
+  displayName: 'Kill processes left running from last test run'
+  condition: always()
+
+- bash: |
+    rm -rf ~/Library/Application\ Support/Electron*
+    rm -rf ~/Library/Application\ Support/electron*
+  displayName: 'Delete user app data directories'
+  condition: always()
+
+- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
+  displayName: 'Clean Agent Directories'
+
+  condition: always()
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -0,0 +1,129 @@
+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: |
+    try {
+      $localArtifactPath = "$pwd\src\pdb.zip"
+      $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/pdb.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 pdb.zip
+    } catch {
+      Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
+    } finally {
+      $global:LASTEXITCODE = 0
+    }
+  displayName: 'Download pdb files for detailed stacktraces'
+  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 --runners=main --runTestFilesSeperately --enable-logging --disable-features=CalculateNativeWinOcclusion
+  displayName: 'Run Electron Main process tests'
+  env:
+    ELECTRON_ENABLE_STACK_DUMPING: true
+    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
+
+- script: |
+    cd src
+    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+    set npm_config_arch=arm64
+    cd electron
+    node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
+  displayName: 'Run Electron Remote based 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
+  condition: always()    
+
+- 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 "msedge*" | Stop-Process
+  displayName: 'Kill processes left running from last test run'
+  condition: always()
+
+- powershell: |
+    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
+  displayName: 'Delete user app data directories'
+  condition: always()
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,49 +2,38 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 113
+node_module_version = 89

 v8_promise_internal_field_count = 1
+v8_typed_array_max_size_in_heap = 0
 v8_embedder_string = "-electron.0"

 # TODO: this breaks mksnapshot
 v8_enable_snapshot_native_code_counters = false

-# TODO(codebytere): remove when Node.js handles https://chromium-review.googlesource.com/c/v8/v8/+/3211575
-v8_scriptormodule_legacy_lifetime = true
-
-# we use this api
-v8_enable_javascript_promise_hooks = true
-
 enable_cdm_host_verification = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"

-enable_printing = true
-
-# Removes DLLs from the build, which are only meant to be used for Chromium development.
-# See https://github.com/electron/electron/pull/17985
+enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false

+# This breaks native node modules
+libcxx_abi_unstable = false
+
 # These are disabled because they cause the zip manifest to differ between
 # testing and release builds.
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
 enable_pseudolocales = false

+is_cfi = false
+
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true

-# CET shadow stack is incompatible with v8, until v8 is CET compliant
-# enabling this flag causes main process crashes where CET is enabled
-# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=357
 enable_cet_shadow_stack = false

-# For similar reasons, disable CFI, which is not well supported in V8.
-# Chromium doesn't have any problems with this because they do not run
-# V8 in the browser process.
-# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
-is_cfi = false
-
-# TODO: fix this once sysroots have been updated.
-use_qt = false
+# TODO(deepak1556): remove once https://bugs.chromium.org/p/chromium/issues/detail?id=1241610
+# is fixed.
+enable_blink_heap_use_v8_oilpan = false
--- a/build/args/native_tests.gn
+++ b/build/args/native_tests.gn
@@ -1,4 +1,4 @@
-root_extra_deps = [ "//electron/spec-chromium:spec" ]
+root_extra_deps = [ "//electron/spec" ]

 dcheck_always_on = true
 is_debug = false
--- a/build/asar.gni
+++ b/build/asar.gni
@@ -1,22 +1,33 @@
-template("node_action") {
-  assert(defined(invoker.script), "Need script path to run")
-  assert(defined(invoker.args), "Need script arguments")
+import("node.gni")

+# TODO(MarshallOfSound): Move to electron/node, this is the only place it is used now
+# Run an action with a given working directory. Behaves identically to the
+# action() target type, with the exception that it changes directory before
+# running the script.
+#
+# Parameters:
+#   cwd [required]: Directory to change to before running the script.
+template("chdir_action") {
  action(target_name) {
    forward_variables_from(invoker,
+                           "*",
                           [
-                             "deps",
-                             "public_deps",
-                             "sources",
-                             "inputs",
-                             "outputs",
+                             "script",
+                             "args",
                           ])
-    if (!defined(inputs)) {
-      inputs = []
+    assert(defined(cwd), "Need cwd in $target_name")
+    script = "//electron/build/run-in-dir.py"
+    if (defined(sources)) {
+      sources += [ invoker.script ]
+    } else {
+      assert(defined(inputs))
+      inputs += [ invoker.script ]
    }
-    inputs += [ invoker.script ]
-    script = "//electron/build/run-node.py"
-    args = [ rebase_path(invoker.script) ] + invoker.args
+    args = [
+      rebase_path(cwd),
+      rebase_path(invoker.script),
+    ]
+    args += invoker.args
  }
 }

@@ -46,42 +57,4 @@ template("asar") {
             rebase_path(outputs[0]),
           ]
  }
-
-  node_action(target_name + "_header_hash") {
-    invoker_out = invoker.outputs
-
-    deps = [ ":" + invoker.target_name ]
-    sources = invoker.outputs
-
-    script = "//electron/script/gn-asar-hash.js"
-    outputs = [ "$target_gen_dir/asar_hashes/$target_name.hash" ]
-
-    args = [
-      rebase_path(invoker_out[0]),
-      rebase_path(outputs[0]),
-    ]
-  }
-}
-
-template("asar_hashed_info_plist") {
-  node_action(target_name) {
-    assert(defined(invoker.plist_file),
-           "Need plist_file to add hashed assets to")
-    assert(defined(invoker.keys), "Need keys to replace with asset hash")
-    assert(defined(invoker.hash_targets), "Need hash_targets to read hash from")
-
-    deps = invoker.hash_targets
-
-    script = "//electron/script/gn-plist-but-with-hashes.js"
-    inputs = [ invoker.plist_file ]
-    outputs = [ "$target_gen_dir/hashed_plists/$target_name.plist" ]
-    hash_files = []
-    foreach(hash_target, invoker.hash_targets) {
-      hash_files += get_target_outputs(hash_target)
-    }
-    args = [
-             rebase_path(invoker.plist_file),
-             rebase_path(outputs[0]),
-           ] + invoker.keys + rebase_path(hash_files)
-  }
 }
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -1,8 +1,26 @@
+config("build_time_executable") {
+  configs = []
+
+  if (is_electron_build && !is_component_build) {
+    # The executables which have this config applied are dependent on ffmpeg,
+    # which is always a shared library in an Electron build. However, in the
+    # non-component build, executables don't have rpath set to search for
+    # libraries in the executable's directory, so ffmpeg cannot be found. So
+    # let's make sure rpath is set here.
+    # See '//build/config/gcc/BUILD.gn' for details on the rpath setting.
+    if (is_linux) {
+      configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+    }
+
+    if (is_mac) {
+      ldflags = [ "-Wl,-rpath,@loader_path/." ]
+    }
+  }
+}
+
 # For MAS build, we force defining "MAS_BUILD".
 config("mas_build") {
  if (is_mas_build) {
-    defines = [ "IS_MAS_BUILD()=1" ]
-  } else {
-    defines = [ "IS_MAS_BUILD()=0" ]
+    defines = [ "MAS_BUILD" ]
  }
 }
--- a/build/extract_symbols.gni
+++ b/build/extract_symbols.gni
@@ -24,11 +24,7 @@ template("extract_symbols") {
    assert(defined(invoker.binary), "Need binary to dump")
    assert(defined(invoker.symbol_dir), "Need directory for symbol output")

-    if (host_os == "win" && target_cpu == "x86") {
-      dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)"
-    } else {
-      dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
-    }
+    dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
    dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") +
                       "/dump_syms$_host_executable_suffix"

--- a/build/fuses/build.py
+++ b/build/fuses/build.py
@@ -19,13 +19,17 @@ TEMPLATE_H = """
 #define FUSE_EXPORT __attribute__((visibility("default")))
 #endif

-namespace electron::fuses {
+namespace electron {
+
+namespace fuses {

 extern const volatile char kFuseWire[];

 {getters}

-}  // namespace electron::fuses
+}  // namespace fuses
+
+}  // namespace electron

 #endif  // ELECTRON_FUSES_H_
 """
@@ -33,13 +37,17 @@ extern const volatile char kFuseWire[];
 TEMPLATE_CC = """
 #include "electron/fuses.h"

-namespace electron::fuses {
+namespace electron {
+
+namespace fuses {

 const volatile char kFuseWire[] = { /* sentinel */ {sentinel}, /* fuse_version */ {fuse_version}, /* fuse_wire_length */ {fuse_wire_length}, /* fuse_wire */ {initial_config}};

 {getters}

-}  // namespace electron:fuses
+}
+
+}
 """

 with open(os.path.join(dir_path, "fuses.json5"), 'r') as f:
--- a/build/fuses/fuses.json5
+++ b/build/fuses/fuses.json5
@@ -5,8 +5,5 @@
  "run_as_node": "1",
  "cookie_encryption": "0",
  "node_options": "1",
-  "node_cli_inspect": "1",
-  "embedded_asar_integrity_validation": "0",
-  "only_load_app_from_asar": "0",
-  "load_browser_process_specific_v8_snapshot": "0"
+  "node_cli_inspect": "1"
 }
--- a/build/js2c.py
+++ b/build/js2c.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 import os
 import subprocess
@@ -8,7 +8,9 @@ TEMPLATE = """
 #include "node_native_module.h"
 #include "node_internals.h"

-namespace node::native_module {{
+namespace node {{
+
+namespace native_module {{

 {definitions}

@@ -16,7 +18,9 @@ void NativeModuleLoader::LoadEmbedderJavaScriptSource() {{
  {initializers}
 }}

-}}  // namespace node::native_module
+}}  // namespace native_module
+
+}}  // namespace node
 """

 def main():
--- a/build/mac/make_locale_dirs.py
+++ b/build/mac/make_locale_dirs.py
@@ -4,7 +4,7 @@
 # Cocoa .app bundle. The presence of these empty directories is sufficient to
 # convince Cocoa that the application supports the named localization, even if
 # an InfoPlist.strings file is not provided. Chrome uses these empty locale
-# directories for its helper executable bundles, which do not otherwise
+# directoires for its helper executable bundles, which do not otherwise
 # require any direct Cocoa locale support.

 import os
--- a/build/node.gni
+++ b/build/node.gni
@@ -0,0 +1,21 @@
+template("node_action") {
+  assert(defined(invoker.script), "Need script path to run")
+  assert(defined(invoker.args), "Need script argumets")
+
+  action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                             "sources",
+                             "inputs",
+                             "outputs",
+                           ])
+    if (!defined(inputs)) {
+      inputs = []
+    }
+    inputs += [ invoker.script ]
+    script = "//electron/build/run-node.py"
+    args = [ rebase_path(invoker.script) ] + invoker.args
+  }
+}
--- a/build/npm-run.py
+++ b/build/npm-run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import print_function
 import os
 import subprocess
--- a/build/npm.gni
+++ b/build/npm.gni
@@ -1,7 +1,7 @@
 template("npm_action") {
  assert(defined(invoker.script),
         "Need script name to run (must be defined in package.json)")
-  assert(defined(invoker.args), "Need script arguments")
+  assert(defined(invoker.args), "Need script argumets")

  action("npm_pre_flight_" + target_name) {
    inputs = [
--- a/build/profile_toolchain.py
+++ b/build/profile_toolchain.py
@@ -1,5 +1,4 @@
-from __future__ import unicode_literals
-
+from __future__ import with_statement
 import contextlib
 import sys
 import os
@@ -34,10 +33,36 @@ def calculate_hash(root):
        return CalculateHash('.', None)

 def windows_installed_software():
-    # file_path = os.path.join(os.getcwd(), 'installed_software.json')
-    # return json.loads(open('installed_software.json').read().decode('utf-8'))
-    f = open('installed_software.json', encoding='utf-8-sig')
-    return json.load(f)
+    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():
@@ -64,7 +89,7 @@ def windows_profile():

 def main(options):
    if sys.platform == 'win32':
-        with open(options.output_json, 'w') as f:
+        with open(options.output_json, 'wb') as f:
            json.dump(windows_profile(), f)
    else:
        raise OSError("Unsupported OS")
--- a/build/rules.gni
+++ b/build/rules.gni
@@ -51,7 +51,7 @@ template("compile_ib_files") {
 # Template to compile and package Mac XIB files as bundle data.
 # Arguments
 #     sources:
-#         list of string, sources to compile
+#         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.
--- a/build/strip_framework.py
+++ b/build/strip_framework.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 import os
 import subprocess
 import sys
--- a/build/templates/version_string.tmpl
+++ b/build/templates/version_string.tmpl
@@ -1 +0,0 @@
-$full_version
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -75,17 +75,9 @@ module.exports = ({

    if (targetDeletesNodeGlobals) {
      plugins.push(new webpack.ProvidePlugin({
-        Buffer: ['@electron/internal/common/webpack-provider', 'Buffer'],
+        process: ['@electron/internal/common/webpack-provider', 'process'],
        global: ['@electron/internal/common/webpack-provider', '_global'],
-        process: ['@electron/internal/common/webpack-provider', 'process']
-      }));
-    }
-
-    // Webpack 5 no longer polyfills process or Buffer.
-    if (!alwaysHasNode) {
-      plugins.push(new webpack.ProvidePlugin({
-        Buffer: ['buffer', 'Buffer'],
-        process: 'process/browser'
+        Buffer: ['@electron/internal/common/webpack-provider', 'Buffer']
      }));
    }

@@ -137,12 +129,7 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
          // Force timers to resolve to our dependency that doesn't use window.postMessage
          timers: path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
        },
-        extensions: ['.ts', '.js'],
-        fallback: {
-          // We provide our own "timers" import above, any usage of setImmediate inside
-          // one of our renderer bundles should import it from the 'timers' package
-          setImmediate: false
-        }
+        extensions: ['.ts', '.js']
      },
      module: {
        rules: [{
@@ -163,7 +150,10 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
      },
      node: {
        __dirname: false,
-        __filename: false
+        __filename: false,
+        // We provide our own "timers" import above, any usage of setImmediate inside
+        // one of our renderer bundles should import it from the 'timers' package
+        setImmediate: false
      },
      optimization: {
        minimize: env.mode === 'production',
--- a/build/webpack/webpack.config.utility.js
+++ b/build/webpack/webpack.config.utility.js
@@ -1,4 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'utility',
-  alwaysHasNode: true
-});
--- a/build/webpack/webpack.gni
+++ b/build/webpack/webpack.gni
@@ -30,14 +30,11 @@ template("webpack_build") {
    args = [
      "--config",
      rebase_path(invoker.config_file),
-      "--output-filename",
-      get_path_info(invoker.out_file, "file"),
-      "--output-path",
-      rebase_path(get_path_info(invoker.out_file, "dir")),
-      "--env",
-      "buildflags=" + rebase_path("$target_gen_dir/buildflags/buildflags.h"),
-      "--env",
-      "mode=" + mode,
+      "--output-filename=" + get_path_info(invoker.out_file, "file"),
+      "--output-path=" + rebase_path(get_path_info(invoker.out_file, "dir")),
+      "--env.buildflags=" +
+          rebase_path("$target_gen_dir/buildflags/buildflags.h"),
+      "--env.mode=" + mode,
    ]
    deps += [ "//electron/buildflags" ]

--- a/build/zip.py
+++ b/build/zip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import print_function
 import os
 import subprocess
--- a/build/zip_libcxx.py
+++ b/build/zip_libcxx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import print_function
 import os
 import subprocess
--- a/buildflags/BUILD.gn
+++ b/buildflags/BUILD.gn
@@ -19,6 +19,7 @@ buildflag_header("buildflags") {
    "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
    "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
+    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
    "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
  ]
 }
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -31,4 +31,7 @@ declare_args() {

  # Enable Spellchecker support
  enable_builtin_spellchecker = true
+
+  # Undocumented Windows dark mode API
+  enable_win_dark_mode_window_ui = false
 }
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -6,7 +6,6 @@ import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//electron/buildflags/buildflags.gni")
-import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//third_party/widevine/cdm/widevine.gni")

@@ -16,10 +15,6 @@ static_library("chrome") {
  sources = [
    "//chrome/browser/accessibility/accessibility_ui.cc",
    "//chrome/browser/accessibility/accessibility_ui.h",
-    "//chrome/browser/app_mode/app_mode_utils.cc",
-    "//chrome/browser/app_mode/app_mode_utils.h",
-    "//chrome/browser/browser_features.cc",
-    "//chrome/browser/browser_features.h",
    "//chrome/browser/browser_process.cc",
    "//chrome/browser/browser_process.h",
    "//chrome/browser/devtools/devtools_contents_resizing_strategy.cc",
@@ -30,7 +25,6 @@ static_library("chrome") {
    "//chrome/browser/devtools/devtools_eye_dropper.h",
    "//chrome/browser/devtools/devtools_file_system_indexer.cc",
    "//chrome/browser/devtools/devtools_file_system_indexer.h",
-    "//chrome/browser/devtools/devtools_settings.h",
    "//chrome/browser/extensions/global_shortcut_listener.cc",
    "//chrome/browser/extensions/global_shortcut_listener.h",
    "//chrome/browser/icon_loader.cc",
@@ -53,48 +47,16 @@ static_library("chrome") {
    "//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/process_singleton.h",
-    "//chrome/browser/process_singleton_internal.cc",
-    "//chrome/browser/process_singleton_internal.h",
-    "//chrome/browser/themes/browser_theme_pack.cc",
-    "//chrome/browser/themes/browser_theme_pack.h",
-    "//chrome/browser/themes/custom_theme_supplier.cc",
-    "//chrome/browser/themes/custom_theme_supplier.h",
-    "//chrome/browser/themes/theme_properties.cc",
-    "//chrome/browser/themes/theme_properties.h",
-    "//chrome/browser/ui/color/chrome_color_mixers.cc",
-    "//chrome/browser/ui/color/chrome_color_mixers.h",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_manager.cc",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_manager.h",
-    "//chrome/browser/ui/exclusive_access/fullscreen_controller.cc",
-    "//chrome/browser/ui/exclusive_access/fullscreen_controller.h",
-    "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc",
-    "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h",
-    "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc",
-    "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
-    "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
-    "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
-    "//chrome/browser/ui/frame/window_frame_util.cc",
-    "//chrome/browser/ui/frame/window_frame_util.h",
-    "//chrome/browser/ui/ui_features.cc",
-    "//chrome/browser/ui/ui_features.h",
+    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
+    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.h",
    "//extensions/browser/app_window/size_constraints.cc",
    "//extensions/browser/app_window/size_constraints.h",
-    "//ui/views/native_window_tracker.h",
  ]

-  if (is_posix) {
-    sources += [ "//chrome/browser/process_singleton_posix.cc" ]
-  }
-
  if (is_mac) {
    sources += [
      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
@@ -102,11 +64,7 @@ static_library("chrome") {
      "//chrome/browser/icon_loader_mac.mm",
      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
-      "//chrome/browser/platform_util_mac.mm",
-      "//chrome/browser/process_singleton_mac.mm",
      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
    ]
@@ -118,13 +76,10 @@ static_library("chrome") {
      "//chrome/browser/extensions/global_shortcut_listener_win.h",
      "//chrome/browser/icon_loader_win.cc",
      "//chrome/browser/media/webrtc/window_icon_util_win.cc",
-      "//chrome/browser/process_singleton_win.cc",
      "//chrome/browser/ui/frame/window_frame_util.h",
      "//chrome/browser/ui/view_ids.h",
      "//chrome/browser/win/chrome_process_finder.cc",
      "//chrome/browser/win/chrome_process_finder.h",
-      "//chrome/browser/win/titlebar_config.cc",
-      "//chrome/browser/win/titlebar_config.h",
      "//chrome/browser/win/titlebar_config.h",
      "//chrome/child/v8_crashpad_support_win.cc",
      "//chrome/child/v8_crashpad_support_win.h",
@@ -132,35 +87,49 @@ static_library("chrome") {
  }

  if (is_linux) {
-    sources += [ "//chrome/browser/media/webrtc/window_icon_util_ozone.cc" ]
+    sources += [ "//chrome/browser/media/webrtc/window_icon_util_linux.cc" ]
  }

  if (use_aura) {
    sources += [
      "//chrome/browser/platform_util_aura.cc",
      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
-      "//ui/views/native_window_tracker_aura.cc",
-      "//ui/views/native_window_tracker_aura.h",
    ]
  }

  public_deps = [
    "//chrome/browser:dev_ui_browser_resources",
-    "//chrome/browser/ui/color:mixers",
    "//chrome/common",
    "//chrome/common:version_header",
    "//components/keyed_service/content",
    "//components/paint_preview/buildflags",
    "//components/proxy_config",
-    "//components/services/language_detection/public/mojom",
    "//content/public/browser",
    "//services/strings",
  ]

-  deps = [ "//chrome/browser:resource_prefetch_predictor_proto" ]
+  deps = [
+    "//chrome/browser:resource_prefetch_predictor_proto",
+    "//chrome/services/speech:buildflags",
+    "//components/optimization_guide/proto:optimization_guide_proto",
+  ]
+
+  if (enable_basic_printing && is_win) {
+    deps += [ "//chrome/common:cloud_print_utility_mojom" ]
+  }

  if (is_linux) {
    sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
+    if (use_x11 || use_ozone) {
+      sources +=
+          [ "//chrome/browser/extensions/global_shortcut_listener_linux.cc" ]
+    }
+    if (use_x11) {
+      sources += [
+        "//chrome/browser/extensions/global_shortcut_listener_x11.cc",
+        "//chrome/browser/extensions/global_shortcut_listener_x11.h",
+      ]
+    }
    if (use_ozone) {
      deps += [ "//ui/ozone" ]
      sources += [
@@ -190,7 +159,6 @@ static_library("chrome") {

  if (enable_desktop_capturer) {
    sources += [
-      "//chrome/browser/media/webrtc/desktop_media_list.cc",
      "//chrome/browser/media/webrtc/desktop_media_list.h",
      "//chrome/browser/media/webrtc/desktop_media_list_base.cc",
      "//chrome/browser/media/webrtc/desktop_media_list_base.h",
@@ -212,39 +180,22 @@ static_library("chrome") {
    deps += [ "//components/cdm/renderer" ]
  }

-  if (enable_printing) {
+  if (enable_basic_printing) {
    sources += [
-      "//chrome/browser/bad_message.cc",
-      "//chrome/browser/bad_message.h",
      "//chrome/browser/printing/print_job.cc",
      "//chrome/browser/printing/print_job.h",
      "//chrome/browser/printing/print_job_manager.cc",
      "//chrome/browser/printing/print_job_manager.h",
      "//chrome/browser/printing/print_job_worker.cc",
      "//chrome/browser/printing/print_job_worker.h",
-      "//chrome/browser/printing/print_job_worker_oop.cc",
-      "//chrome/browser/printing/print_job_worker_oop.h",
      "//chrome/browser/printing/print_view_manager_base.cc",
      "//chrome/browser/printing/print_view_manager_base.h",
      "//chrome/browser/printing/printer_query.cc",
      "//chrome/browser/printing/printer_query.h",
      "//chrome/browser/printing/printing_service.cc",
      "//chrome/browser/printing/printing_service.h",
-      "//components/printing/browser/print_to_pdf/pdf_print_job.cc",
-      "//components/printing/browser/print_to_pdf/pdf_print_job.h",
-      "//components/printing/browser/print_to_pdf/pdf_print_result.cc",
-      "//components/printing/browser/print_to_pdf/pdf_print_result.h",
-      "//components/printing/browser/print_to_pdf/pdf_print_utils.cc",
-      "//components/printing/browser/print_to_pdf/pdf_print_utils.h",
    ]

-    if (enable_oop_printing) {
-      sources += [
-        "//chrome/browser/printing/print_backend_service_manager.cc",
-        "//chrome/browser/printing/print_backend_service_manager.h",
-      ]
-    }
-
    public_deps += [
      "//chrome/services/printing:lib",
      "//components/printing/browser",
@@ -252,7 +203,6 @@ static_library("chrome") {
      "//components/services/print_compositor",
      "//components/services/print_compositor/public/cpp",
      "//components/services/print_compositor/public/mojom",
-      "//printing/backend",
    ]

    deps += [
@@ -264,10 +214,9 @@ static_library("chrome") {
      sources += [
        "//chrome/browser/printing/pdf_to_emf_converter.cc",
        "//chrome/browser/printing/pdf_to_emf_converter.h",
-        "//chrome/browser/printing/printer_xml_parser_impl.cc",
-        "//chrome/browser/printing/printer_xml_parser_impl.h",
+        "//chrome/utility/printing_handler.cc",
+        "//chrome/utility/printing_handler.h",
      ]
-      deps += [ "//printing:printing_base" ]
    }
  }

@@ -275,34 +224,33 @@ static_library("chrome") {
    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/back_to_tab_label_button.cc",
      "//chrome/browser/ui/views/overlay/close_image_button.cc",
      "//chrome/browser/ui/views/overlay/close_image_button.h",
      "//chrome/browser/ui/views/overlay/constants.h",
      "//chrome/browser/ui/views/overlay/hang_up_button.cc",
      "//chrome/browser/ui/views/overlay/hang_up_button.h",
-      "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
-      "//chrome/browser/ui/views/overlay/overlay_window_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/simple_overlay_window_image_button.cc",
-      "//chrome/browser/ui/views/overlay/simple_overlay_window_image_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/toggle_camera_button.cc",
      "//chrome/browser/ui/views/overlay/toggle_camera_button.h",
      "//chrome/browser/ui/views/overlay/toggle_microphone_button.cc",
      "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
-      "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
-      "//chrome/browser/ui/views/overlay/video_overlay_window_views.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",
-      "//ui/views/controls/webview",
    ]
  }

@@ -312,26 +260,18 @@ static_library("chrome") {
      "//chrome/browser/extensions/chrome_url_request_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/api/extension_hooks_delegate.cc",
-      "//chrome/renderer/extensions/api/extension_hooks_delegate.h",
-      "//chrome/renderer/extensions/api/tabs_hooks_delegate.cc",
-      "//chrome/renderer/extensions/api/tabs_hooks_delegate.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",
    ]

    if (enable_pdf_viewer) {
      sources += [
-        "//chrome/browser/pdf/chrome_pdf_stream_delegate.cc",
-        "//chrome/browser/pdf/chrome_pdf_stream_delegate.h",
        "//chrome/browser/pdf/pdf_extension_util.cc",
        "//chrome/browser/pdf/pdf_extension_util.h",
-        "//chrome/browser/pdf/pdf_frame_util.cc",
-        "//chrome/browser/pdf/pdf_frame_util.h",
-        "//chrome/browser/plugins/pdf_iframe_navigation_throttle.cc",
-        "//chrome/browser/plugins/pdf_iframe_navigation_throttle.h",
-      ]
-      deps += [
-        "//components/pdf/browser",
-        "//components/pdf/renderer",
+        "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
+        "//chrome/renderer/pepper/chrome_pdf_print_client.h",
      ]
    }
  }
@@ -360,6 +300,15 @@ source_set("plugins") {
    "//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 += [
+    "//media:media_buildflags",
+    "//ppapi/buildflags",
+    "//ppapi/proxy:ipc",
+    "//services/device/public/mojom",
+  ]
+  if (enable_pdf_viewer) {
+    deps += [ "//components/pdf/browser" ]
+  }

  # renderer side
  sources += [
@@ -368,24 +317,24 @@ source_set("plugins") {
    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
  ]
-
+  if (enable_pdf_viewer) {
+    sources += [
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
+    ]
+    if (enable_pdf_viewer) {
+      deps += [ "//components/pdf/renderer" ]
+    }
+  }
  deps += [
    "//components/strings",
    "//media:media_buildflags",
-    "//services/device/public/mojom",
+    "//ppapi/host",
+    "//ppapi/proxy",
+    "//ppapi/proxy:ipc",
+    "//ppapi/shared_impl",
    "//skia",
-    "//storage/browser",
  ]
-
-  if (enable_ppapi) {
-    deps += [
-      "//ppapi/buildflags",
-      "//ppapi/host",
-      "//ppapi/proxy",
-      "//ppapi/proxy:ipc",
-      "//ppapi/shared_impl",
-    ]
-  }
 }

 # This source set is just so we don't have to depend on all of //chrome/browser
@@ -399,10 +348,6 @@ source_set("chrome_spellchecker") {

  if (enable_builtin_spellchecker) {
    sources += [
-      "//chrome/browser/profiles/profile_keyed_service_factory.cc",
-      "//chrome/browser/profiles/profile_keyed_service_factory.h",
-      "//chrome/browser/profiles/profile_selections.cc",
-      "//chrome/browser/profiles/profile_selections.h",
      "//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",
@@ -411,19 +356,14 @@ source_set("chrome_spellchecker") {
      "//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_blocklist_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_blocklist_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",
    ]

-    if (!is_mac) {
-      sources += [
-        "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
-        "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
-        "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-        "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
-      ]
-    }
-
    if (has_spellcheck_panel) {
      sources += [
        "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
--- a/chromium_src/chrome/browser/certificate_manager_model.cc
+++ b/chromium_src/chrome/browser/certificate_manager_model.cc
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "shell/browser/certificate_manager_model.h"
+#include "chrome/browser/certificate_manager_model.h"

 #include <utility>

 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task/post_task.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -71,8 +72,8 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
 void CertificateManagerModel::Create(content::BrowserContext* browser_context,
                                     CreationCallback callback) {
  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  content::GetIOThreadTaskRunner({})->PostTask(
-      FROM_HERE, base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
                                browser_context->GetResourceContext(),
                                std::move(callback)));
 }
@@ -144,8 +145,8 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
  DCHECK_CURRENTLY_ON(BrowserThread::IO);

  bool is_user_db_available = !!cert_db->GetPublicSlot();
-  content::GetUIThreadTaskRunner({})->PostTask(
-      FROM_HERE,
+  base::PostTask(
+      FROM_HERE, {BrowserThread::UI},
      base::BindOnce(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
                     is_user_db_available, std::move(callback)));
 }
--- a/chromium_src/chrome/browser/certificate_manager_model.h
+++ b/chromium_src/chrome/browser/certificate_manager_model.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#ifndef ELECTRON_SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
-#define ELECTRON_SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_

 #include <memory>
 #include <string>

 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "net/cert/nss_cert_database.h"

@@ -30,10 +31,6 @@ class CertificateManagerModel {
  static void Create(content::BrowserContext* browser_context,
                     CreationCallback callback);

-  // disable copy
-  CertificateManagerModel(const CertificateManagerModel&) = delete;
-  CertificateManagerModel& operator=(const CertificateManagerModel&) = delete;
-
  ~CertificateManagerModel();

  bool is_user_db_available() const { return is_user_db_available_; }
@@ -111,6 +108,8 @@ class CertificateManagerModel {
  // Whether the certificate database has a public slot associated with the
  // profile. If not set, importing certificates is not allowed with this model.
  bool is_user_db_available_;
+
+  DISALLOW_COPY_AND_ASSIGN(CertificateManagerModel);
 };

-#endif  // ELECTRON_SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#endif  // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
--- a/chromium_src/chrome/browser/process_singleton.h
+++ b/chromium_src/chrome/browser/process_singleton.h
@@ -0,0 +1,185 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_
+#define CHROME_BROWSER_PROCESS_SINGLETON_H_
+
+#if defined(OS_WIN)
+#include <windows.h>
+#endif  // defined(OS_WIN)
+
+#include "base/callback.h"
+#include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "base/memory/ref_counted.h"
+#include "base/process/process.h"
+#include "base/sequence_checker.h"
+#include "ui/gfx/native_widget_types.h"
+
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
+#include "base/files/scoped_temp_dir.h"
+#endif
+
+#if defined(OS_WIN)
+#include "base/win/message_window.h"
+#endif  // defined(OS_WIN)
+
+namespace base {
+class CommandLine;
+}
+
+// ProcessSingleton ----------------------------------------------------------
+//
+// This class allows different browser processes to communicate with
+// each other.  It is named according to the user data directory, so
+// we can be sure that no more than one copy of the application can be
+// running at once with a given data directory.
+//
+// Implementation notes:
+// - the Windows implementation uses an invisible global message window;
+// - the Linux implementation uses a Unix domain socket in the user data dir.
+
+class ProcessSingleton {
+ public:
+  enum NotifyResult {
+    PROCESS_NONE,
+    PROCESS_NOTIFIED,
+    PROFILE_IN_USE,
+    LOCK_ERROR,
+  };
+
+  // Implement this callback to handle notifications from other processes. The
+  // callback will receive the command line and directory with which the other
+  // Chrome process was launched. Return true if the command line will be
+  // handled within the current browser instance or false if the remote process
+  // should handle it (i.e., because the current process is shutting down).
+  using NotificationCallback = base::RepeatingCallback<bool(
+      const base::CommandLine::StringVector& command_line,
+      const base::FilePath& current_directory)>;
+
+  ProcessSingleton(const base::FilePath& user_data_dir,
+                   const NotificationCallback& notification_callback);
+  ~ProcessSingleton();
+
+  // Notify another process, if available. Otherwise sets ourselves as the
+  // singleton instance. Returns PROCESS_NONE if we became the singleton
+  // instance. Callers are guaranteed to either have notified an existing
+  // process or have grabbed the singleton (unless the profile is locked by an
+  // unreachable process).
+  // TODO(brettw): Make the implementation of this method non-platform-specific
+  // by making Linux re-use the Windows implementation.
+  NotifyResult NotifyOtherProcessOrCreate();
+  void StartListeningOnSocket();
+  void OnBrowserReady();
+
+  // Sets ourself up as the singleton instance.  Returns true on success.  If
+  // false is returned, we are not the singleton instance and the caller must
+  // exit.
+  // NOTE: Most callers should generally prefer NotifyOtherProcessOrCreate() to
+  // this method, only callers for whom failure is preferred to notifying
+  // another process should call this directly.
+  bool Create();
+
+  // Clear any lock state during shutdown.
+  void Cleanup();
+
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
+  static void DisablePromptForTesting();
+#endif
+#if defined(OS_WIN)
+  // Called to query whether to kill a hung browser process that has visible
+  // windows. Return true to allow killing the hung process.
+  using ShouldKillRemoteProcessCallback = base::RepeatingCallback<bool()>;
+  void OverrideShouldKillRemoteProcessCallbackForTesting(
+      const ShouldKillRemoteProcessCallback& display_dialog_callback);
+#endif
+
+ protected:
+  // Notify another process, if available.
+  // Returns true if another process was found and notified, false if we should
+  // continue with the current process.
+  // On Windows, Create() has to be called before this.
+  NotifyResult NotifyOtherProcess();
+
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
+  // Exposed for testing.  We use a timeout on Linux, and in tests we want
+  // this timeout to be short.
+  NotifyResult NotifyOtherProcessWithTimeout(
+      const base::CommandLine& command_line,
+      int retry_attempts,
+      const base::TimeDelta& timeout,
+      bool kill_unresponsive);
+  NotifyResult NotifyOtherProcessWithTimeoutOrCreate(
+      const base::CommandLine& command_line,
+      int retry_attempts,
+      const base::TimeDelta& timeout);
+  void OverrideCurrentPidForTesting(base::ProcessId pid);
+  void OverrideKillCallbackForTesting(
+      const base::RepeatingCallback<void(int)>& callback);
+#endif
+
+ private:
+  NotificationCallback notification_callback_;  // Handler for notifications.
+
+#if defined(OS_WIN)
+  HWND remote_window_ = nullptr;     // The HWND_MESSAGE of another browser.
+  base::win::MessageWindow window_;  // The message-only window.
+  bool is_virtualized_ =
+      false;  // Stuck inside Microsoft Softricity VM environment.
+  HANDLE lock_file_ = INVALID_HANDLE_VALUE;
+  base::FilePath user_data_dir_;
+  ShouldKillRemoteProcessCallback should_kill_remote_process_callback_;
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+  // Start listening to the socket.
+  void StartListening(int sock);
+
+  // Return true if the given pid is one of our child processes.
+  // Assumes that the current pid is the root of all pids of the current
+  // instance.
+  bool IsSameChromeInstance(pid_t pid);
+
+  // Extract the process's pid from a symbol link path and if it is on
+  // the same host, kill the process, unlink the lock file and return true.
+  // If the process is part of the same chrome instance, unlink the lock file
+  // and return true without killing it.
+  // If the process is on a different host, return false.
+  bool KillProcessByLockPath();
+
+  // Default function to kill a process, overridable by tests.
+  void KillProcess(int pid);
+
+  // Allow overriding for tests.
+  base::ProcessId current_pid_;
+
+  // Function to call when the other process is hung and needs to be killed.
+  // Allows overriding for tests.
+  base::RepeatingCallback<void(int)> kill_callback_;
+
+  // Path in file system to the socket.
+  base::FilePath socket_path_;
+
+  // Path in file system to the lock.
+  base::FilePath lock_path_;
+
+  // Path in file system to the cookie file.
+  base::FilePath cookie_path_;
+
+  // Temporary directory to hold the socket.
+  base::ScopedTempDir socket_dir_;
+
+  // Helper class for linux specific messages.  LinuxWatcher is ref counted
+  // because it posts messages between threads.
+  class LinuxWatcher;
+  scoped_refptr<LinuxWatcher> watcher_;
+  int sock_ = -1;
+  bool listen_on_ready_ = false;
+#endif
+
+  SEQUENCE_CHECKER(sequence_checker_);
+
+  DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);
+};
+
+#endif  // CHROME_BROWSER_PROCESS_SINGLETON_H_
--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/chromium_src/chrome/browser/process_singleton_posix.cc
--- a/chromium_src/chrome/browser/process_singleton_win.cc
+++ b/chromium_src/chrome/browser/process_singleton_win.cc
@@ -0,0 +1,315 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/process_singleton.h"
+
+#include <windows.h>
+#include <shellapi.h>
+
+#include "base/base_paths.h"
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/process/process.h"
+#include "base/process/process_info.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
+#include "base/win/registry.h"
+#include "base/win/scoped_handle.h"
+#include "base/win/windows_version.h"
+#include "chrome/browser/win/chrome_process_finder.h"
+#include "content/public/common/result_codes.h"
+#include "net/base/escape.h"
+#include "ui/gfx/win/hwnd_util.h"
+
+namespace {
+
+const char kLockfile[] = "lockfile";
+
+// A helper class that acquires the given |mutex| while the AutoLockMutex is in
+// scope.
+class AutoLockMutex {
+ public:
+  explicit AutoLockMutex(HANDLE mutex) : mutex_(mutex) {
+    DWORD result = ::WaitForSingleObject(mutex_, INFINITE);
+    DPCHECK(result == WAIT_OBJECT_0) << "Result = " << result;
+  }
+
+  ~AutoLockMutex() {
+    BOOL released = ::ReleaseMutex(mutex_);
+    DPCHECK(released);
+  }
+
+ private:
+  HANDLE mutex_;
+  DISALLOW_COPY_AND_ASSIGN(AutoLockMutex);
+};
+
+// A helper class that releases the given |mutex| while the AutoUnlockMutex is
+// in scope and immediately re-acquires it when going out of scope.
+class AutoUnlockMutex {
+ public:
+  explicit AutoUnlockMutex(HANDLE mutex) : mutex_(mutex) {
+    BOOL released = ::ReleaseMutex(mutex_);
+    DPCHECK(released);
+  }
+
+  ~AutoUnlockMutex() {
+    DWORD result = ::WaitForSingleObject(mutex_, INFINITE);
+    DPCHECK(result == WAIT_OBJECT_0) << "Result = " << result;
+  }
+
+ private:
+  HANDLE mutex_;
+  DISALLOW_COPY_AND_ASSIGN(AutoUnlockMutex);
+};
+
+// Checks the visibility of the enumerated window and signals once a visible
+// window has been found.
+BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
+  bool* result = reinterpret_cast<bool*>(param);
+  *result = ::IsWindowVisible(window) != 0;
+  // Stops enumeration if a visible window has been found.
+  return !*result;
+}
+
+bool ParseCommandLine(const COPYDATASTRUCT* cds,
+                      base::CommandLine::StringVector* parsed_command_line,
+                      base::FilePath* current_directory) {
+  // We should have enough room for the shortest command (min_message_size)
+  // and also be a multiple of wchar_t bytes. The shortest command
+  // possible is L"START\0\0" (empty current directory and command line).
+  static const int min_message_size = 7;
+  if (cds->cbData < min_message_size * sizeof(wchar_t) ||
+      cds->cbData % sizeof(wchar_t) != 0) {
+    LOG(WARNING) << "Invalid WM_COPYDATA, length = " << cds->cbData;
+    return false;
+  }
+
+  // We split the string into 4 parts on NULLs.
+  DCHECK(cds->lpData);
+  const std::wstring msg(static_cast<wchar_t*>(cds->lpData),
+                         cds->cbData / sizeof(wchar_t));
+  const std::wstring::size_type first_null = msg.find_first_of(L'\0');
+  if (first_null == 0 || first_null == std::wstring::npos) {
+    // no NULL byte, don't know what to do
+    LOG(WARNING) << "Invalid WM_COPYDATA, length = " << msg.length()
+                 << ", first null = " << first_null;
+    return false;
+  }
+
+  // Decode the command, which is everything until the first NULL.
+  if (msg.substr(0, first_null) == L"START") {
+    // Another instance is starting parse the command line & do what it would
+    // have done.
+    VLOG(1) << "Handling STARTUP request from another process";
+    const std::wstring::size_type second_null =
+        msg.find_first_of(L'\0', first_null + 1);
+    if (second_null == std::wstring::npos || first_null == msg.length() - 1 ||
+        second_null == msg.length()) {
+      LOG(WARNING) << "Invalid format for start command, we need a string in 4 "
+                      "parts separated by NULLs";
+      return false;
+    }
+
+    // Get current directory.
+    *current_directory =
+        base::FilePath(msg.substr(first_null + 1, second_null - first_null));
+
+    const std::wstring::size_type third_null =
+        msg.find_first_of(L'\0', second_null + 1);
+    if (third_null == std::wstring::npos || third_null == msg.length()) {
+      LOG(WARNING) << "Invalid format for start command, we need a string in 4 "
+                      "parts separated by NULLs";
+    }
+
+    // Get command line.
+    const std::wstring cmd_line =
+        msg.substr(second_null + 1, third_null - second_null);
+    *parsed_command_line = base::CommandLine::FromString(cmd_line).argv();
+    return true;
+  }
+  return false;
+}
+
+bool ProcessLaunchNotification(
+    const ProcessSingleton::NotificationCallback& notification_callback,
+    UINT message,
+    WPARAM wparam,
+    LPARAM lparam,
+    LRESULT* result) {
+  if (message != WM_COPYDATA)
+    return false;
+
+  // Handle the WM_COPYDATA message from another process.
+  const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
+
+  base::CommandLine::StringVector parsed_command_line;
+  base::FilePath current_directory;
+  if (!ParseCommandLine(cds, &parsed_command_line, &current_directory)) {
+    *result = TRUE;
+    return true;
+  }
+
+  *result = notification_callback.Run(parsed_command_line, current_directory)
+                ? TRUE
+                : FALSE;
+  return true;
+}
+
+bool TerminateAppWithError() {
+  // TODO: This is called when the secondary process can't ping the primary
+  // process. Need to find out what to do here.
+  return false;
+}
+
+}  // namespace
+
+ProcessSingleton::ProcessSingleton(
+    const base::FilePath& user_data_dir,
+    const NotificationCallback& notification_callback)
+    : notification_callback_(notification_callback),
+      user_data_dir_(user_data_dir),
+      should_kill_remote_process_callback_(
+          base::BindRepeating(&TerminateAppWithError)) {
+  // The user_data_dir may have not been created yet.
+  base::CreateDirectoryAndGetError(user_data_dir, nullptr);
+}
+
+ProcessSingleton::~ProcessSingleton() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  if (lock_file_ != INVALID_HANDLE_VALUE)
+    ::CloseHandle(lock_file_);
+}
+
+// Code roughly based on Mozilla.
+ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+  if (is_virtualized_)
+    return PROCESS_NOTIFIED;  // We already spawned the process in this case.
+  if (lock_file_ == INVALID_HANDLE_VALUE && !remote_window_) {
+    return LOCK_ERROR;
+  } else if (!remote_window_) {
+    return PROCESS_NONE;
+  }
+
+  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
+    case chrome::NOTIFY_SUCCESS:
+      return PROCESS_NOTIFIED;
+    case chrome::NOTIFY_FAILED:
+      remote_window_ = NULL;
+      return PROCESS_NONE;
+    case chrome::NOTIFY_WINDOW_HUNG:
+      // Fall through and potentially terminate the hung browser.
+      break;
+  }
+
+  DWORD process_id = 0;
+  DWORD thread_id = ::GetWindowThreadProcessId(remote_window_, &process_id);
+  if (!thread_id || !process_id) {
+    remote_window_ = NULL;
+    return PROCESS_NONE;
+  }
+  base::Process process = base::Process::Open(process_id);
+
+  // The window is hung. Scan for every window to find a visible one.
+  bool visible_window = false;
+  ::EnumThreadWindows(thread_id, &BrowserWindowEnumeration,
+                      reinterpret_cast<LPARAM>(&visible_window));
+
+  // If there is a visible browser window, ask the user before killing it.
+  if (visible_window && !should_kill_remote_process_callback_.Run()) {
+    // The user denied. Quit silently.
+    return PROCESS_NOTIFIED;
+  }
+
+  // Time to take action. Kill the browser process.
+  process.Terminate(content::RESULT_CODE_HUNG, true);
+  remote_window_ = NULL;
+  return PROCESS_NONE;
+}
+
+ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+  ProcessSingleton::NotifyResult result = PROCESS_NONE;
+  if (!Create()) {
+    result = NotifyOtherProcess();
+    if (result == PROCESS_NONE)
+      result = PROFILE_IN_USE;
+  }
+  return result;
+}
+
+void ProcessSingleton::StartListeningOnSocket() {}
+void ProcessSingleton::OnBrowserReady() {}
+
+// Look for a Chrome instance that uses the same profile directory. If there
+// isn't one, create a message window with its title set to the profile
+// directory path.
+bool ProcessSingleton::Create() {
+  static const wchar_t kMutexName[] = L"Local\\AtomProcessSingletonStartup!";
+
+  remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
+  if (!remote_window_) {
+    // Make sure we will be the one and only process creating the window.
+    // We use a named Mutex since we are protecting against multi-process
+    // access. As documented, it's clearer to NOT request ownership on creation
+    // since it isn't guaranteed we will get it. It is better to create it
+    // without ownership and explicitly get the ownership afterward.
+    base::win::ScopedHandle only_me(::CreateMutex(NULL, FALSE, kMutexName));
+    if (!only_me.IsValid()) {
+      DPLOG(FATAL) << "CreateMutex failed";
+      return false;
+    }
+
+    AutoLockMutex auto_lock_only_me(only_me.Get());
+
+    // We now own the mutex so we are the only process that can create the
+    // window at this time, but we must still check if someone created it
+    // between the time where we looked for it above and the time the mutex
+    // was given to us.
+    remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
+    if (!remote_window_) {
+      // We have to make sure there is no Chrome instance running on another
+      // machine that uses the same profile.
+      base::FilePath lock_file_path = user_data_dir_.AppendASCII(kLockfile);
+      lock_file_ =
+          ::CreateFile(lock_file_path.value().c_str(), GENERIC_WRITE,
+                       FILE_SHARE_READ, NULL, CREATE_ALWAYS,
+                       FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL);
+      DWORD error = ::GetLastError();
+      LOG_IF(WARNING, lock_file_ != INVALID_HANDLE_VALUE &&
+                          error == ERROR_ALREADY_EXISTS)
+          << "Lock file exists but is writable.";
+      LOG_IF(ERROR, lock_file_ == INVALID_HANDLE_VALUE)
+          << "Lock file can not be created! Error code: " << error;
+
+      if (lock_file_ != INVALID_HANDLE_VALUE) {
+        // Set the window's title to the path of our user data directory so
+        // other Chrome instances can decide if they should forward to us.
+        bool result =
+            window_.CreateNamed(base::BindRepeating(&ProcessLaunchNotification,
+                                                    notification_callback_),
+                                user_data_dir_.value());
+
+        // NB: Ensure that if the primary app gets started as elevated
+        // admin inadvertently, secondary windows running not as elevated
+        // will still be able to send messages
+        ::ChangeWindowMessageFilterEx(window_.hwnd(), WM_COPYDATA, MSGFLT_ALLOW,
+                                      NULL);
+        CHECK(result && window_.hwnd());
+      }
+    }
+  }
+
+  return window_.hwnd() != NULL;
+}
+
+void ProcessSingleton::Cleanup() {}
+
+void ProcessSingleton::OverrideShouldKillRemoteProcessCallbackForTesting(
+    const ShouldKillRemoteProcessCallback& display_dialog_callback) {
+  should_kill_remote_process_callback_ = display_dialog_callback;
+}
--- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
+++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "shell/browser/ui/views/global_menu_bar_registrar_x11.h"
-
-#include <string>
+#include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"

 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
@@ -51,7 +49,7 @@ GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11() {
                                   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START),
      nullptr, kAppMenuRegistrarName, kAppMenuRegistrarPath,
      kAppMenuRegistrarName,
-      nullptr,  // Probably want a real cancelable.
+      nullptr,  // TODO: Probalby want a real cancelable.
      static_cast<GAsyncReadyCallback>(OnProxyCreatedThunk), this);
 }

--- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h
+++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#ifndef ELECTRON_SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_REGISTRAR_X11_H_
-#define ELECTRON_SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_REGISTRAR_X11_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_
+#define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_

 #include <gio/gio.h>

@@ -33,11 +33,6 @@ class GlobalMenuBarRegistrarX11 {
  GlobalMenuBarRegistrarX11();
  ~GlobalMenuBarRegistrarX11();

-  // disable copy
-  GlobalMenuBarRegistrarX11(const GlobalMenuBarRegistrarX11&) = delete;
-  GlobalMenuBarRegistrarX11& operator=(const GlobalMenuBarRegistrarX11&) =
-      delete;
-
  // Sends the actual message.
  void RegisterXWindow(x11::Window window);
  void UnregisterXWindow(x11::Window window);
@@ -58,6 +53,8 @@ class GlobalMenuBarRegistrarX11 {
  // x11::Window which want to be registered, but haven't yet been because
  // we're waiting for the proxy to become available.
  std::set<x11::Window> live_windows_;
+
+  DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarRegistrarX11);
 };

-#endif  // ELECTRON_SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_REGISTRAR_X11_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_
--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -1,5 +1,4 @@
-import { shell } from 'electron/common';
-import { app, dialog, BrowserWindow, ipcMain } from 'electron/main';
+import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron';
 import * as path from 'path';
 import * as url from 'url';

@@ -66,9 +65,9 @@ async function createWindow (backgroundColor?: string) {
  mainWindow = new BrowserWindow(options);
  mainWindow.on('ready-to-show', () => mainWindow!.show());

-  mainWindow.webContents.setWindowOpenHandler(details => {
-    shell.openExternal(decorateURL(details.url));
-    return { action: 'deny' };
+  mainWindow.webContents.on('new-window', (event, url) => {
+    event.preventDefault();
+    shell.openExternal(decorateURL(url));
  });

  mainWindow.webContents.session.setPermissionRequestHandler((webContents, permission, done) => {
--- a/default_app/main.ts
+++ b/default_app/main.ts
@@ -1,4 +1,4 @@
-import * as electron from 'electron/main';
+import * as electron from 'electron';

 import * as fs from 'fs';
 import * as path from 'path';
@@ -83,7 +83,7 @@ function loadApplicationPackage (packagePath: string) {
  });

  try {
-    // Override app's package.json data.
+    // Override app name and version.
    packagePath = path.resolve(packagePath);
    const packageJsonPath = path.join(packagePath, 'package.json');
    let appPath;
@@ -92,7 +92,7 @@ function loadApplicationPackage (packagePath: string) {
      try {
        packageJson = require(packageJsonPath);
      } catch (e) {
-        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${(e as Error).message}`);
+        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`);
        return;
      }

@@ -104,16 +104,6 @@ function loadApplicationPackage (packagePath: string) {
      } else if (packageJson.name) {
        app.name = packageJson.name;
      }
-      if (packageJson.desktopName) {
-        app.setDesktopName(packageJson.desktopName);
-      } else {
-        app.setDesktopName(`${app.name}.desktop`);
-      }
-      // Set v8 flags, deliberately lazy load so that apps that do not use this
-      // feature do not pay the price
-      if (packageJson.v8Flags) {
-        require('v8').setFlagsFromString(packageJson.v8Flags);
-      }
      appPath = packagePath;
    }

@@ -121,7 +111,7 @@ function loadApplicationPackage (packagePath: string) {
      const filePath = Module._resolveFilename(packagePath, module, true);
      app.setAppPath(appPath || path.dirname(filePath));
    } catch (e) {
-      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${(e as Error).message}`);
+      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`);
      return;
    }

@@ -129,7 +119,7 @@ function loadApplicationPackage (packagePath: string) {
    Module._load(packagePath, module, true);
  } catch (e) {
    console.error('App threw an error during load');
-    console.error((e as Error).stack || e);
+    console.error(e.stack || e);
    throw e;
  }
 }
--- a/default_app/preload.ts
+++ b/default_app/preload.ts
@@ -1,4 +1,4 @@
-import { ipcRenderer, contextBridge } from 'electron/renderer';
+import { ipcRenderer, contextBridge } from 'electron';

 const policy = window.trustedTypes.createPolicy('electron-default-app', {
  // we trust the SVG contents
--- a/docs/README.md
+++ b/docs/README.md
@@ -42,7 +42,7 @@ an issue:
  * [Web embeds in Electron](tutorial/web-embeds.md)
 * [Boilerplates and CLIs](tutorial/boilerplates-and-clis.md)
  * [Boilerplate vs CLI](tutorial/boilerplates-and-clis.md#boilerplate-vs-cli)
-  * [Electron Forge](tutorial/boilerplates-and-clis.md#electron-forge)
+  * [electron-forge](tutorial/boilerplates-and-clis.md#electron-forge)
  * [electron-builder](tutorial/boilerplates-and-clis.md#electron-builder)
  * [electron-react-boilerplate](tutorial/boilerplates-and-clis.md#electron-react-boilerplate)
  * [Other Tools and Boilerplates](tutorial/boilerplates-and-clis.md#other-tools-and-boilerplates)
@@ -59,17 +59,21 @@ an issue:
 * [Testing and Debugging](tutorial/application-debugging.md)
  * [Debugging the Main Process](tutorial/debugging-main-process.md)
  * [Debugging with Visual Studio Code](tutorial/debugging-vscode.md)
+  * [Using Selenium and WebDriver](tutorial/using-selenium-and-webdriver.md)
  * [Testing on Headless CI Systems (Travis, Jenkins)](tutorial/testing-on-headless-ci.md)
  * [DevTools Extension](tutorial/devtools-extension.md)
-  * [Automated Testing](tutorial/automated-testing.md)
+  * [Automated Testing with a Custom Driver](tutorial/automated-testing-with-a-custom-driver.md)
  * [REPL](tutorial/repl.md)
 * [Distribution](tutorial/application-distribution.md)
+  * [Supported Platforms](tutorial/support.md#supported-platforms)
  * [Code Signing](tutorial/code-signing.md)
  * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
  * [Windows Store](tutorial/windows-store-guide.md)
  * [Snapcraft](tutorial/snapcraft.md)
-  * [ASAR Archives](tutorial/asar-archives.md)
 * [Updates](tutorial/updates.md)
+  * [Deploying an Update Server](tutorial/updates.md#deploying-an-update-server)
+  * [Implementing Updates in Your App](tutorial/updates.md#implementing-updates-in-your-app)
+  * [Applying Updates](tutorial/updates.md#applying-updates)
 * [Getting Support](tutorial/support.md)

 ## Detailed Tutorials
@@ -83,6 +87,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * Electron Releases & Developer Feedback
  * [Versioning Policy](tutorial/electron-versioning.md)
  * [Release Timelines](tutorial/electron-timelines.md)
+* [Testing Widevine CDM](tutorial/testing-widevine-cdm.md)

 ---

@@ -102,6 +107,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * [`File` Object](api/file-object.md)
 * [`<webview>` Tag](api/webview-tag.md)
 * [`window.open` Function](api/window-open.md)
+* [`BrowserWindowProxy` Object](api/browser-window-proxy.md)

 ### Modules for the Main Process:

--- a/docs/api/accelerator.md
+++ b/docs/api/accelerator.md
@@ -2,7 +2,7 @@

 > Define keyboard shortcuts.

-Accelerators are strings that can contain multiple modifiers and a single key code,
+Accelerators are Strings that can contain multiple modifiers and a single key code,
 combined by the `+` character, and are used to define keyboard shortcuts
 throughout your application.

--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -23,7 +23,8 @@ The `app` object emits the following events:
 Emitted when the application has finished basic startup. On Windows and Linux,
 the `will-finish-launching` event is the same as the `ready` event; on macOS,
 this event represents the `applicationWillFinishLaunching` notification of
-`NSApplication`.
+`NSApplication`. You would usually set up listeners for the `open-file` and
+`open-url` events here, and start the crash reporter and auto updater.

 In most cases, you should do everything in the `ready` event handler.

@@ -35,10 +36,10 @@ Returns:
 * `launchInfo` Record<string, any> | [NotificationResponse](structures/notification-response.md) _macOS_

 Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
-holds the `userInfo` of the [`NSUserNotification`](https://developer.apple.com/documentation/foundation/nsusernotification)
-or information from [`UNNotificationResponse`](https://developer.apple.com/documentation/usernotifications/unnotificationresponse)
-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()`
+holds the `userInfo` of the `NSUserNotification` or information from
+[`UNNotificationResponse`](structures/notification-response.md) 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.

 ### Event: 'window-all-closed'
@@ -102,7 +103,7 @@ to a shutdown/restart of the system or a user logout.
 Returns:

 * `event` Event
-* `path` string
+* `path` String

 Emitted when the user wants to open a file with the application. The `open-file`
 event is usually emitted when the application is already open and the OS wants
@@ -121,23 +122,20 @@ filepath.
 Returns:

 * `event` Event
-* `url` string
+* `url` String

 Emitted when the user wants to open a URL with the application. Your application's
 `Info.plist` file must define the URL scheme within the `CFBundleURLTypes` key, and
 set `NSPrincipalClass` to `AtomApplication`.

-As with the `open-file` event, be sure to register a listener for the `open-url`
-event early in your application startup to detect if the the application being
-is being opened to handle a URL. If you register the listener in response to a
-`ready` event, you'll miss URLs that trigger the launch of your application.
+You should call `event.preventDefault()` if you want to handle this event.

 ### Event: 'activate' _macOS_

 Returns:

 * `event` Event
-* `hasVisibleWindows` boolean
+* `hasVisibleWindows` Boolean

 Emitted when the application is activated. Various actions can trigger
 this event, such as launching the application for the first time, attempting
@@ -159,12 +157,12 @@ when Dock icon is clicked or application is re-launched.
 Returns:

 * `event` Event
-* `type` string - A string identifying the activity. Maps to
+* `type` String - A string identifying the activity. Maps to
  [`NSUserActivity.activityType`][activity-type].
 * `userInfo` unknown - Contains app-specific state stored by the activity on
  another device.
 * `details` Object
-  * `webpageURL` string (optional) - A string identifying the URL of the webpage accessed by the activity on another device, if available.
+  * `webpageURL` String (optional) - A string identifying the URL of the webpage accessed by the activity on another device, if available.

 Emitted during [Handoff][handoff] when an activity from a different device wants
 to be resumed. You should call `event.preventDefault()` if you want to handle
@@ -180,7 +178,7 @@ Supported activity types are specified in the app's `Info.plist` under the
 Returns:

 * `event` Event
-* `type` string - A string identifying the activity. Maps to
+* `type` String - A string identifying the activity. Maps to
  [`NSUserActivity.activityType`][activity-type].

 Emitted during [Handoff][handoff] before an activity from a different device wants
@@ -192,9 +190,9 @@ this event.
 Returns:

 * `event` Event
-* `type` string - A string identifying the activity. Maps to
+* `type` String - A string identifying the activity. Maps to
  [`NSUserActivity.activityType`][activity-type].
-* `error` string - A string with the error's localized description.
+* `error` String - A string with the error's localized description.

 Emitted during [Handoff][handoff] when an activity from a different device
 fails to be resumed.
@@ -204,7 +202,7 @@ fails to be resumed.
 Returns:

 * `event` Event
-* `type` string - A string identifying the activity. Maps to
+* `type` String - A string identifying the activity. Maps to
  [`NSUserActivity.activityType`][activity-type].
 * `userInfo` unknown - Contains app-specific state stored by the activity.

@@ -216,7 +214,7 @@ resumed on another one.
 Returns:

 * `event` Event
-* `type` string - A string identifying the activity. Maps to
+* `type` String - A string identifying the activity. Maps to
  [`NSUserActivity.activityType`][activity-type].
 * `userInfo` unknown - Contains app-specific state stored by the activity.

@@ -274,12 +272,11 @@ Returns:

 * `event` Event
 * `webContents` [WebContents](web-contents.md)
-* `url` string
-* `error` string - The error code
+* `url` String
+* `error` String - The error code
 * `certificate` [Certificate](structures/certificate.md)
 * `callback` Function
-  * `isTrusted` boolean - Whether to consider the certificate as trusted
-* `isMainFrame` boolean
+  * `isTrusted` Boolean - Whether to consider the certificate as trusted

 Emitted when failed to verify the `certificate` for `url`, to trust the
 certificate you should prevent the default behavior with
@@ -335,14 +332,14 @@ Returns:
 * `authenticationResponseDetails` Object
  * `url` URL
 * `authInfo` Object
-  * `isProxy` boolean
-  * `scheme` string
-  * `host` string
+  * `isProxy` Boolean
+  * `scheme` String
+  * `host` String
  * `port` Integer
-  * `realm` string
+  * `realm` String
 * `callback` Function
-  * `username` string (optional)
-  * `password` string (optional)
+  * `username` String (optional)
+  * `password` String (optional)

 Emitted when `webContents` wants to do basic auth.

@@ -372,7 +369,7 @@ Emitted whenever there is a GPU info update.
 Returns:

 * `event` Event
-* `killed` boolean
+* `killed` Boolean

 Emitted when the GPU process crashes or is killed.

@@ -387,7 +384,7 @@ Returns:

 * `event` Event
 * `webContents` [WebContents](web-contents.md)
-* `killed` boolean
+* `killed` Boolean

 Emitted when the renderer process of `webContents` crashes or is killed.

@@ -403,7 +400,7 @@ Returns:
 * `event` Event
 * `webContents` [WebContents](web-contents.md)
 * `details` Object
-  * `reason` string - The reason the render process is gone.  Possible values:
+  * `reason` String - The reason the render process is gone.  Possible values:
    * `clean-exit` - Process exited with an exit code of zero
    * `abnormal-exit` - Process exited with a non-zero exit code
    * `killed` - Process was sent a SIGTERM or otherwise killed externally
@@ -424,7 +421,7 @@ Returns:

 * `event` Event
 * `details` Object
-  * `type` string - Process type. One of the following values:
+  * `type` String - Process type. One of the following values:
    * `Utility`
    * `Zygote`
    * `Sandbox helper`
@@ -432,7 +429,7 @@ Returns:
    * `Pepper Plugin`
    * `Pepper Plugin Broker`
    * `Unknown`
-  * `reason` string - The reason the child process is gone. Possible values:
+  * `reason` String - The reason the child process is gone. Possible values:
    * `clean-exit` - Process exited with an exit code of zero
    * `abnormal-exit` - Process exited with a non-zero exit code
    * `killed` - Process was sent a SIGTERM or otherwise killed externally
@@ -440,10 +437,10 @@ Returns:
    * `oom` - Process ran out of memory
    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
-  * `exitCode` number - The exit code for the process
+  * `exitCode` Number - The exit code for the process
      (e.g. status from waitpid if on posix, from GetExitCodeProcess on Windows).
-  * `serviceName` string (optional) - The non-localized name of the process.
-  * `name` string (optional) - The name of the process.
+  * `serviceName` String (optional) - The non-localized name of the process.
+  * `name` String (optional) - The name of the process.
    Examples for utility: `Audio Service`, `Content Decryption Module Service`, `Network Service`, `Video Capture`, etc.

 Emitted when the child process unexpectedly disappears. This is normally
@@ -454,7 +451,7 @@ because it was crashed or killed. It does not include renderer processes.
 Returns:

 * `event` Event
-* `accessibilitySupportEnabled` boolean - `true` when Chrome's accessibility
+* `accessibilitySupportEnabled` Boolean - `true` when Chrome's accessibility
  support is enabled, `false` otherwise.

 Emitted when Chrome's accessibility support changes. This event fires when
@@ -483,9 +480,8 @@ app.on('session-created', (session) => {
 Returns:

 * `event` Event
-* `argv` string[] - An array of the second instance's command line arguments
-* `workingDirectory` string - The second instance's working directory
-* `additionalData` unknown - A JSON object of additional data passed from the second instance
+* `argv` String[] - An array of the second instance's command line arguments
+* `workingDirectory` String - The second instance's working directory

 This event will be emitted inside the primary instance of your application
 when a second instance has been executed and calls `app.requestSingleInstanceLock()`.
@@ -495,10 +491,6 @@ and `workingDirectory` is its current working directory. Usually
 applications respond to this by making their primary window focused and
 non-minimized.

-**Note:** `argv` will not be exactly the same list of arguments as those passed
-to the second instance. The order might change and additional arguments might be appended.
-If you need to maintain the exact same arguments, it's advised to use `additionalData` instead.
-
 **Note:** If the second instance is started by a different user than the first, the `argv` array will not include the arguments.

 This event is guaranteed to be emitted after the `ready` event of `app`
@@ -507,6 +499,16 @@ gets emitted.
 **Note:** Extra command line arguments might be added by Chromium,
 such as `--original-process-start-time`.

+### Event: 'desktop-capturer-get-sources'
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+
+Emitted when `desktopCapturer.getSources()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will make it return empty sources.
+
 ## Methods

 The `app` object has the following methods:
@@ -536,8 +538,8 @@ and `will-quit` events will not be emitted.
 ### `app.relaunch([options])`

 * `options` Object (optional)
-  * `args` string[] (optional)
-  * `execPath` string (optional)
+  * `args` String[] (optional)
+  * `execPath` String (optional)

 Relaunches the app when current instance exits.

@@ -564,7 +566,7 @@ app.exit(0)

 ### `app.isReady()`

-Returns `boolean` - `true` if Electron has finished initializing, `false` otherwise.
+Returns `Boolean` - `true` if Electron has finished initializing, `false` otherwise.
 See also `app.whenReady()`.

 ### `app.whenReady()`
@@ -576,7 +578,7 @@ and subscribing to the `ready` event if the app is not ready yet.
 ### `app.focus([options])`

 * `options` Object (optional)
-  * `steal` boolean _macOS_ - Make the receiver the active app even if another app is
+  * `steal` Boolean _macOS_ - Make the receiver the active app even if another app is
  currently active.

 On Linux, focuses on the first visible window. On macOS, makes the application
@@ -588,10 +590,6 @@ You should seek to use the `steal` option as sparingly as possible.

 Hides all application windows without minimizing them.

-### `app.isHidden()` _macOS_
-
-Returns `boolean` - `true` if the application—including all of its windows—is hidden (e.g. with `Command-H`), `false` otherwise.
-
 ### `app.show()` _macOS_

 Shows application windows after they were hidden. Does not automatically focus
@@ -599,7 +597,7 @@ them.

 ### `app.setAppLogsPath([path])`

-* `path` string (optional) - A custom path for your logs. Must be absolute.
+* `path` String (optional) - A custom path for your logs. Must be absolute.

 Sets or creates a directory your app's logs which can then be manipulated with `app.getPath()` or `app.setPath(pathName, newPath)`.

@@ -607,28 +605,19 @@ Calling `app.setAppLogsPath()` without a `path` parameter will result in this di

 ### `app.getAppPath()`

-Returns `string` - The current application directory.
+Returns `String` - The current application directory.

 ### `app.getPath(name)`

-* `name` string - You can request the following paths by the name:
+* `name` String - You can request the following paths by the name:
  * `home` User's home directory.
  * `appData` Per-user application data directory, which by default points to:
    * `%APPDATA%` on Windows
    * `$XDG_CONFIG_HOME` or `~/.config` on Linux
    * `~/Library/Application Support` on macOS
-  * `userData` The directory for storing your app's configuration files, which
-    by default is the `appData` directory appended with your app's name. By
-    convention files storing user data should be written to this directory, and
-    it is not recommended to write large files here because some environments
-    may backup this directory to cloud storage.
-  * `sessionData` The directory for storing data generated by `Session`, such
-    as localStorage, cookies, disk cache, downloaded dictionaries, network
-    state, devtools files. By default this points to `userData`. Chromium may
-    write very large disk cache here, so if your app does not rely on browser
-    storage like localStorage or cookies to save user data, it is recommended
-    to set this directory to other locations to avoid polluting the `userData`
-    directory.
+  * `userData` The directory for storing your app's configuration files, which by
+    default it is the `appData` directory appended with your app's name.
+  * `cache`
  * `temp` Temporary directory.
  * `exe` The current executable file.
  * `module` The `libchromiumcontent` library.
@@ -642,16 +631,16 @@ Returns `string` - The current application directory.
  * `logs` Directory for your app's log folder.
  * `crashDumps` Directory where crash dumps are stored.

-Returns `string` - A path to a special directory or file associated with `name`. On
+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
+* `path` String
 * `options` Object (optional)
-  * `size` string
+  * `size` String
    * `small` - 16x16
    * `normal` - 32x32
    * `large` - 48x48 on _Linux_, 32x32 on _Windows_, unsupported on _macOS_.
@@ -669,8 +658,8 @@ On _Linux_ and _macOS_, icons depend on the application associated with file mim

 ### `app.setPath(name, path)`

-* `name` string
-* `path` string
+* `name` String
+* `path` String

 Overrides the `path` to a special directory or file associated with `name`.
 If the path specifies a directory that does not exist, an `Error` is thrown.
@@ -678,19 +667,19 @@ In that case, the directory should be created with `fs.mkdirSync` or similar.

 You can only override paths of a `name` defined in `app.getPath`.

-By default, web pages' cookies and caches will be stored under the `sessionData`
+By default, web pages' cookies and caches will be stored under the `userData`
 directory. If you want to change this location, you have to override the
-`sessionData` path before the `ready` event of the `app` module is emitted.
+`userData` path before the `ready` event of the `app` module is emitted.

 ### `app.getVersion()`

-Returns `string` - The version of the loaded application. If no version is found in the
+Returns `String` - The version of the loaded application. If no version is found in the
 application's `package.json` file, the version of the current bundle or
 executable is returned.

 ### `app.getName()`

-Returns `string` - The current application's name, which is the name in the application's
+Returns `String` - The current application's name, which is the name in the application's
 `package.json` file.

 Usually the `name` field of `package.json` is a short lowercase name, according
@@ -700,7 +689,7 @@ preferred over `name` by Electron.

 ### `app.setName(name)`

-* `name` string
+* `name` String

 Overrides the current application's name.

@@ -708,72 +697,25 @@ Overrides the current application's name.

 ### `app.getLocale()`

-Returns `string` - The current application locale, fetched using Chromium's `l10n_util` library.
-Possible return values are documented [here](https://source.chromium.org/chromium/chromium/src/+/main:ui/base/l10n/l10n_util.cc).
+Returns `String` - The current application locale, fetched using Chromium's `l10n_util` library.
+Possible return values are documented [here](https://source.chromium.org/chromium/chromium/src/+/master:ui/base/l10n/l10n_util.cc).

 To set the locale, you'll want to use a command line switch at app startup, which may be found [here](command-line-switches.md).

 **Note:** When distributing your packaged app, you have to also ship the
 `locales` folder.

-**Note:** This API must be called after the `ready` event is emitted.
-
-**Note:** To see example return values of this API compared to other locale and language APIs, see [`app.getPreferredSystemLanguages()`](#appgetpreferredsystemlanguages).
+**Note:** On Windows, you have to call it after the `ready` events gets emitted.

 ### `app.getLocaleCountryCode()`

-Returns `string` - User operating system's locale two-letter [ISO 3166](https://www.iso.org/iso-3166-country-codes.html) country code. The value is taken from native OS APIs.
+Returns `String` - User operating system's locale two-letter [ISO 3166](https://www.iso.org/iso-3166-country-codes.html) country code. The value is taken from native OS APIs.

 **Note:** When unable to detect locale country code, it returns empty string.

-### `app.getSystemLocale()`
-
-Returns `string` - The current system locale. On Windows and Linux, it is fetched using Chromium's `i18n` library. On macOS, `[NSLocale currentLocale]` is used instead. To get the user's current system language, which is not always the same as the locale, it is better to use [`app.getPreferredSystemLanguages()`](#appgetpreferredsystemlanguages).
-
-Different operating systems also use the regional data differently:
-
-* Windows 11 uses the regional format for numbers, dates, and times.
-* macOS Monterey uses the region for formatting numbers, dates, times, and for selecting the currency symbol to use.
-
-Therefore, this API can be used for purposes such as choosing a format for rendering dates and times in a calendar app, especially when the developer wants the format to be consistent with the OS.
-
-**Note:** This API must be called after the `ready` event is emitted.
-
-**Note:** To see example return values of this API compared to other locale and language APIs, see [`app.getPreferredSystemLanguages()`](#appgetpreferredsystemlanguages).
-
-### `app.getPreferredSystemLanguages()`
-
-Returns `string[]` - The user's preferred system languages from most preferred to least preferred, including the country codes if applicable. A user can modify and add to this list on Windows or macOS through the Language and Region settings.
-
-The API uses `GlobalizationPreferences` (with a fallback to `GetSystemPreferredUILanguages`) on Windows, `\[NSLocale preferredLanguages\]` on macOS, and `g_get_language_names` on Linux.
-
-This API can be used for purposes such as deciding what language to present the application in.
-
-Here are some examples of return values of the various language and locale APIs with different configurations:
-
-On Windows, given application locale is German, the regional format is Finnish (Finland), and the preferred system languages from most to least preferred are French (Canada), English (US), Simplified Chinese (China), Finnish, and Spanish (Latin America):
-
-```js
-app.getLocale() // 'de'
-app.getSystemLocale() // 'fi-FI'
-app.getPreferredSystemLanguages() // ['fr-CA', 'en-US', 'zh-Hans-CN', 'fi', 'es-419']
-```
-
-On macOS, given the application locale is German, the region is Finland, and the preferred system languages from most to least preferred are French (Canada), English (US), Simplified Chinese, and Spanish (Latin America):
-
-```js
-app.getLocale() // 'de'
-app.getSystemLocale() // 'fr-FI'
-app.getPreferredSystemLanguages() // ['fr-CA', 'en-US', 'zh-Hans-FI', 'es-419']
-```
-
-Both the available languages and regions and the possible return values differ between the two operating systems.
-
-As can be seen with the example above, on Windows, it is possible that a preferred system language has no country code, and that one of the preferred system languages corresponds with the language used for the regional format. On macOS, the region serves more as a default country code: the user doesn't need to have Finnish as a preferred language to use Finland as the region,and the country code `FI` is used as the country code for preferred system languages that do not have associated countries in the language name.
-
 ### `app.addRecentDocument(path)` _macOS_ _Windows_

-* `path` string
+* `path` String

 Adds `path` to the recent documents list.

@@ -786,15 +728,15 @@ Clears the recent documents list.

 ### `app.setAsDefaultProtocolClient(protocol[, path, args])`

-* `protocol` string - The name of your protocol, without `://`. For example,
+* `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.
+* `path` String (optional) _Windows_ - The path to the Electron executable.
  Defaults to `process.execPath`
-* `args` string[] (optional) _Windows_ - Arguments passed to the executable.
+* `args` String[] (optional) _Windows_ - Arguments passed to the executable.
  Defaults to an empty array

-Returns `boolean` - Whether the call succeeded.
+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.
@@ -817,22 +759,22 @@ The API uses the Windows Registry and `LSSetDefaultHandlerForURLScheme` internal

 ### `app.removeAsDefaultProtocolClient(protocol[, path, args])` _macOS_ _Windows_

-* `protocol` string - The name of your protocol, without `://`.
-* `path` string (optional) _Windows_ - Defaults to `process.execPath`
-* `args` string[] (optional) _Windows_ - Defaults to an empty array
+* `protocol` String - The name of your protocol, without `://`.
+* `path` String (optional) _Windows_ - Defaults to `process.execPath`
+* `args` String[] (optional) _Windows_ - Defaults to an empty array

-Returns `boolean` - Whether the call succeeded.
+Returns `Boolean` - Whether the call succeeded.

 This method checks if the current executable as the default handler for a
 protocol (aka URI scheme). If so, it will remove the app as the default handler.

 ### `app.isDefaultProtocolClient(protocol[, path, args])`

-* `protocol` string - The name of your protocol, without `://`.
-* `path` string (optional) _Windows_ - Defaults to `process.execPath`
-* `args` string[] (optional) _Windows_ - Defaults to an empty array
+* `protocol` String - The name of your protocol, without `://`.
+* `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
+Returns `Boolean` - Whether the current executable is the default handler for a
 protocol (aka URI scheme).

 **Note:** On macOS, you can use this method to check if the app has been
@@ -845,11 +787,11 @@ The API uses the Windows Registry and `LSCopyDefaultHandlerForURLScheme` interna

 ### `app.getApplicationNameForProtocol(url)`

-* `url` string - a URL with the protocol name to check. Unlike the other
+* `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
+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.
@@ -860,15 +802,15 @@ This method returns the application name of the default handler for the protocol

 ### `app.getApplicationInfoForProtocol(url)` _macOS_ _Windows_

-* `url` string - a URL with the protocol name to check. Unlike the other
+* `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 `Promise<Object>` - Resolve with an object containing the following:

 * `icon` NativeImage - the display icon of the app handling the protocol.
-* `path` string  - installation path of the app handling the protocol.
-* `name` string - display name of the app handling the protocol.
+* `path` String  - installation path of the app handling the protocol.
+* `name` String - display name of the app handling the protocol.

 This method returns a promise that contains the application name, icon and path of the default handler for the protocol
 (aka URI scheme) of a URL.
@@ -881,7 +823,7 @@ Adds `tasks` to the [Tasks][tasks] category of the Jump List on Windows.

 `tasks` is an array of [`Task`](structures/task.md) objects.

-Returns `boolean` - Whether the call succeeded.
+Returns `Boolean` - Whether the call succeeded.

 **Note:** If you'd like to customize the Jump List even more use
 `app.setJumpList(categories)` instead.
@@ -903,8 +845,6 @@ Returns `Object`:

 * `categories` [JumpListCategory[]](structures/jump-list-category.md) | `null` - Array of `JumpListCategory` objects.

-Returns `string`
-
 Sets or removes a custom Jump List for the application, and returns one of the
 following strings:

@@ -998,11 +938,9 @@ app.setJumpList([
 ])
 ```

-### `app.requestSingleInstanceLock([additionalData])`
+### `app.requestSingleInstanceLock()`

-* `additionalData` Record<any, any> (optional) - A JSON object containing additional data to send to the first instance.
-
-Returns `boolean`
+Returns `Boolean`

 The return value of this method indicates whether or not this instance of your
 application successfully obtained the lock.  If it failed to obtain the lock,
@@ -1027,16 +965,12 @@ starts:
 const { app } = require('electron')
 let myWindow = null

-const additionalData = { myKey: 'myValue' }
-const gotTheLock = app.requestSingleInstanceLock(additionalData)
+const gotTheLock = app.requestSingleInstanceLock()

 if (!gotTheLock) {
  app.quit()
 } else {
-  app.on('second-instance', (event, commandLine, workingDirectory, additionalData) => {
-    // Print out data received from the second instance.
-    console.log(additionalData)
-
+  app.on('second-instance', (event, commandLine, workingDirectory) => {
    // Someone tried to run a second instance, we should focus our window.
    if (myWindow) {
      if (myWindow.isMinimized()) myWindow.restore()
@@ -1053,7 +987,7 @@ if (!gotTheLock) {

 ### `app.hasSingleInstanceLock()`

-Returns `boolean`
+Returns `Boolean`

 This method returns whether or not this instance of your app is currently
 holding the single instance lock.  You can request the lock with
@@ -1067,10 +1001,10 @@ allow multiple instances of the application to once again run side by side.

 ### `app.setUserActivity(type, userInfo[, webpageURL])` _macOS_

-* `type` string - Uniquely identifies the activity. Maps to
+* `type` String - Uniquely identifies the activity. Maps to
  [`NSUserActivity.activityType`][activity-type].
 * `userInfo` any - App-specific state to store for use by another device.
-* `webpageURL` string (optional) - The webpage to load in a browser if no suitable app is
+* `webpageURL` String (optional) - The webpage to load in a browser if no suitable app is
  installed on the resuming device. The scheme must be `http` or `https`.

 Creates an `NSUserActivity` and sets it as the current activity. The activity
@@ -1078,7 +1012,7 @@ is eligible for [Handoff][handoff] to another device afterward.

 ### `app.getCurrentActivityType()` _macOS_

-Returns `string` - The type of the currently running activity.
+Returns `String` - The type of the currently running activity.

 ### `app.invalidateCurrentActivity()` _macOS_

@@ -1090,7 +1024,7 @@ Marks the current [Handoff][handoff] user activity as inactive without invalidat

 ### `app.updateCurrentActivity(type, userInfo)` _macOS_

-* `type` string - Uniquely identifies the activity. Maps to
+* `type` String - Uniquely identifies the activity. Maps to
  [`NSUserActivity.activityType`][activity-type].
 * `userInfo` any - App-specific state to store for use by another device.

@@ -1099,13 +1033,13 @@ Updates the current activity if its type matches `type`, merging the entries fro

 ### `app.setAppUserModelId(id)` _Windows_

-* `id` string
+* `id` String

 Changes the [Application User Model ID][app-user-model-id] to `id`.

 ### `app.setActivationPolicy(policy)` _macOS_

-* `policy` string - Can be 'regular', 'accessory', or 'prohibited'.
+* `policy` String - Can be 'regular', 'accessory', or 'prohibited'.

 Sets the activation policy for a given app.

@@ -1118,35 +1052,35 @@ Activation policy types:
 ### `app.importCertificate(options, callback)` _Linux_

 * `options` Object
-  * `certificate` string - Path for the pkcs12 file.
-  * `password` string - Passphrase for the certificate.
+  * `certificate` String - Path for the pkcs12 file.
+  * `password` String - Passphrase for the certificate.
 * `callback` Function
  * `result` Integer - Result of import.

 Imports the certificate in pkcs12 format into the platform certificate store.
 `callback` is called with the `result` of import operation, a value of `0`
-indicates success while any other value indicates failure according to Chromium [net_error_list](https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h).
+indicates success while any other value indicates failure according to Chromium [net_error_list](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).

 ### `app.configureHostResolver(options)`

 * `options` Object
-  * `enableBuiltInResolver` boolean (optional) - Whether the built-in host
+  * `enableBuiltInResolver` Boolean (optional) - Whether the built-in host
    resolver is used in preference to getaddrinfo. When enabled, the built-in
    resolver will attempt to use the system's DNS settings to do DNS lookups
    itself. Enabled by default on macOS, disabled by default on Windows and
    Linux.
-  * `secureDnsMode` string (optional) - Can be "off", "automatic" or "secure".
+  * `secureDnsMode` String (optional) - Can be "off", "automatic" or "secure".
    Configures the DNS-over-HTTP mode. When "off", no DoH lookups will be
-    performed. When "automatic", DoH lookups will be performed first if DoH is
+    performed. When "automatic", DoH lookups will be peformed first if DoH is
    available, and insecure DNS lookups will be performed as a fallback. When
    "secure", only DoH lookups will be performed. Defaults to "automatic".
-  * `secureDnsServers` string[]&#32;(optional) - A list of DNS-over-HTTP
+  * `secureDnsServers` String[]&#32;(optional) - A list of DNS-over-HTTP
    server templates. See [RFC8484 § 3][] for details on the template format.
    Most servers support the POST method; the template for such servers is
    simply a URI. Note that for [some DNS providers][doh-providers], the
    resolver will automatically upgrade to DoH unless DoH is explicitly
    disabled, even if there are no DoH servers provided in this list.
-  * `enableAdditionalDnsQueryTypes` boolean (optional) - Controls whether additional DNS
+  * `enableAdditionalDnsQueryTypes` Boolean (optional) - Controls whether additional DNS
    query types, e.g. HTTPS (DNS type 65) will be allowed besides the
    traditional A and AAAA queries when a request is being made via insecure
    DNS. Has no effect on Secure DNS which always allows additional types.
@@ -1208,7 +1142,7 @@ Returns [`GPUFeatureStatus`](structures/gpu-feature-status.md) - The Graphics Fe

 ### `app.getGPUInfo(infoType)`

-* `infoType` string - Can be `basic` or `complete`.
+* `infoType` String - Can be `basic` or `complete`.

 Returns `Promise<unknown>`

@@ -1245,13 +1179,13 @@ For `infoType` equal to `basic`:
 }
 ```

-Using `basic` should be preferred if only basic information like `vendorId` or `deviceId` is needed.
+Using `basic` should be preferred if only basic information like `vendorId` or `driverId` is needed.

 ### `app.setBadgeCount([count])` _Linux_ _macOS_

 * `count` Integer (optional) - If a value is provided, set the badge to the provided value otherwise, on macOS, display a plain white dot (e.g. unknown number of notifications). On Linux, if a value is not provided the badge will not display.

-Returns `boolean` - Whether the call succeeded.
+Returns `Boolean` - Whether the call succeeded.

 Sets the counter badge for current app. Setting the count to `0` will hide the
 badge.
@@ -1267,14 +1201,14 @@ Returns `Integer` - The current value displayed in the counter badge.

 ### `app.isUnityRunning()` _Linux_

-Returns `boolean` - Whether the current desktop environment is Unity launcher.
+Returns `Boolean` - Whether the current desktop environment is Unity launcher.

 ### `app.getLoginItemSettings([options])` _macOS_ _Windows_

 * `options` Object (optional)
-  * `path` string (optional) _Windows_ - The executable path to compare against.
+  * `path` String (optional) _Windows_ - The executable path to compare against.
    Defaults to `process.execPath`.
-  * `args` string[] (optional) _Windows_ - The command-line arguments to compare
+  * `args` String[] (optional) _Windows_ - The command-line arguments to compare
    against. Defaults to an empty array.

 If you provided `path` and `args` options to `app.setLoginItemSettings`, then you
@@ -1282,43 +1216,43 @@ need to pass the same arguments here for `openAtLogin` to be set correctly.

 Returns `Object`:

-* `openAtLogin` boolean - `true` if the app is set to open at login.
-* `openAsHidden` boolean _macOS_ - `true` if the app is set to open as hidden at login.
+* `openAtLogin` Boolean - `true` if the app is set to open at login.
+* `openAsHidden` Boolean _macOS_ - `true` if the app is set to open as hidden at login.
  This setting is not available on [MAS builds][mas-builds].
-* `wasOpenedAtLogin` boolean _macOS_ - `true` if the app was opened at login
+* `wasOpenedAtLogin` Boolean _macOS_ - `true` if the app was opened at login
  automatically. This setting is not available on [MAS builds][mas-builds].
-* `wasOpenedAsHidden` boolean _macOS_ - `true` if the app was opened as a hidden login
+* `wasOpenedAsHidden` Boolean _macOS_ - `true` if the app was opened as a hidden login
  item. This indicates that the app should not open any windows at startup.
  This setting is not available on [MAS builds][mas-builds].
-* `restoreState` boolean _macOS_ - `true` if the app was opened as a login item that
+* `restoreState` Boolean _macOS_ - `true` if the app was opened as a login item that
  should restore the state from the previous session. This indicates that the
  app should restore the windows that were open the last time the app was
  closed. This setting is not available on [MAS builds][mas-builds].
-* `executableWillLaunchAtLogin` boolean _Windows_ - `true` if app is set to open at login and its run key is not deactivated. This differs from `openAtLogin` as it ignores the `args` option, this property will be true if the given executable would be launched at login with **any** arguments.
+* `executableWillLaunchAtLogin` Boolean _Windows_ - `true` if app is set to open at login and its run key is not deactivated. This differs from `openAtLogin` as it ignores the `args` option, this property will be true if the given executable would be launched at login with **any** arguments.
 * `launchItems` Object[] _Windows_
-  * `name` string _Windows_ - name value of a registry entry.
-  * `path` string _Windows_ - The executable to an app that corresponds to a registry entry.
-  * `args` string[] _Windows_ - the command-line arguments to pass to the executable.
-  * `scope` string _Windows_ - one of `user` or `machine`. Indicates whether the registry entry is under `HKEY_CURRENT USER` or `HKEY_LOCAL_MACHINE`.
-  * `enabled` boolean _Windows_ - `true` if the app registry key is startup approved and therefore shows as `enabled` in Task Manager and Windows settings.
+  * `name` String _Windows_ - name value of a registry entry.
+  * `path` String _Windows_ - The executable to an app that corresponds to a registry entry.
+  * `args` String[] _Windows_ - the command-line arguments to pass to the executable.
+  * `scope` String _Windows_ - one of `user` or `machine`. Indicates whether the registry entry is under `HKEY_CURRENT USER` or `HKEY_LOCAL_MACHINE`.
+  * `enabled` Boolean _Windows_ - `true` if the app registry key is startup approved and therefore shows as `enabled` in Task Manager and Windows settings.

 ### `app.setLoginItemSettings(settings)` _macOS_ _Windows_

 * `settings` Object
-  * `openAtLogin` boolean (optional) - `true` to open the app at login, `false` to remove
+  * `openAtLogin` Boolean (optional) - `true` to open the app at login, `false` to remove
    the app as a login item. Defaults to `false`.
-  * `openAsHidden` boolean (optional) _macOS_ - `true` to open the app as hidden. Defaults to
+  * `openAsHidden` Boolean (optional) _macOS_ - `true` to open the app as hidden. Defaults to
    `false`. The user can edit this setting from the System Preferences so
    `app.getLoginItemSettings().wasOpenedAsHidden` should be checked when the app
    is opened to know the current value. This setting is not available on [MAS builds][mas-builds].
-  * `path` string (optional) _Windows_ - The executable to launch at login.
+  * `path` String (optional) _Windows_ - The executable to launch at login.
    Defaults to `process.execPath`.
-  * `args` string[] (optional) _Windows_ - The command-line arguments to pass to
+  * `args` String[] (optional) _Windows_ - The command-line arguments to pass to
    the executable. Defaults to an empty array. Take care to wrap paths in
    quotes.
-  * `enabled` boolean (optional) _Windows_ - `true` will change the startup approved registry key and `enable / disable` the App in Task Manager and Windows Settings.
+  * `enabled` Boolean (optional) _Windows_ - `true` will change the startup approved registry key and `enable / disable` the App in Task Manager and Windows Settings.
    Defaults to `true`.
-  * `name` string (optional) _Windows_ - value name to write into registry. Defaults to the app's AppUserModelId().
+  * `name` String (optional) _Windows_ - value name to write into registry. Defaults to the app's AppUserModelId().
 Set the app's login item settings.

 To work with Electron's `autoUpdater` on Windows, which uses [Squirrel][Squirrel-Windows],
@@ -1342,7 +1276,7 @@ app.setLoginItemSettings({

 ### `app.isAccessibilitySupportEnabled()` _macOS_ _Windows_

-Returns `boolean` - `true` if Chrome's accessibility support is enabled,
+Returns `Boolean` - `true` if Chrome's accessibility support is enabled,
 `false` otherwise. This API will return `true` if the use of assistive
 technologies, such as screen readers, has been detected. See
 https://www.chromium.org/developers/design-documents/accessibility for more
@@ -1350,7 +1284,7 @@ details.

 ### `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
+* `enabled` Boolean - Enable or disable [accessibility tree](https://developers.google.com/web/fundamentals/accessibility/semantics-builtin/the-accessibility-tree) rendering

 Manually enables Chrome's accessibility support, allowing to expose accessibility switch to users in application settings. See [Chromium's accessibility docs](https://www.chromium.org/developers/design-documents/accessibility) for more
 details. Disabled by default.
@@ -1366,14 +1300,14 @@ Show the app's about panel options. These options can be overridden with `app.se
 ### `app.setAboutPanelOptions(options)`

 * `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.
-  * `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 in a JPEG or PNG file format. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
+  * `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.
+  * `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 in a JPEG or PNG file format. On Linux, 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.

@@ -1381,7 +1315,7 @@ If you do not set `credits` but still wish to surface them in your app, AppKit w

 ### `app.isEmojiPanelSupported()`

-Returns `boolean` - whether or not the current OS version allows for native emoji pickers.
+Returns `Boolean` - whether or not the current OS version allows for native emoji pickers.

 ### `app.showEmojiPanel()` _macOS_ _Windows_

@@ -1389,7 +1323,7 @@ Show the platform's native emoji picker.

 ### `app.startAccessingSecurityScopedResource(bookmarkData)` _mas_

-* `bookmarkData` string - The base64 encoded security scoped bookmark data returned by the `dialog.showOpenDialog` or `dialog.showSaveDialog` methods.
+* `bookmarkData` String - The base64 encoded security scoped bookmark data returned by the `dialog.showOpenDialog` or `dialog.showSaveDialog` methods.

 Returns `Function` - This function **must** be called once you have finished accessing the security scoped file. If you do not remember to stop accessing the bookmark, [kernel resources will be leaked](https://developer.apple.com/reference/foundation/nsurl/1417051-startaccessingsecurityscopedreso?language=objc) and your app will lose its ability to reach outside the sandbox completely, until your app is restarted.

@@ -1412,16 +1346,16 @@ This method can only be called before app is ready.

 ### `app.isInApplicationsFolder()` _macOS_

-Returns `boolean` - Whether the application is currently running from the
+Returns `Boolean` - Whether the application is currently running from the
 systems Application folder. Use in combination with `app.moveToApplicationsFolder()`

 ### `app.moveToApplicationsFolder([options])` _macOS_

 * `options` Object (optional)
-  * `conflictHandler` Function\<boolean> (optional) - A handler for potential conflict in move failure.
-    * `conflictType` string - The type of move conflict encountered by the handler; can be `exists` or `existsAndRunning`, where `exists` means that an app of the same name is present in the Applications directory and `existsAndRunning` means both that it exists and that it's presently running.
+  * `conflictHandler` Function\<Boolean> (optional) - A handler for potential conflict in move failure.
+    * `conflictType` String - The type of move conflict encountered by the handler; can be `exists` or `existsAndRunning`, where `exists` means that an app of the same name is present in the Applications directory and `existsAndRunning` means both that it exists and that it's presently running.

-Returns `boolean` - Whether the move was successful. Please note that if
+Returns `Boolean` - Whether the move was successful. Please note that if
 the move is successful, your application will quit and relaunch.

 No confirmation dialog will be presented by default. If you wish to allow
@@ -1434,7 +1368,7 @@ method returns false. If we fail to perform the copy, then this method will
 throw an error. The message in the error should be informative and tell
 you exactly what went wrong.

-By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the preexisting running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
+By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the pre-existing running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.

 For example:

@@ -1457,13 +1391,13 @@ Would mean that if an app already exists in the user directory, if the user choo

 ### `app.isSecureKeyboardEntryEnabled()` _macOS_

-Returns `boolean` - whether `Secure Keyboard Entry` is enabled.
+Returns `Boolean` - whether `Secure Keyboard Entry` is enabled.

 By default this API will return `false`.

 ### `app.setSecureKeyboardEntryEnabled(enabled)` _macOS_

-* `enabled` boolean - Enable or disable `Secure Keyboard Entry`
+* `enabled` Boolean - Enable or disable `Secure Keyboard Entry`

 Set the `Secure Keyboard Entry` is enabled in your application.

@@ -1478,7 +1412,7 @@ details.

 ### `app.accessibilitySupportEnabled` _macOS_ _Windows_

-A `boolean` property that's `true` if Chrome's accessibility support is enabled, `false` otherwise. This property will be `true` if the use of assistive technologies, such as screen readers, has been detected. Setting this property to `true` manually enables Chrome's accessibility support, allowing developers to expose accessibility switch to users in application settings.
+A `Boolean` property that's `true` if Chrome's accessibility support is enabled, `false` otherwise. This property will be `true` if the use of assistive technologies, such as screen readers, has been detected. Setting this property to `true` manually enables Chrome's accessibility support, allowing developers to expose accessibility switch to users in application settings.

 See [Chromium's accessibility docs](https://www.chromium.org/developers/design-documents/accessibility) for more details. Disabled by default.

@@ -1515,25 +1449,26 @@ dock on macOS.

 ### `app.isPackaged` _Readonly_

-A `boolean` property that returns  `true` if the app is packaged, `false` otherwise. For many apps, this property can be used to distinguish development and production environments.
+A `Boolean` property that returns  `true` if the app is packaged, `false` otherwise. For many apps, this property can be used to distinguish development and production environments.

-[tasks]:https://learn.microsoft.com/en-us/windows/win32/shell/taskbar-extensions#tasks
-[app-user-model-id]: https://learn.microsoft.com/en-us/windows/win32/shell/appids
+[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/documentation/coreservices/1441725-lscopydefaulthandlerforurlscheme?language=objc
+[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
 [activity-type]: https://developer.apple.com/library/ios/documentation/Foundation/Reference/NSUserActivity_Class/index.html#//apple_ref/occ/instp/NSUserActivity/activityType
 [unity-requirement]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher
 [mas-builds]: ../tutorial/mac-app-store-submission-guide.md
 [Squirrel-Windows]: https://github.com/Squirrel/Squirrel.Windows
-[JumpListBeginListMSDN]: https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/nf-shobjidl_core-icustomdestinationlist-beginlist
+[JumpListBeginListMSDN]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378398(v=vs.85).aspx
 [about-panel-options]: https://developer.apple.com/reference/appkit/nsapplication/1428479-orderfrontstandardaboutpanelwith?language=objc

 ### `app.name`

-A `string` property that indicates the current application's name, which is the name in the application's `package.json` file.
+A `String` property that indicates the current application's name, which is the name in the application's `package.json` file.

 Usually the `name` field of `package.json` is a short lowercase name, according
 to the npm modules spec. You should usually also specify a `productName`
@@ -1542,7 +1477,7 @@ preferred over `name` by Electron.

 ### `app.userAgentFallback`

-A `string` which is the user agent string Electron will use as a global fallback.
+A `String` which is the user agent string Electron will use as a global fallback.

 This is the user agent that will be used when no user agent is set at the
 `webContents` or `session` level.  It is useful for ensuring that your entire
@@ -1551,7 +1486,7 @@ in your app's initialization to ensure that your overridden value is used.

 ### `app.runningUnderRosettaTranslation` _macOS_ _Readonly_ _Deprecated_

-A `boolean` which when `true` indicates that the app is currently running
+A `Boolean` which when `true` indicates that the app is currently running
 under the [Rosetta Translator Environment](https://en.wikipedia.org/wiki/Rosetta_(software)).

 You can use this property to prompt users to download the arm64 version of
@@ -1564,10 +1499,11 @@ and Windows.

 ### `app.runningUnderARM64Translation` _Readonly_ _macOS_ _Windows_

-A `boolean` which when `true` indicates that the app is currently running under
+A `Boolean` which when `true` indicates that the app is currently running under
 an ARM64 translator (like the macOS
 [Rosetta Translator Environment](https://en.wikipedia.org/wiki/Rosetta_(software))
 or Windows [WOW](https://en.wikipedia.org/wiki/Windows_on_Windows)).

 You can use this property to prompt users to download the arm64 version of
-your application when they are mistakenly running the x64 version under Rosetta or WOW.
+your application when they are running the x64 version under Rosetta
+incorrectly.
--- a/docs/api/auto-updater.md
+++ b/docs/api/auto-updater.md
@@ -32,9 +32,9 @@ This is a requirement of `Squirrel.Mac`.

 On Windows, you have to install your app into a user's machine before you can
 use the `autoUpdater`, so it is recommended that you use the
-[electron-winstaller][installer-lib], [Electron Forge][electron-forge-lib] or the [grunt-electron-installer][installer] package to generate a Windows installer.
+[electron-winstaller][installer-lib], [electron-forge][electron-forge-lib] or the [grunt-electron-installer][installer] package to generate a Windows installer.

-When using [electron-winstaller][installer-lib] or [Electron Forge][electron-forge-lib] make sure you do not try to update your app [the first time it runs](https://github.com/electron/windows-installer#handling-squirrel-events) (Also see [this issue for more info](https://github.com/electron/electron/issues/7155)). It's also recommended to use [electron-squirrel-startup](https://github.com/mongodb-js/electron-squirrel-startup) to get desktop shortcuts for your app.
+When using [electron-winstaller][installer-lib] or [electron-forge][electron-forge-lib] make sure you do not try to update your app [the first time it runs](https://github.com/electron/windows-installer#handling-squirrel-events) (Also see [this issue for more info](https://github.com/electron/electron/issues/7155)). It's also recommended to use [electron-squirrel-startup](https://github.com/mongodb-js/electron-squirrel-startup) to get desktop shortcuts for your app.

 The installer generated with Squirrel will create a shortcut icon with an
 [Application User Model ID][app-user-model-id] in the format of
@@ -43,7 +43,7 @@ The installer generated with Squirrel will create a shortcut icon with an
 same ID for your app with `app.setAppUserModelId` API, otherwise Windows will
 not be able to pin your app properly in task bar.

-Like Squirrel.Mac, Windows can host updates on S3 or any other static file host.
+Unlike Squirrel.Mac, Windows can host updates on S3 or any other static file host.
 You can read the documents of [Squirrel.Windows][squirrel-windows] to get more details
 about how Squirrel.Windows works.

@@ -77,10 +77,10 @@ Emitted when there is no available update.
 Returns:

 * `event` Event
-* `releaseNotes` string
-* `releaseName` string
+* `releaseNotes` String
+* `releaseName` String
 * `releaseDate` Date
-* `updateURL` string
+* `updateURL` String

 Emitted when an update has been downloaded.

@@ -102,16 +102,16 @@ The `autoUpdater` object has the following methods:
 ### `autoUpdater.setFeedURL(options)`

 * `options` Object
-  * `url` string
-  * `headers` Record<string, string> (optional) _macOS_ - HTTP request headers.
-  * `serverType` string (optional) _macOS_ - Can be `json` or `default`, see the [Squirrel.Mac][squirrel-mac]
+  * `url` String
+  * `headers` Record<String, String> (optional) _macOS_ - HTTP request headers.
+  * `serverType` String (optional) _macOS_ - Can be `json` or `default`, see the [Squirrel.Mac][squirrel-mac]
    README for more information.

 Sets the `url` and initialize the auto updater.

 ### `autoUpdater.getFeedURL()`

-Returns `string` - The current update feed URL.
+Returns `String` - The current update feed URL.

 ### `autoUpdater.checkForUpdates()`

@@ -139,6 +139,6 @@ application starts.
 [squirrel-windows]: https://github.com/Squirrel/Squirrel.Windows
 [installer]: https://github.com/electron/grunt-electron-installer
 [installer-lib]: https://github.com/electron/windows-installer
-[electron-forge-lib]: https://github.com/electron/forge
-[app-user-model-id]: https://learn.microsoft.com/en-us/windows/win32/shell/appids
+[electron-forge-lib]: https://github.com/electron-userland/electron-forge
+[app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -11,23 +11,18 @@ relative to its owning window. It is meant to be an alternative to the

 Process: [Main](../glossary.md#main-process)

-This module cannot be used until the `ready` event of the `app`
-module is emitted.
-
 ### Example

 ```javascript
 // In the main process.
-const { app, BrowserView, BrowserWindow } = require('electron')
+const { BrowserView, BrowserWindow } = require('electron')

-app.whenReady().then(() => {
-  const win = new BrowserWindow({ width: 800, height: 600 })
+const win = new BrowserWindow({ width: 800, height: 600 })

-  const view = new BrowserView()
-  win.setBrowserView(view)
-  view.setBounds({ x: 0, y: 0, width: 300, height: 300 })
-  view.webContents.loadURL('https://electronjs.org')
-})
+const view = new BrowserView()
+win.setBrowserView(view)
+view.setBounds({ x: 0, y: 0, width: 300, height: 300 })
+view.webContents.loadURL('https://electronjs.org')
 ```

 ### `new BrowserView([options])` _Experimental_
@@ -50,13 +45,13 @@ Objects created with `new BrowserView` have the following instance methods:
 #### `view.setAutoResize(options)` _Experimental_

 * `options` Object
-  * `width` boolean (optional) - If `true`, the view's width will grow and shrink together
+  * `width` Boolean (optional) - If `true`, the view's width will grow and shrink together
    with the window. `false` by default.
-  * `height` boolean (optional) - If `true`, the view's height will grow and shrink
+  * `height` Boolean (optional) - If `true`, the view's height will grow and shrink
    together with the window. `false` by default.
-  * `horizontal` boolean (optional) - If `true`, the view's x position and width will grow
+  * `horizontal` Boolean (optional) - If `true`, the view's x position and width will grow
    and shrink proportionally with the window. `false` by default.
-  * `vertical` boolean (optional) - If `true`, the view's y position and height will grow
+  * `vertical` Boolean (optional) - If `true`, the view's y position and height will grow
    and shrink proportionally with the window. `false` by default.

 #### `view.setBounds(bounds)` _Experimental_
@@ -73,31 +68,5 @@ The `bounds` of this BrowserView instance as `Object`.

 #### `view.setBackgroundColor(color)` _Experimental_

-* `color` string - Color in Hex, RGB, ARGB, HSL, HSLA or named CSS color format. The alpha channel is
-  optional for the hex type.
-
-Examples of valid `color` values:
-
-* Hex
-  * #fff (RGB)
-  * #ffff (ARGB)
-  * #ffffff (RRGGBB)
-  * #ffffffff (AARRGGBB)
-* RGB
-  * rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)
-    * e.g. rgb(255, 255, 255)
-* RGBA
-  * rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)
-    * e.g. rgba(255, 255, 255, 1.0)
-* HSL
-  * hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)
-    * e.g. hsl(200, 20%, 50%)
-* HSLA
-  * hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)
-    * e.g. hsla(200, 20%, 50%, 0.5)
-* Color name
-  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
-  * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
-    * e.g. `blueviolet` or `red`
-
-**Note:** Hex format with alpha takes `AARRGGBB` or `ARGB`, _not_ `RRGGBBA` or `RGA`.
+* `color` String - Color in `#aarrggbb` or `#argb` form. The alpha channel is
+  optional.
--- a/docs/api/browser-window-proxy.md
+++ b/docs/api/browser-window-proxy.md
@@ -0,0 +1,54 @@
+## Class: BrowserWindowProxy
+
+> Manipulate the child browser window
+
+Process: [Renderer](../glossary.md#renderer-process)<br />
+_This class is not exported from the `'electron'` module. It is only available as a return value of other methods in the Electron API._
+
+The `BrowserWindowProxy` object is returned from `window.open` and provides
+limited functionality with the child window.
+
+### Instance Methods
+
+The `BrowserWindowProxy` object has the following instance methods:
+
+#### `win.blur()`
+
+Removes focus from the child window.
+
+#### `win.close()`
+
+Forcefully closes the child window without calling its unload event.
+
+#### `win.eval(code)`
+
+* `code` String
+
+Evaluates the code in the child window.
+
+#### `win.focus()`
+
+Focuses the child window (brings the window to front).
+
+#### `win.print()`
+
+Invokes the print dialog on the child window.
+
+#### `win.postMessage(message, targetOrigin)`
+
+* `message` any
+* `targetOrigin` String
+
+Sends a message to the child window with the specified origin or `*` for no
+origin preference.
+
+In addition to these methods, the child window implements `window.opener` object
+with no properties and a single method.
+
+### Instance Properties
+
+The `BrowserWindowProxy` object has the following instance properties:
+
+#### `win.closed`
+
+A `Boolean` that is set to true after the child window gets closed.
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -10,20 +10,20 @@ interface and is therefore an [EventEmitter][event-emitter].

 ### `new ClientRequest(options)`

-* `options` (Object | string) - If `options` is a string, it is interpreted as
+* `options` (Object | String) - If `options` is a String, it is interpreted as
 the request URL. If it is an object, it is expected to fully specify an HTTP request via the
 following properties:
-  * `method` string (optional) - The HTTP request method. Defaults to the GET
+  * `method` String (optional) - The HTTP request method. Defaults to the GET
    method.
-  * `url` string (optional) - The request URL. Must be provided in the absolute
+  * `url` String (optional) - The request URL. Must be provided in the absolute
    form with the protocol scheme specified as http or https.
  * `session` Session (optional) - The [`Session`](session.md) instance with
    which the request is associated.
-  * `partition` string (optional) - The name of the [`partition`](session.md)
+  * `partition` String (optional) - The name of the [`partition`](session.md)
    with which the request is associated. Defaults to the empty string. The
    `session` option supersedes `partition`. Thus if a `session` is explicitly
    specified, `partition` is ignored.
-  * `credentials` string (optional) - Can be `include` or `omit`. Whether to
+  * `credentials` String (optional) - Can be `include` or `omit`. Whether to
    send [credentials](https://fetch.spec.whatwg.org/#credentials) with this
    request. If set to `include`, credentials from the session associated with
    the request will be used. If set to `omit`, credentials will not be sent
@@ -33,22 +33,22 @@ following properties:
    option of the same name. If this option is not specified, authentication
    data from the session will be sent, and cookies will not be sent (unless
    `useSessionCookies` is set).
-  * `useSessionCookies` boolean (optional) - Whether to send cookies with this
+  * `useSessionCookies` Boolean (optional) - Whether to send cookies with this
    request from the provided session. If `credentials` is specified, this
    option has no effect. Default is `false`.
-  * `protocol` string (optional) - Can be `http:` or `https:`. The protocol
+  * `protocol` String (optional) - Can be `http:` or `https:`. The protocol
    scheme in the form 'scheme:'. Defaults to 'http:'.
-  * `host` string (optional) - The server host provided as a concatenation of
+  * `host` String (optional) - The server host provided as a concatenation of
    the hostname and the port number 'hostname:port'.
-  * `hostname` string (optional) - The server host name.
+  * `hostname` String (optional) - The server host name.
  * `port` Integer (optional) - The server's listening port number.
-  * `path` string (optional) - The path part of the request URL.
-  * `redirect` string (optional) - Can be `follow`, `error` or `manual`. The
+  * `path` String (optional) - The path part of the request URL.
+  * `redirect` String (optional) - Can be `follow`, `error` or `manual`. The
    redirect mode for this request. 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.  Defaults to `follow`.
-  * `origin` string (optional) - The origin URL of the request.
+  * `origin` String (optional) - The origin URL of the request.

 `options` properties such as `protocol`, `host`, `hostname`, `port` and `path`
 strictly follow the Node.js model as described in the
@@ -79,21 +79,21 @@ Returns:
 Returns:

 * `authInfo` Object
-  * `isProxy` boolean
-  * `scheme` string
-  * `host` string
+  * `isProxy` Boolean
+  * `scheme` String
+  * `host` String
  * `port` Integer
-  * `realm` string
+  * `realm` String
 * `callback` Function
-  * `username` string (optional)
-  * `password` string (optional)
+  * `username` String (optional)
+  * `password` String (optional)

 Emitted when an authenticating proxy is asking for user credentials.

 The `callback` function is expected to be called back with user credentials:

-* `username` string
-* `password` string
+* `username` String
+* `password` String

 ```JavaScript
 request.on('login', (authInfo, callback) => {
@@ -147,9 +147,9 @@ event indicates that no more events will be emitted on either the `request` or
 Returns:

 * `statusCode` Integer
-* `method` string
-* `redirectUrl` string
-* `responseHeaders` Record<string, string[]>
+* `method` String
+* `redirectUrl` String
+* `responseHeaders` Record<String, String[]>

 Emitted when the server returns a redirect response (e.g. 301 Moved
 Permanently). Calling [`request.followRedirect`](#requestfollowredirect) will
@@ -161,7 +161,7 @@ continue with the redirection.  If this event is handled,

 #### `request.chunkedEncoding`

-A `boolean` specifying whether the request will use HTTP chunked transfer encoding
+A `Boolean` specifying whether the request will use HTTP chunked transfer encoding
 or not. Defaults to false. The property is readable and writable, however it can
 be set only before the first write operation as the HTTP headers are not yet put
 on the wire. Trying to set the `chunkedEncoding` property after the first write
@@ -175,17 +175,17 @@ internally buffered inside Electron process memory.

 #### `request.setHeader(name, value)`

-* `name` string - An extra HTTP header name.
-* `value` string - An extra HTTP header value.
+* `name` String - An extra HTTP header name.
+* `value` String - An extra HTTP header value.

 Adds an extra HTTP header. The header name will be issued as-is without
 lowercasing. It can be called only before first write. Calling this method after
-the first write will throw an error. If the passed value is not a `string`, its
+the first write will throw an error. If the passed value is not a `String`, its
 `toString()` method will be called to obtain the final value.

 Certain headers are restricted from being set by apps. These headers are
 listed below. More information on restricted headers can be found in
-[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/main:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).
+[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/master:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).

 * `Content-Length`
 * `Host`
@@ -199,22 +199,22 @@ Additionally, setting the `Connection` header to the value `upgrade` is also dis

 #### `request.getHeader(name)`

-* `name` string - Specify an extra header name.
+* `name` String - Specify an extra header name.

-Returns `string` - The value of a previously set extra header name.
+Returns `String` - The value of a previously set extra header name.

 #### `request.removeHeader(name)`

-* `name` string - Specify an extra header name.
+* `name` String - Specify an extra header name.

 Removes a previously set extra header name. This method can be called only
 before first write. Trying to call it after the first write will throw an error.

 #### `request.write(chunk[, encoding][, callback])`

-* `chunk` (string | Buffer) - A chunk of the request body's data. If it is a
+* `chunk` (String | Buffer) - A chunk of the request body's data. If it is a
 string, it is converted into a Buffer using the specified encoding.
-* `encoding` string (optional) - Used to convert string chunks into Buffer
+* `encoding` String (optional) - Used to convert string chunks into Buffer
 objects. Defaults to 'utf-8'.
 * `callback` Function (optional) - Called after the write operation ends.

@@ -230,8 +230,8 @@ it is not allowed to add or remove a custom header.

 #### `request.end([chunk][, encoding][, callback])`

-* `chunk` (string | Buffer) (optional)
-* `encoding` string (optional)
+* `chunk` (String | Buffer) (optional)
+* `encoding` String (optional)
 * `callback` Function (optional)

 Sends the last chunk of the request data. Subsequent write or end operations
@@ -253,9 +253,9 @@ event.

 Returns `Object`:

-* `active` boolean - Whether the request is currently active. If this is false
+* `active` Boolean - Whether the request is currently active. If this is false
 no other properties will be set
-* `started` boolean - Whether the upload has started. If this is false both
+* `started` Boolean - Whether the upload has started. If this is false both
 `current` and `total` will be set to 0.
 * `current` Integer - The number of bytes that have been uploaded so far
 * `total` Integer - The number of bytes that will be uploaded this request
--- a/docs/api/clipboard.md
+++ b/docs/api/clipboard.md
@@ -2,7 +2,7 @@

 > Perform copy and paste operations on the system clipboard.

-Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process) (non-sandboxed only)
+Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process)

 On Linux, there is also a `selection` clipboard. To manipulate it
 you need to pass `selection` to each method:
@@ -10,7 +10,7 @@ you need to pass `selection` to each method:
 ```javascript
 const { clipboard } = require('electron')

-clipboard.writeText('Example string', 'selection')
+clipboard.writeText('Example String', 'selection')
 console.log(clipboard.readText('selection'))
 ```

@@ -22,9 +22,9 @@ 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`; default is 'clipboard'. `selection` is only available on Linux.

-Returns `string` - The content in the clipboard as plain text.
+Returns `String` - The content in the clipboard as plain text.

 ```js
 const { clipboard } = require('electron')
@@ -38,8 +38,8 @@ console.log(text)

 ### `clipboard.writeText(text[, type])`

-* `text` string
-* `type` string (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `text` String
+* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.

 Writes the `text` into the clipboard as plain text.

@@ -52,9 +52,9 @@ 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`; default is 'clipboard'. `selection` is only available on Linux.

-Returns `string` - The content in the clipboard as markup.
+Returns `String` - The content in the clipboard as markup.

 ```js
 const { clipboard } = require('electron')
@@ -68,35 +68,35 @@ console.log(html)

 ### `clipboard.writeHTML(markup[, type])`

-* `markup` string
-* `type` string (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `markup` String
+* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.

 Writes `markup` to the clipboard.

 ```js
 const { clipboard } = require('electron')

-clipboard.writeHTML('<b>Hi</b>')
+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`; default is '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`; default is '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`; default is 'clipboard'. `selection` is only available on Linux.

-Returns `string` - The content in the clipboard as RTF.
+Returns `String` - The content in the clipboard as RTF.

 ```js
 const { clipboard } = require('electron')
@@ -110,8 +110,8 @@ console.log(rtf)

 ### `clipboard.writeRTF(text[, type])`

-* `text` string
-* `type` string (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `text` String
+* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.

 Writes the `text` into the clipboard in RTF.

@@ -126,8 +126,8 @@ clipboard.writeRTF(rtf)

 Returns `Object`:

-* `title` string
-* `url` string
+* `title` String
+* `url` String

 Returns an Object containing `title` and `url` keys representing the bookmark in
 the clipboard. The `title` and `url` values will be empty strings when the
@@ -135,9 +135,9 @@ bookmark is unavailable.  The `title` value will always be empty on Windows.

 ### `clipboard.writeBookmark(title, url[, type])` _macOS_ _Windows_

-* `title` string - Unused on Windows
-* `url` string
-* `type` string (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `title` String - Unused on Windows
+* `url` String
+* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.

 Writes the `title` (macOS only) and `url` into the clipboard as a bookmark.

@@ -156,28 +156,28 @@ 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.
+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.

 ### `clipboard.writeFindText(text)` _macOS_

-* `text` string
+* `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.

 ### `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`; default is '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`; default is 'clipboard'. `selection` is only available on Linux.

-Returns `string[]` - An array of supported formats for the clipboard `type`.
+Returns `String[]` - An array of supported formats for the clipboard `type`.

 ```js
 const { clipboard } = require('electron')
@@ -189,24 +189,24 @@ console.log(formats)

 ### `clipboard.has(format[, type])` _Experimental_

-* `format` string
-* `type` string (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.
+* `format` String
+* `type` String (optional) - Can be `selection` or `clipboard`; default is 'clipboard'. `selection` is only available on Linux.

-Returns `boolean` - Whether the clipboard supports the specified `format`.
+Returns `Boolean` - Whether the clipboard supports the specified `format`.

 ```js
 const { clipboard } = require('electron')

-const hasFormat = clipboard.has('public/utf8-plain-text')
+const hasFormat = clipboard.has('<p>selection</p>')
 console.log(hasFormat)
 // 'true' or 'false'
 ```

 ### `clipboard.read(format)` _Experimental_

-* `format` string
+* `format` String

-Returns `string` - Reads `format` type from the clipboard.
+Returns `String` - Reads `format` type from the clipboard.

 `format` should contain valid ASCII characters and have `/` separator.
 `a/c`, `a/bc` are valid formats while `/abc`, `abc/`, `a/`, `/a`, `a`
@@ -214,7 +214,7 @@ are not valid.

 ### `clipboard.readBuffer(format)` _Experimental_

-* `format` string
+* `format` String

 Returns `Buffer` - Reads `format` type from the clipboard.

@@ -232,9 +232,9 @@ console.log(buffer.equals(out))

 ### `clipboard.writeBuffer(format, buffer[, type])` _Experimental_

-* `format` string
+* `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`; default is 'clipboard'. `selection` is only available on Linux.

 Writes the `buffer` into the clipboard as `format`.

@@ -248,12 +248,12 @@ clipboard.writeBuffer('public/utf8-plain-text', buffer)
 ### `clipboard.write(data[, type])`

 * `data` Object
-  * `text` string (optional)
-  * `html` string (optional)
+  * `text` String (optional)
+  * `html` String (optional)
  * `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.
+  * `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.

 Writes `data` to the clipboard.

--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -61,6 +61,12 @@ throttling in one window, you can take the hack of

 Forces the maximum disk space to be used by the disk cache, in bytes.

+### --enable-api-filtering-logging
+
+Enables caller stack logging for the following APIs (filtering events):
+
+* `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
+
 ### --enable-logging[=file]

 Prints Chromium's logging to stderr (or a log file).
@@ -274,8 +280,8 @@ By default inspector websocket url is available in stderr and under /json/list e
 [ready]: app.md#event-ready
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [debugging-main-process]: ../tutorial/debugging-main-process.md
-[logging]: https://source.chromium.org/chromium/chromium/src/+/main:base/logging.h
+[logging]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h
 [node-cli]: https://nodejs.org/api/cli.html
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [ready]: app.md#event-ready
-[severities]: https://source.chromium.org/chromium/chromium/src/+/main:base/logging.h?q=logging::LogSeverity&ss=chromium
+[severities]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h?q=logging::LogSeverity&ss=chromium
--- a/docs/api/command-line.md
+++ b/docs/api/command-line.md
@@ -20,8 +20,8 @@ document.

 #### `commandLine.appendSwitch(switch[, value])`

-* `switch` string - A command-line switch, without the leading `--`
-* `value` string (optional) - A value for the given switch
+* `switch` String - A command-line switch, without the leading `--`
+* `value` String (optional) - A value for the given switch

 Append a switch (with optional `value`) to Chromium's command line.

@@ -30,7 +30,7 @@ control Chromium's behavior.

 #### `commandLine.appendArgument(value)`

-* `value` string - The argument to append to the command line
+* `value` String - The argument to append to the command line

 Append an argument to Chromium's command line. The argument will be quoted
 correctly. Switches will precede arguments regardless of appending order.
@@ -42,23 +42,14 @@ control Chromium's behavior.

 #### `commandLine.hasSwitch(switch)`

-* `switch` string - A command-line switch
+* `switch` String - A command-line switch

-Returns `boolean` - Whether the command-line switch is present.
+Returns `Boolean` - Whether the command-line switch is present.

 #### `commandLine.getSwitchValue(switch)`

-* `switch` string - A command-line switch
+* `switch` String - A command-line switch

-Returns `string` - The command-line switch value.
+Returns `String` - The command-line switch value.

 **Note:** When the switch is not present or has no value, it returns empty string.
-
-#### `commandLine.removeSwitch(switch)`
-
-* `switch` string - A command-line switch
-
-Removes the specified switch from Chromium's command line.
-
-**Note:** This will not affect `process.argv`. The intended usage of this function is to
-control Chromium's behavior.
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -32,11 +32,11 @@ The `contentTracing` module has the following methods:

 ### `contentTracing.getCategories()`

-Returns `Promise<string[]>` - resolves with an array of category groups once all child processes have acknowledged the `getCategories` request
+Returns `Promise<String[]>` - resolves with an array of category groups once all child processes have acknowledged the `getCategories` request

 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/+/main/base/trace_event/builtin_categories.h).
+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.
@@ -57,9 +57,9 @@ only one trace operation can be in progress at a time.

 ### `contentTracing.stopRecording([resultFilePath])`

-* `resultFilePath` string (optional)
+* `resultFilePath` String (optional)

-Returns `Promise<string>` - resolves with a path to a file that contains the traced data once all child processes have acknowledged the `stopRecording` request
+Returns `Promise<String>` - resolves with a path to a file that contains the traced data once all child processes have acknowledged the `stopRecording` request

 Stop recording on all processes.

@@ -77,8 +77,8 @@ will be returned in the promise.

 Returns `Promise<Object>` - Resolves with an object containing the `value` and `percentage` of trace buffer maximum usage

-* `value` number
-* `percentage` number
+* `value` Number
+* `percentage` Number

 Get the maximum usage across processes of trace buffer as a percentage of the
 full state.
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -35,7 +35,7 @@ page you load in your renderer executes code in this world.

 When `contextIsolation` is enabled in your `webPreferences` (this is the default behavior since Electron 12.0.0), 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) docs.
+[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.

 ## Methods

@@ -43,21 +43,15 @@ The `contextBridge` module has the following methods:

 ### `contextBridge.exposeInMainWorld(apiKey, api)`

-* `apiKey` string - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
-* `api` any - Your API, more information on what this API can be and how it works is available below.
-
-### `contextBridge.exposeInIsolatedWorld(worldId, apiKey, api)`
-
-* `worldId` Integer - The ID of the world to inject the API into. `0` is the default world, `999` is the world used by Electron's `contextIsolation` feature. Using 999 would expose the object for preload context. We recommend using 1000+ while creating isolated world.
-* `apiKey` string - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
+* `apiKey` String - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
 * `api` any - Your API, more information on what this API can be and how it works is available below.

 ## Usage

 ### API

-The `api` provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api) must be a `Function`, `string`, `number`, `Array`, `boolean`, or an object
-whose keys are strings and values are a `Function`, `string`, `number`, `Array`, `boolean`, or another nested object that meets the same conditions.
+The `api` provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api) must be a `Function`, `String`, `Number`, `Array`, `Boolean`, or 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 become immutable and updates on either side of the bridge do not result in an update on the other side.
@@ -90,26 +84,6 @@ contextBridge.exposeInMainWorld(
 )
 ```

-An example of `exposeInIsolatedWorld` is shown below:
-
-```javascript
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInIsolatedWorld(
-  1004,
-  'electron',
-  {
-    doThing: () => ipcRenderer.send('do-a-thing')
-  }
-)
-```
-
-```javascript
-// Renderer (In isolated world id1004)
-
-window.electron.doThing()
-```
-
 ### API Functions

 `Function` values that you bind through the `contextBridge` are proxied through Electron to ensure that contexts remain isolated.  This
@@ -123,13 +97,13 @@ 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 |
+| `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, and any custom properties on the Error object [will be lost](https://github.com/electron/electron/issues/25596) |
-| `Promise` | Complex | ✅ | ✅ | N/A
+| `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 |
 | `Element` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending custom elements will not work. |
--- a/docs/api/cookies.md
+++ b/docs/api/cookies.md
@@ -50,7 +50,7 @@ Returns:

 * `event` Event
 * `cookie` [Cookie](structures/cookie.md) - The cookie that was changed.
-* `cause` string - The cause of the change with one of the following values:
+* `cause` String - The cause of the change with one of the following values:
  * `explicit` - The cookie was changed directly by a consumer's action.
  * `overwrite` - The cookie was automatically removed due to an insert
    operation that overwrote it.
@@ -58,7 +58,7 @@ Returns:
  * `evicted` - The cookie was automatically evicted during garbage collection.
  * `expired-overwrite` - The cookie was overwritten with an already-expired
    expiration date.
-* `removed` boolean - `true` if the cookie was removed, `false` otherwise.
+* `removed` Boolean - `true` if the cookie was removed, `false` otherwise.

 Emitted when a cookie is changed because it was added, edited, removed, or
 expired.
@@ -70,15 +70,14 @@ The following methods are available on instances of `Cookies`:
 #### `cookies.get(filter)`

 * `filter` Object
-  * `url` string (optional) - Retrieves cookies which are associated with
+  * `url` String (optional) - Retrieves cookies which are associated with
    `url`. Empty implies retrieving cookies of all URLs.
-  * `name` string (optional) - Filters cookies by name.
-  * `domain` string (optional) - Retrieves cookies whose domains match or are
+  * `name` String (optional) - Filters cookies by name.
+  * `domain` String (optional) - Retrieves cookies whose domains match or are
    subdomains of `domains`.
-  * `path` string (optional) - Retrieves cookies whose path matches `path`.
-  * `secure` boolean (optional) - Filters cookies by their Secure property.
-  * `session` boolean (optional) - Filters out session or persistent cookies.
-  * `httpOnly` boolean (optional) - Filters cookies by httpOnly.
+  * `path` String (optional) - Retrieves cookies whose path matches `path`.
+  * `secure` Boolean (optional) - Filters cookies by their Secure property.
+  * `session` Boolean (optional) - Filters out session or persistent cookies.

 Returns `Promise<Cookie[]>` - A promise which resolves an array of cookie objects.

@@ -88,19 +87,19 @@ the response.
 #### `cookies.set(details)`

 * `details` Object
-  * `url` string - The URL to associate the cookie with. The promise will be rejected if the URL is invalid.
-  * `name` string (optional) - The name of the cookie. Empty by default if omitted.
-  * `value` string (optional) - The value of the cookie. Empty by default if omitted.
-  * `domain` string (optional) - The domain of the cookie; this will be normalized with a preceding dot so that it's also valid for subdomains. Empty by default if omitted.
-  * `path` string (optional) - The path of the cookie. Empty by default if omitted.
-  * `secure` boolean (optional) - Whether the cookie should be marked as Secure. Defaults to
+  * `url` String - The URL to associate the cookie with. The promise will be rejected if the URL is invalid.
+  * `name` String (optional) - The name of the cookie. Empty by default if omitted.
+  * `value` String (optional) - The value of the cookie. Empty by default if omitted.
+  * `domain` String (optional) - The domain of the cookie; this will be normalized with a preceding dot so that it's also valid for subdomains. Empty by default if omitted.
+  * `path` String (optional) - The path of the cookie. Empty by default if omitted.
+  * `secure` Boolean (optional) - Whether the cookie should be marked as Secure. Defaults to
    false unless [Same Site=None](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#samesitenone_requires_secure) attribute is used.
-  * `httpOnly` boolean (optional) - Whether the cookie should be marked as HTTP only.
+  * `httpOnly` Boolean (optional) - Whether the cookie should be marked as HTTP only.
    Defaults to false.
  * `expirationDate` Double (optional) - The expiration date of the cookie as the number of
    seconds since the UNIX epoch. If omitted then the cookie becomes a session
    cookie and will not be retained between sessions.
-  * `sameSite` string (optional) - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy to apply to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.  Default is `lax`.
+  * `sameSite` String (optional) - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy to apply to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.  Default is `no_restriction`.

 Returns `Promise<void>` - A promise which resolves when the cookie has been set

@@ -108,8 +107,8 @@ Sets a cookie with `details`.

 #### `cookies.remove(url, name)`

-* `url` string - The URL associated with the cookie.
-* `name` string - The name of cookie to remove.
+* `url` String - The URL associated with the cookie.
+* `name` String - The name of cookie to remove.

 Returns `Promise<void>` - A promise which resolves when the cookie has been removed

--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -27,7 +27,6 @@ Or use a 3rd party hosted solution:
 * [Backtrace](https://backtrace.io/electron/)
 * [Sentry](https://docs.sentry.io/clients/electron)
 * [BugSplat](https://www.bugsplat.com/docs/platforms/electron)
-* [Bugsnag](https://docs.bugsnag.com/platforms/electron/)

 Crash reports are stored temporarily before being uploaded in a directory
 underneath the app's user data directory, called 'Crashpad'. You can override
@@ -44,29 +43,29 @@ The `crashReporter` module has the following methods:
 ### `crashReporter.start(options)`

 * `options` Object
-  * `submitURL` string (optional) - URL that crash reports will be sent to as
+  * `submitURL` String (optional) - URL that crash reports will be sent to as
    POST. Required unless `uploadToServer` is `false`.
-  * `productName` string (optional) - Defaults to `app.name`.
-  * `companyName` string (optional) _Deprecated_ - Deprecated alias for
+  * `productName` String (optional) - Defaults to `app.name`.
+  * `companyName` String (optional) _Deprecated_ - Deprecated alias for
    `{ globalExtra: { _companyName: ... } }`.
-  * `uploadToServer` boolean (optional) - Whether crash reports should be sent
+  * `uploadToServer` Boolean (optional) - Whether crash reports should be sent
    to the server. If false, crash reports will be collected and stored in the
    crashes directory, but not uploaded. Default is `true`.
-  * `ignoreSystemCrashHandler` boolean (optional) - If true, crashes generated
+  * `ignoreSystemCrashHandler` Boolean (optional) - If true, crashes generated
    in the main process will not be forwarded to the system crash handler.
    Default is `false`.
-  * `rateLimit` boolean (optional) _macOS_ _Windows_ - If true, limit the
+  * `rateLimit` Boolean (optional) _macOS_ _Windows_ - If true, limit the
    number of crashes uploaded to 1/hour. Default is `false`.
-  * `compress` boolean (optional) - If true, crash reports will be compressed
+  * `compress` Boolean (optional) - If true, crash reports will be compressed
    and uploaded with `Content-Encoding: gzip`. Default is `true`.
-  * `extra` Record<string, string> (optional) - Extra string key/value
+  * `extra` Record<String, String> (optional) - Extra string key/value
    annotations that will be sent along with crash reports that are generated
    in the main process. Only string values are supported. Crashes generated in
    child processes will not contain these extra
    parameters to crash reports generated from child processes, call
    [`addExtraParameter`](#crashreporteraddextraparameterkey-value) from the
    child process.
-  * `globalExtra` Record<string, string> (optional) - Extra string key/value
+  * `globalExtra` Record<String, String> (optional) - Extra string key/value
    annotations that will be sent along with any crash reports generated in any
    process. These annotations cannot be changed once the crash reporter has
    been started. If a key is present in both the global extra parameters and
@@ -118,14 +117,14 @@ ID.

 ### `crashReporter.getUploadToServer()`

-Returns `boolean` - Whether reports should be submitted to the server. Set through
+Returns `Boolean` - Whether reports should be submitted to the server. Set through
 the `start` method or `setUploadToServer`.

 **Note:** This method is only available in the main process.

 ### `crashReporter.setUploadToServer(uploadToServer)`

-* `uploadToServer` boolean - Whether reports should be submitted to the server.
+* `uploadToServer` Boolean - Whether reports should be submitted to the server.

 This would normally be controlled by user preferences. This has no effect if
 called before `start` is called.
@@ -134,8 +133,8 @@ called before `start` is called.

 ### `crashReporter.addExtraParameter(key, value)`

-* `key` string - Parameter key, must be no longer than 39 bytes.
-* `value` string - Parameter value, must be no longer than 127 bytes.
+* `key` String - Parameter key, must be no longer than 39 bytes.
+* `value` String - Parameter value, must be no longer than 127 bytes.

 Set an extra parameter to be sent with the crash report. The values specified
 here will be sent in addition to any values set via the `extra` option when
@@ -155,14 +154,14 @@ values longer than the maximum length will be truncated.

 ### `crashReporter.removeExtraParameter(key)`

-* `key` string - Parameter key, must be no longer than 39 bytes.
+* `key` String - Parameter key, must be no longer than 39 bytes.

 Remove an extra parameter from the current set of parameters. Future crashes
 will not include this parameter.

 ### `crashReporter.getParameters()`

-Returns `Record<string, string>` - The current 'extra' parameters of the crash reporter.
+Returns `Record<String, String>` - The current 'extra' parameters of the crash reporter.

 ## In Node child processes

@@ -195,15 +194,15 @@ See [`crashReporter.removeExtraParameter(key)`](#crashreporterremoveextraparamet
 The crash reporter will send the following data to the `submitURL` as
 a `multipart/form-data` `POST`:

-* `ver` string - The version of Electron.
-* `platform` string - e.g. 'win32'.
-* `process_type` string - e.g. 'renderer'.
-* `guid` string - e.g. '5e1286fc-da97-479e-918b-6bfb0c3d1c72'.
-* `_version` string - The version in `package.json`.
-* `_productName` string - The product name in the `crashReporter` `options`
+* `ver` String - The version of Electron.
+* `platform` String - e.g. 'win32'.
+* `process_type` String - e.g. 'renderer'.
+* `guid` String - e.g. '5e1286fc-da97-479e-918b-6bfb0c3d1c72'.
+* `_version` String - The version in `package.json`.
+* `_productName` String - The product name in the `crashReporter` `options`
  object.
-* `prod` string - Name of the underlying product. In this case Electron.
-* `_companyName` string - The company name in the `crashReporter` `options`
+* `prod` String - Name of the underlying product. In this case Electron.
+* `_companyName` String - The company name in the `crashReporter` `options`
  object.
 * `upload_file_minidump` File - The crash report in the format of `minidump`.
 * All level one properties of the `extra` object in the `crashReporter`
--- a/docs/api/debugger.md
+++ b/docs/api/debugger.md
@@ -40,7 +40,7 @@ win.webContents.debugger.sendCommand('Network.enable')
 Returns:

 * `event` Event
-* `reason` string - Reason for detaching debugger.
+* `reason` String - Reason for detaching debugger.

 Emitted when the debugging session is terminated. This happens either when
 `webContents` is closed or devtools is invoked for the attached `webContents`.
@@ -50,10 +50,10 @@ Emitted when the debugging session is terminated. This happens either when
 Returns:

 * `event` Event
-* `method` string - Method name.
+* `method` String - Method name.
 * `params` any - Event parameters defined by the 'parameters'
   attribute in the remote debugging protocol.
-* `sessionId` string - Unique identifier of attached debugging session,
+* `sessionId` String - Unique identifier of attached debugging session,
   will match the value sent from `debugger.sendCommand`.

 Emitted whenever the debugging target issues an instrumentation event.
@@ -65,13 +65,13 @@ Emitted whenever the debugging target issues an instrumentation event.

 #### `debugger.attach([protocolVersion])`

-* `protocolVersion` string (optional) - Requested debugging protocol version.
+* `protocolVersion` String (optional) - Requested debugging protocol version.

 Attaches the debugger to the `webContents`.

 #### `debugger.isAttached()`

-Returns `boolean` - Whether a debugger is attached to the `webContents`.
+Returns `Boolean` - Whether a debugger is attached to the `webContents`.

 #### `debugger.detach()`

@@ -79,10 +79,10 @@ Detaches the debugger from the `webContents`.

 #### `debugger.sendCommand(method[, commandParams, sessionId])`

-* `method` string - Method name, should be one of the methods defined by the
+* `method` String - Method name, should be one of the methods defined by the
   [remote debugging protocol][rdp].
 * `commandParams` any (optional) - JSON object with request parameters.
-* `sessionId` string (optional) - send command to the target with associated
+* `sessionId` String (optional) - send command to the target with associated
   debugging session id. The initial value can be obtained by sending
   [Target.attachToTarget][attachToTarget] message.

--- a/docs/api/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -3,49 +3,40 @@
 > Access information about media sources that can be used to capture audio and
 > video from the desktop using the [`navigator.mediaDevices.getUserMedia`] API.

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process)

 The following example shows how to capture video from a desktop window whose
 title is `Electron`:

 ```javascript
-// In the main process.
+// In the renderer process.
 const { desktopCapturer } = require('electron')

 desktopCapturer.getSources({ types: ['window', 'screen'] }).then(async sources => {
  for (const source of sources) {
    if (source.name === 'Electron') {
-      mainWindow.webContents.send('SET_SOURCE', source.id)
+      try {
+        const stream = await navigator.mediaDevices.getUserMedia({
+          audio: false,
+          video: {
+            mandatory: {
+              chromeMediaSource: 'desktop',
+              chromeMediaSourceId: source.id,
+              minWidth: 1280,
+              maxWidth: 1280,
+              minHeight: 720,
+              maxHeight: 720
+            }
+          }
+        })
+        handleStream(stream)
+      } catch (e) {
+        handleError(e)
+      }
      return
    }
  }
 })
-```
-
-```javascript
-// In the preload script.
-const { ipcRenderer } = require('electron')
-
-ipcRenderer.on('SET_SOURCE', async (event, sourceId) => {
-  try {
-    const stream = await navigator.mediaDevices.getUserMedia({
-      audio: false,
-      video: {
-        mandatory: {
-          chromeMediaSource: 'desktop',
-          chromeMediaSourceId: sourceId,
-          minWidth: 1280,
-          maxWidth: 1280,
-          minHeight: 720,
-          maxHeight: 720
-        }
-      }
-    })
-    handleStream(stream)
-  } catch (e) {
-    handleError(e)
-  }
-})

 function handleStream (stream) {
  const video = document.querySelector('video')
@@ -88,13 +79,13 @@ The `desktopCapturer` module has the following methods:
 ### `desktopCapturer.getSources(options)`

 * `options` Object
-  * `types` string[] - An array of strings that lists the types of desktop sources
+  * `types` String[] - An array of Strings that lists the types of desktop sources
    to be captured, available types are `screen` and `window`.
  * `thumbnailSize` [Size](structures/size.md) (optional) - The size that the media source thumbnail
    should be scaled to. Default is `150` x `150`. Set width or height to 0 when you do not need
    the thumbnails. This will save the processing time required for capturing the content of each
    window and screen.
-  * `fetchWindowIcons` boolean (optional) - Set to true to enable fetching window icons. The default
+  * `fetchWindowIcons` Boolean (optional) - Set to true to enable fetching window icons. The default
    value is false. When false the appIcon property of the sources return null. Same if a source has
    the type screen.

--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -19,12 +19,12 @@ The `dialog` module has the following methods:

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `title` string (optional)
-  * `defaultPath` string (optional)
-  * `buttonLabel` string (optional) - Custom label for the confirmation button, when
+  * `title` String (optional)
+  * `defaultPath` String (optional)
+  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
    left empty the default label will be used.
  * `filters` [FileFilter[]](structures/file-filter.md) (optional)
-  * `properties` string[]&#32;(optional) - Contains which features the dialog should
+  * `properties` String[]&#32;(optional) - Contains which features the dialog should
    use. The following values are supported:
    * `openFile` - Allow files to be selected.
    * `openDirectory` - Allow directories to be selected.
@@ -41,11 +41,11 @@ The `dialog` module has the following methods:
    * `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
+  * `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.
+  * `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`.
+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.

@@ -82,12 +82,12 @@ dialog.showOpenDialogSync(mainWindow, {

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `title` string (optional)
-  * `defaultPath` string (optional)
-  * `buttonLabel` string (optional) - Custom label for the confirmation button, when
+  * `title` String (optional)
+  * `defaultPath` String (optional)
+  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
    left empty the default label will be used.
  * `filters` [FileFilter[]](structures/file-filter.md) (optional)
-  * `properties` string[]&#32;(optional) - Contains which features the dialog should
+  * `properties` String[]&#32;(optional) - Contains which features the dialog should
    use. The following values are supported:
    * `openFile` - Allow files to be selected.
    * `openDirectory` - Allow directories to be selected.
@@ -104,15 +104,15 @@ dialog.showOpenDialogSync(mainWindow, {
    * `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
+  * `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.
+  * `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 `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[]&#32;(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).)
+* `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[]&#32;(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).)

 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

@@ -154,27 +154,27 @@ dialog.showOpenDialog(mainWindow, {

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `title` string (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
-  * `defaultPath` string (optional) - Absolute directory path, absolute file
+  * `title` String (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
+  * `defaultPath` String (optional) - Absolute directory path, absolute file
    path, or file name to use by default.
-  * `buttonLabel` string (optional) - Custom label for the confirmation button, when
+  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
    left empty the default label will be used.
  * `filters` [FileFilter[]](structures/file-filter.md) (optional)
-  * `message` string (optional) _macOS_ - Message to display above text fields.
-  * `nameFieldLabel` string (optional) _macOS_ - Custom label for the text
+  * `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,
+  * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box,
    defaults to `true`.
-  * `properties` string[]&#32;(optional)
+  * `properties` String[]&#32;(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.
+  * `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`.
+Returns `String | undefined`, the path of the file 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.

@@ -185,30 +185,30 @@ The `filters` specifies an array of file types that can be displayed, see

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `title` string (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
-  * `defaultPath` string (optional) - Absolute directory path, absolute file
+  * `title` String (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
+  * `defaultPath` String (optional) - Absolute directory path, absolute file
    path, or file name to use by default.
-  * `buttonLabel` string (optional) - Custom label for the confirmation button, when
+  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
    left empty the default label will be used.
  * `filters` [FileFilter[]](structures/file-filter.md) (optional)
-  * `message` string (optional) _macOS_ - Message to display above text fields.
-  * `nameFieldLabel` string (optional) _macOS_ - Custom label for the text
+  * `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[]&#32;(optional)
+  * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box, defaults to `true`.
+  * `properties` String[]&#32;(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.
+  * `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).)
+* `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).)

 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

@@ -222,29 +222,28 @@ expanding and collapsing the dialog.

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `message` string - Content of the message box.
-  * `type` string (optional) - Can be `"none"`, `"info"`, `"error"`, `"question"` or
+  * `message` String - Content of the message box.
+  * `type` String (optional) - Can be `"none"`, `"info"`, `"error"`, `"question"` or
  `"warning"`. On Windows, `"question"` displays the same icon as `"info"`, unless
  you set an icon using the `"icon"` option. On macOS, both `"warning"` and
  `"error"` display the same warning icon.
-  * `buttons` string[]&#32;(optional) - Array of texts for buttons. On Windows, an empty array
+  * `buttons` String[]&#32;(optional) - Array of texts for buttons. On Windows, an empty array
    will result in one button labeled "OK".
  * `defaultId` Integer (optional) - Index of the button in the buttons array which will
    be selected by default when the message box opens.
-  * `title` string (optional) - Title of the message box, some platforms will not show it.
-  * `detail` string (optional) - Extra information of the message.
-  * `icon` ([NativeImage](native-image.md) | string) (optional)
-  * `textWidth` Integer (optional) _macOS_ - Custom width of the text in the message box.
+  * `title` String (optional) - Title of the message box, some platforms will not show it.
+  * `detail` String (optional) - Extra information of the message.
+  * `icon` ([NativeImage](native-image.md) | String) (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
    return value.
-  * `noLink` boolean (optional) - On Windows Electron will try to figure out which one of
+  * `noLink` Boolean (optional) - On Windows Electron will try to figure out which one of
    the `buttons` are common buttons (like "Cancel" or "Yes"), and show the
    others as command links in the dialog. This can make the dialog appear in
    the style of modern Windows apps. If you don't like this behavior, you can
    set `noLink` to `true`.
-  * `normalizeAccessKeys` boolean (optional) - Normalize the keyboard access keys
+  * `normalizeAccessKeys` Boolean (optional) - Normalize the keyboard access keys
    across platforms. Default is `false`. Enabling this assumes `&` is used in
    the button labels for the placement of the keyboard shortcut access key
    and labels will be converted so they work correctly on each platform, `&`
@@ -265,12 +264,12 @@ If `browserWindow` is not shown dialog will not be attached to it. In such case

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `message` string - Content of the message box.
-  * `type` string (optional) - Can be `"none"`, `"info"`, `"error"`, `"question"` or
+  * `message` String - Content of the message box.
+  * `type` String (optional) - Can be `"none"`, `"info"`, `"error"`, `"question"` or
  `"warning"`. On Windows, `"question"` displays the same icon as `"info"`, unless
  you set an icon using the `"icon"` option. On macOS, both `"warning"` and
  `"error"` display the same warning icon.
-  * `buttons` string[]&#32;(optional) - Array of texts for buttons. On Windows, an empty array
+  * `buttons` String[]&#32;(optional) - Array of texts for buttons. On Windows, an empty array
    will result in one button labeled "OK".
  * `defaultId` Integer (optional) - Index of the button in the buttons array which will
    be selected by default when the message box opens.
@@ -279,24 +278,23 @@ If `browserWindow` is not shown dialog will not be attached to it. In such case
    cancelled by the user. On macOS, `signal` does not work with message boxes
    that do not have a parent window, since those message boxes run
    synchronously due to platform limitations.
-  * `title` string (optional) - Title of the message box, some platforms will not show it.
-  * `detail` string (optional) - Extra information of the message.
-  * `checkboxLabel` string (optional) - If provided, the message box will
+  * `title` String (optional) - Title of the message box, some platforms will not show it.
+  * `detail` String (optional) - Extra information of the message.
+  * `checkboxLabel` String (optional) - If provided, the message box will
    include a checkbox with the given label.
-  * `checkboxChecked` boolean (optional) - Initial checked state of the
+  * `checkboxChecked` Boolean (optional) - Initial checked state of the
    checkbox. `false` by default.
-  * `icon` ([NativeImage](native-image.md) | string) (optional)
-  * `textWidth` Integer (optional) _macOS_ - Custom width of the text in the message box.
+  * `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
    return value.
-  * `noLink` boolean (optional) - On Windows Electron will try to figure out which one of
+  * `noLink` Boolean (optional) - On Windows Electron will try to figure out which one of
    the `buttons` are common buttons (like "Cancel" or "Yes"), and show the
    others as command links in the dialog. This can make the dialog appear in
    the style of modern Windows apps. If you don't like this behavior, you can
    set `noLink` to `true`.
-  * `normalizeAccessKeys` boolean (optional) - Normalize the keyboard access keys
+  * `normalizeAccessKeys` Boolean (optional) - Normalize the keyboard access keys
    across platforms. Default is `false`. Enabling this assumes `&` is used in
    the button labels for the placement of the keyboard shortcut access key
    and labels will be converted so they work correctly on each platform, `&`
@@ -307,8 +305,8 @@ If `browserWindow` is not shown dialog will not be attached to it. In such case

 Returns `Promise<Object>` - resolves with a promise containing the following properties:

-* `response` number - The index of the clicked button.
-* `checkboxChecked` boolean - The checked state of the checkbox if
+* `response` Number - The index of the clicked button.
+* `checkboxChecked` Boolean - The checked state of the checkbox if
  `checkboxLabel` was set. Otherwise `false`.

 Shows a message box.
@@ -317,8 +315,8 @@ The `browserWindow` argument allows the dialog to attach itself to a parent wind

 ### `dialog.showErrorBox(title, content)`

-* `title` string - The title to display in the error box.
-* `content` string - The text content to display in the error box.
+* `title` String - The title to display in the error box.
+* `content` String - The text content to display in the error box.

 Displays a modal dialog that shows an error message.

@@ -332,7 +330,7 @@ and no GUI dialog will appear.
 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `certificate` [Certificate](structures/certificate.md) - The certificate to trust/import.
-  * `message` string - The message to display to the user.
+  * `message` String - The message to display to the user.

 Returns `Promise<void>` - resolves when the certificate trust dialog is shown.

--- a/docs/api/dock.md
+++ b/docs/api/dock.md
@@ -16,7 +16,7 @@ app.dock.bounce()

 #### `dock.bounce([type])` _macOS_

-* `type` string (optional) - Can be `critical` or `informational`. The default is
+* `type` String (optional) - Can be `critical` or `informational`. The default is
 `informational`

 Returns `Integer` - an ID representing the request.
@@ -28,7 +28,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.

-**Note:** This method can only be used while the app is not focused; when the app is focused it will return -1.
+**Nota Bene:** This method can only be used while the app is not focused; when the app is focused it will return -1.

 #### `dock.cancelBounce(id)` _macOS_

@@ -38,19 +38,19 @@ Cancel the bounce of `id`.

 #### `dock.downloadFinished(filePath)` _macOS_

-* `filePath` string
+* `filePath` String

 Bounces the Downloads stack if the filePath is inside the Downloads folder.

 #### `dock.setBadge(text)` _macOS_

-* `text` string
+* `text` String

 Sets the string to be displayed in the dock’s badging area.

 #### `dock.getBadge()` _macOS_

-Returns `string` - The badge string of the dock.
+Returns `String` - The badge string of the dock.

 #### `dock.hide()` _macOS_

@@ -62,7 +62,7 @@ Returns `Promise<void>` - Resolves when the dock icon is shown.

 #### `dock.isVisible()` _macOS_

-Returns `boolean` - Whether the dock icon is visible.
+Returns `Boolean` - Whether the dock icon is visible.

 #### `dock.setMenu(menu)` _macOS_

@@ -76,8 +76,6 @@ Returns `Menu | null` - The application's [dock menu][dock-menu].

 #### `dock.setIcon(image)` _macOS_

-* `image` ([NativeImage](native-image.md) | string)
+* `image` ([NativeImage](native-image.md) | String)

 Sets the `image` associated with this dock icon.
-
-[dock-menu]: https://developer.apple.com/macos/human-interface-guidelines/menus/dock-menus/
--- a/docs/api/download-item.md
+++ b/docs/api/download-item.md
@@ -45,7 +45,7 @@ win.webContents.session.on('will-download', (event, item, webContents) => {
 Returns:

 * `event` Event
-* `state` string - Can be `progressing` or `interrupted`.
+* `state` String - Can be `progressing` or `interrupted`.

 Emitted when the download has been updated and is not done.

@@ -59,7 +59,7 @@ The `state` can be one of following:
 Returns:

 * `event` Event
-* `state` string - Can be `completed`, `cancelled` or `interrupted`.
+* `state` String - Can be `completed`, `cancelled` or `interrupted`.

 Emitted when the download is in a terminal state. This includes a completed
 download, a cancelled download (via `downloadItem.cancel()`), and interrupted
@@ -77,7 +77,7 @@ The `downloadItem` object has the following methods:

 #### `downloadItem.setSavePath(path)`

-* `path` string - Set the save file path of the download item.
+* `path` String - Set the save file path of the download item.

 The API is only available in session's `will-download` callback function.
 If `path` doesn't exist, Electron will try to make the directory recursively.
@@ -86,7 +86,7 @@ routine to determine the save path; this usually prompts a save dialog.

 #### `downloadItem.getSavePath()`

-Returns `string` - The save path of the download item. This will be either the path
+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.

@@ -109,7 +109,7 @@ Pauses the download.

 #### `downloadItem.isPaused()`

-Returns `boolean` - Whether the download is paused.
+Returns `Boolean` - Whether the download is paused.

 #### `downloadItem.resume()`

@@ -119,7 +119,7 @@ Resumes the download that has been paused.

 #### `downloadItem.canResume()`

-Returns `boolean` - Whether the download can resume.
+Returns `Boolean` - Whether the download can resume.

 #### `downloadItem.cancel()`

@@ -127,19 +127,19 @@ Cancels the download operation.

 #### `downloadItem.getURL()`

-Returns `string` - The origin URL where the item is downloaded from.
+Returns `String` - The origin URL where the item is downloaded from.

 #### `downloadItem.getMimeType()`

-Returns `string` - The files mime type.
+Returns `String` - The files mime type.

 #### `downloadItem.hasUserGesture()`

-Returns `boolean` - Whether the download has user gesture.
+Returns `Boolean` - Whether the download has user gesture.

 #### `downloadItem.getFilename()`

-Returns `string` - The file name of the download item.
+Returns `String` - The file name of the download item.

 **Note:** The file name is not always the same as the actual one saved in local
 disk. If user changes the file name in a prompted download saving dialog, the
@@ -157,27 +157,27 @@ Returns `Integer` - The received bytes of the download item.

 #### `downloadItem.getContentDisposition()`

-Returns `string` - The Content-Disposition field from the response
+Returns `String` - The Content-Disposition field from the response
 header.

 #### `downloadItem.getState()`

-Returns `string` - The current state. Can be `progressing`, `completed`, `cancelled` or `interrupted`.
+Returns `String` - The current state. Can be `progressing`, `completed`, `cancelled` or `interrupted`.

 **Note:** The following methods are useful specifically to resume a
 `cancelled` item when session is restarted.

 #### `downloadItem.getURLChain()`

-Returns `string[]` - The complete URL chain of the item including any redirects.
+Returns `String[]` - The complete URL chain of the item including any redirects.

 #### `downloadItem.getLastModifiedTime()`

-Returns `string` - Last-Modified header value.
+Returns `String` - Last-Modified header value.

 #### `downloadItem.getETag()`

-Returns `string` - ETag header value.
+Returns `String` - ETag header value.

 #### `downloadItem.getStartTime()`

@@ -188,7 +188,7 @@ started.

 #### `downloadItem.savePath`

-A `string` property that determines the save file path of the download item.
+A `String` property that determines the save file path of the download item.

 The property is only available in session's `will-download` callback function.
 If user doesn't set the save path via the property, Electron will use the original
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -122,7 +122,7 @@ Prints Chromium's internal logging to the console.

 Setting this variable is the same as passing `--enable-logging`
 on the command line. For more info, see `--enable-logging` in [command-line
-switches](./command-line-switches.md#--enable-loggingfile).
+switches](./command-line-switches.md#enable-loggingfile).

 ### `ELECTRON_LOG_FILE`

@@ -130,7 +130,7 @@ Sets the file destination for Chromium's internal logging.

 Setting this variable is the same as passing `--log-file`
 on the command line. For more info, see `--log-file` in [command-line
-switches](./command-line-switches.md#--log-filepath).
+switches](./command-line-switches.md#log-filepath).

 ### `ELECTRON_DEBUG_DRAG_REGIONS`

@@ -139,7 +139,8 @@ green and non-draggable regions will be colored red to aid debugging.

 ### `ELECTRON_DEBUG_NOTIFICATIONS`

-Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common actions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
+Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common a
+tions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.

 Sample output:

--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -20,7 +20,7 @@ work). Extensions are installed per-`session`. To load an extension, call
 ```js
 const { session } = require('electron')

-session.defaultSession.loadExtension('path/to/unpacked/extension').then(({ id }) => {
+session.loadExtension('path/to/unpacked/extension').then(({ id }) => {
  // ...
 })
 ```
@@ -99,7 +99,6 @@ Only `chrome.storage.local` is supported; `chrome.storage.sync` and
 The following methods of `chrome.tabs` are supported:

 - `chrome.tabs.sendMessage`
- `chrome.tabs.reload`
 - `chrome.tabs.executeScript`
 - `chrome.tabs.update` (partial support)
  - supported properties: `url`, `muted`.
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -0,0 +1,221 @@
+# Frameless Window
+
+> Open a window without toolbars, borders, or other graphical "chrome".
+
+A frameless window is a window that has no
+[chrome](https://developer.mozilla.org/en-US/docs/Glossary/Chrome), the parts of
+the window, like toolbars, that are not a part of the web page. These are
+options on the [`BrowserWindow`](browser-window.md) class.
+
+## Create a frameless window
+
+To create a frameless window, you need to set `frame` to `false` in
+[BrowserWindow](browser-window.md)'s `options`:
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({ width: 800, height: 600, frame: false })
+win.show()
+```
+
+### Alternatives
+
+There's an alternative way to specify a chromeless window on macOS and Windows.
+Instead of setting `frame` to `false` which disables both the titlebar and window controls,
+you may want to have the title bar hidden and your content extend to the full window size,
+yet still preserve the window controls ("traffic lights" on macOS) for standard window actions.
+You can do so by specifying the `titleBarStyle` option:
+
+#### `hidden`
+
+Results in a hidden title bar and a full size content window. On macOS, the title bar still has the standard window controls (“traffic lights”) in the top left.
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({ titleBarStyle: 'hidden' })
+win.show()
+```
+
+### Alternatives on macOS
+
+#### `hiddenInset`
+
+Results in a hidden title bar with an alternative look where the traffic light buttons are slightly more inset from the window edge.
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({ titleBarStyle: 'hiddenInset' })
+win.show()
+```
+
+#### `customButtonsOnHover`
+
+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
+issues with mouse events that occur with the standard window toolbar buttons.
+This option is only applicable for frameless windows.
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({ titleBarStyle: 'customButtonsOnHover', frame: false })
+win.show()
+```
+
+## Windows Control Overlay
+
+When using a frameless window in conjuction with `win.setWindowButtonVisibility(true)` on macOS, using one of the `titleBarStyle`s as described above so
+that the traffic lights are visible, or using `titleBarStyle: hidden` on Windows, you can access the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and
+[CSS Environment Variables][overlay-css-env-vars] by setting the `titleBarOverlay` option to true. Specifying `true` will result in an overlay with default system colors.
+
+On Windows, you can also specify the color of the overlay and its symbols by setting `titleBarOverlay` to an object with the options `color` and `symbolColor`. If an option is not specified, the color will default to its system color for the window control buttons:
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({
+  titleBarStyle: 'hidden',
+  titleBarOverlay: true
+})
+win.show()
+```
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({
+  titleBarStyle: 'hidden',
+  titleBarOverlay: {
+    color: '#2f3241',
+    symbolColor: '#74b1be'
+  }
+})
+win.show()
+```
+
+## Transparent window
+
+By setting the `transparent` option to `true`, you can also make the frameless
+window transparent:
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({ transparent: true, frame: false })
+win.show()
+```
+
+### Limitations
+
+* You can not click through the transparent area. We are going to introduce an
+  API to set window shape to solve this, see
+  [our issue](https://github.com/electron/electron/issues/1335) for details.
+* Transparent windows are not resizable. Setting `resizable` to `true` may make
+  a transparent window stop working on some platforms.
+* The `blur` filter only applies to the web page, so there is no way to apply
+  blur effect to the content below the window (i.e. other applications open on
+  the user's system).
+* The window will not be transparent when DevTools is opened.
+* On Windows operating systems,
+  * transparent windows will not work when DWM is
+  disabled.
+  * transparent windows can not be maximized using the Windows system menu or by double clicking the title bar. The reasoning behind this can be seen on [this pull request](https://github.com/electron/electron/pull/28207).
+* On Linux, users have to put `--enable-transparent-visuals --disable-gpu` in
+  the command line to disable GPU and allow ARGB to make transparent window,
+  this is caused by an upstream bug that [alpha channel doesn't work on some
+  NVidia drivers](https://bugs.chromium.org/p/chromium/issues/detail?id=369209) on
+  Linux.
+* On Mac, the native window shadow will not be shown on a transparent window.
+
+## Click-through window
+
+To create a click-through window, i.e. making the window ignore all mouse
+events, you can call the [win.setIgnoreMouseEvents(ignore)][ignore-mouse-events]
+API:
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow()
+win.setIgnoreMouseEvents(true)
+```
+
+### Forwarding
+
+Ignoring mouse messages makes the web page oblivious to mouse movement, meaning
+that mouse movement events will not be emitted. On Windows operating systems an
+optional parameter can be used to forward mouse move messages to the web page,
+allowing events such as `mouseleave` to be emitted:
+
+```javascript
+const { ipcRenderer } = require('electron')
+const el = document.getElementById('clickThroughElement')
+el.addEventListener('mouseenter', () => {
+  ipcRenderer.send('set-ignore-mouse-events', true, { forward: true })
+})
+el.addEventListener('mouseleave', () => {
+  ipcRenderer.send('set-ignore-mouse-events', false)
+})
+
+// Main process
+const { ipcMain } = require('electron')
+ipcMain.on('set-ignore-mouse-events', (event, ...args) => {
+  BrowserWindow.fromWebContents(event.sender).setIgnoreMouseEvents(...args)
+})
+```
+
+This makes the web page click-through when over `el`, and returns to normal
+outside it.
+
+## Draggable region
+
+By default, the frameless window is non-draggable. Apps need to specify
+`-webkit-app-region: drag` in CSS to tell Electron which regions are draggable
+(like the OS's standard titlebar), and apps can also use
+`-webkit-app-region: no-drag` to exclude the non-draggable area from the
+ draggable region. Note that only rectangular shapes are currently supported.
+
+Note: `-webkit-app-region: drag` is known to have problems while the developer tools are open. See this [GitHub issue](https://github.com/electron/electron/issues/3647) for more information including a workaround.
+
+To make the whole window draggable, you can add `-webkit-app-region: drag` as
+`body`'s style:
+
+```html
+<body style="-webkit-app-region: drag">
+</body>
+```
+
+And note that if you have made the whole window draggable, you must also mark
+buttons as non-draggable, otherwise it would be impossible for users to click on
+them:
+
+```css
+button {
+  -webkit-app-region: no-drag;
+}
+```
+
+If you're only setting a custom titlebar as draggable, you also need to make all
+buttons in titlebar non-draggable.
+
+## Text selection
+
+In a frameless window the dragging behavior 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:
+
+```css
+.titlebar {
+  -webkit-user-select: none;
+  -webkit-app-region: drag;
+}
+```
+
+## Context menu
+
+On some platforms, the draggable area will be treated as a non-client frame, so
+when you right click on it a system menu will pop up. To make the context menu
+behave correctly on all platforms you should never use a custom context menu on
+draggable areas.
+
+[ignore-mouse-events]: browser-window.md#winsetignoremouseeventsignore-options
+[overlay-javascript-apis]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#javascript-apis
+[overlay-css-env-vars]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#css-environment-variables
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -47,7 +47,7 @@ The `globalShortcut` module has the following methods:
 * `accelerator` [Accelerator](accelerator.md)
 * `callback` Function

-Returns `boolean` - Whether or not the shortcut was registered successfully.
+Returns `Boolean` - Whether or not the shortcut was registered successfully.

 Registers a global shortcut of `accelerator`. The `callback` is called when
 the registered shortcut is pressed by the user.
@@ -66,7 +66,7 @@ the app has been authorized as a [trusted accessibility client](https://develope

 ### `globalShortcut.registerAll(accelerators, callback)`

-* `accelerators` string[] - an array of [Accelerator](accelerator.md)s.
+* `accelerators` String[] - an array of [Accelerator](accelerator.md)s.
 * `callback` Function

 Registers a global shortcut of all `accelerator` items in `accelerators`. The `callback` is called when any of the registered shortcuts are pressed by the user.
@@ -87,7 +87,7 @@ the app has been authorized as a [trusted accessibility client](https://develope

 * `accelerator` [Accelerator](accelerator.md)

-Returns `boolean` - Whether this application has registered `accelerator`.
+Returns `Boolean` - Whether this application has registered `accelerator`.

 When the accelerator is already taken by other applications, this call will
 still return `false`. This behavior is intended by operating systems, since they
--- a/Show More
+++ b/Show More