Bump v8.0.0-beta.6

chore: bump chromium to 80.0.3987.51 (8-x-y) (#21738 )
* chore: bump chromium in DEPS to 80.0.3987.49 * chore: bump chromium in DEPS to 80.0.3987.50 * chore: bump chromium in DEPS to 80.0.3987.51
2026-04-10 03:01:51 -04:00 · 2020-01-13 10:25:18 -08:00 · 2020-01-13 13:13:02 -05:00 · 2020-01-13 09:06:13 -05:00 · 2020-01-13 14:56:19 +09:00 · 2020-01-13 14:55:05 +09:00
586 changed files with 12492 additions and 8487 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ parameters:
 # Build machines configs.
 docker-image: &docker-image
  docker:
-    - image: electronjs/build:697b894f36d127155e020f4e8ad4b2e5f6a09613
+    - image: electronbuilds/electron:0.0.10

 machine-linux-medium: &machine-linux-medium
  <<: *docker-image
@@ -61,7 +61,7 @@ machine-linux-medium: &machine-linux-medium

 machine-linux-2xlarge: &machine-linux-2xlarge
  <<: *docker-image
-  resource_class: 2xlarge+
+  resource_class: 2xlarge

 machine-mac: &machine-mac
  macos:
@@ -73,6 +73,14 @@ machine-mac-large: &machine-mac-large
    xcode: "10.3.0"

 # Build configurations options.
+env-debug-build: &env-debug-build
+  GN_CONFIG: //electron/build/args/debug.gn
+  SKIP_DIST_ZIP: '1'
+
+env-mac-debug-build: &env-mac-debug-build
+  # Set symbol level to 1 so that debug builds do not run out of disk space
+  GN_BUILDFLAG_ARGS: 'symbol_level = 1'  
+
 env-testing-build: &env-testing-build
  GN_CONFIG: //electron/build/args/testing.gn
  CHECK_DIST_MANIFEST: '1'
@@ -156,10 +164,6 @@ env-32bit-release: &env-32bit-release
  # Set symbol level to 1 for 32 bit releases because of https://crbug.com/648948
  GN_BUILDFLAG_ARGS: 'symbol_level = 1'

-env-macos-build: &env-macos-build
-  # Disable pre-compiled headers to reduce out size, only useful for rebuilds
-  GN_BUILDFLAG_ARGS: 'enable_precompiled_headers = false'
-
 # Individual (shared) steps.
 step-maybe-notify-slack-failure: &step-maybe-notify-slack-failure
  run:
@@ -339,12 +343,6 @@ step-electron-build: &step-electron-build
    name: Electron build
    no_output_timeout: 30m
    command: |
-      # On arm platforms we generate a cross-arch ffmpeg that ninja does not seem
-      # to realize is not correct / should be rebuilt.  We delete it here so it is
-      # rebuilt
-      if [ "$TRIGGER_ARM_TEST" == "true" ]; then
-        rm -f src/out/Default/libffmpeg.so
-      fi
      cd src
      ninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES

@@ -548,7 +546,6 @@ step-mksnapshot-build: &step-mksnapshot-build
    name: mksnapshot build
    command: |
      cd src
-      ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
      if [ "`uname`" != "Darwin" ]; then
        if [ "$TARGET_ARCH" == "arm" ]; then
          electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
@@ -556,7 +553,6 @@ step-mksnapshot-build: &step-mksnapshot-build
          electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/mksnapshot
        else
          electron/script/strip-binaries.py --file $PWD/out/Default/mksnapshot
-          electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
        fi
      fi
      if [ "$SKIP_DIST_ZIP" != "1" ]; then
@@ -665,16 +661,11 @@ step-ninja-summary: &step-ninja-summary
    command: |
      python depot_tools/post_build_ninja_summary.py -C src/out/Default

-step-ninja-report: &step-ninja-report
-  store_artifacts:
-    path: src/out/Default/.ninja_log
-    destination: ninja_log
-
 # Checkout Steps
 step-generate-deps-hash: &step-generate-deps-hash
  run:
    name: Generate DEPS Hash
-    command: node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
+    command: node src/electron/script/generate-deps-hash.js

 step-touch-sync-done: &step-touch-sync-done
  run:
@@ -686,8 +677,10 @@ step-touch-sync-done: &step-touch-sync-done
 # If a cache is matched EXACTLY then the .circle-sync-done file contains "done"
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
  restore_cache:
+    paths:
+      - ./src
    keys:
-      - v7-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
    name: Restoring src cache

 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@@ -698,18 +691,10 @@ step-maybe-restore-git-cache: &step-maybe-restore-git-cache
    paths:
      - ~/.gclient-cache
    keys:
-      - v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-      - v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}
+      - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+      - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}
    name: Conditionally restoring git cache

-step-restore-out-cache: &step-restore-out-cache
-  restore_cache:
-    paths:
-      - ./src/out/Default
-    keys:
-      - v7-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
-    name: Restoring out cache
-
 step-set-git-cache-path: &step-set-git-cache-path
  run:
    name: Set GIT_CACHE_PATH to make gclient to use the cache
@@ -724,16 +709,9 @@ step-save-git-cache: &step-save-git-cache
  save_cache:
    paths:
      - ~/.gclient-cache
-    key: v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+    key: v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
    name: Persisting git cache

-step-save-out-cache: &step-save-out-cache
-  save_cache:
-    paths:
-      - ./src/out/Default
-    key: v7-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
-    name: Persisting out cache
-
 step-run-electron-only-hooks: &step-run-electron-only-hooks
  run:
    name: Run Electron Only Hooks
@@ -742,7 +720,7 @@ step-run-electron-only-hooks: &step-run-electron-only-hooks
 step-generate-deps-hash-cleanly: &step-generate-deps-hash-cleanly
  run:
    name: Generate DEPS Hash
-    command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
+    command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js

 # Mark the sync as done for future cache saving
 step-mark-sync-done: &step-mark-sync-done
@@ -765,8 +743,8 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
 step-save-src-cache: &step-save-src-cache
  save_cache:
    paths:
-      - /portal
-    key: v7-src-cache-{{ checksum "/portal/src/electron/.depshash" }}
+      - ./src
+    key: v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
    name: Persisting src cache

 # Check for doc only change
@@ -859,6 +837,40 @@ steps-lint: &steps-lint
          node script/yarn install --frozen-lockfile
          node script/yarn lint

+steps-checkout-fast: &steps-checkout-fast
+  steps:
+    - *step-checkout-electron
+    - *step-check-for-doc-only-change
+    - *step-persist-doc-only-change
+    - *step-maybe-early-exit-doc-only-change
+    - *step-depot-tools-get
+    - *step-depot-tools-add-to-path
+    - *step-restore-brew-cache
+    - *step-get-more-space-on-mac
+    - *step-install-gnutar-on-mac
+
+    - *step-generate-deps-hash
+    - *step-touch-sync-done
+    - *step-maybe-restore-src-cache
+    - *step-maybe-restore-git-cache
+    - *step-set-git-cache-path
+    # This sync call only runs if .circle-sync-done is an EMPTY file
+    - *step-gclient-sync
+    # These next few steps reset Electron to the correct commit regardless of which cache was restored
+    - run:
+        name: Wipe Electron
+        command: rm -rf src/electron
+    - *step-checkout-electron
+    - *step-run-electron-only-hooks
+    - *step-generate-deps-hash-cleanly
+    - *step-mark-sync-done
+    - *step-minimize-workspace-size-from-checkout
+    - persist_to_workspace:
+        root: .
+        paths:
+          - depot_tools
+          - src
+
 steps-checkout-and-save-cache: &steps-checkout-and-save-cache
  steps:
    - *step-checkout-electron
@@ -873,7 +885,7 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache

    - *step-generate-deps-hash
    - *step-touch-sync-done
-    - maybe-restore-portaled-src-cache
+    - *step-maybe-restore-src-cache
    - *step-maybe-restore-git-cache
    - *step-set-git-cache-path
    # This sync call only runs if .circle-sync-done is an EMPTY file
@@ -888,13 +900,6 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
    - *step-generate-deps-hash-cleanly
    - *step-mark-sync-done
    - *step-minimize-workspace-size-from-checkout
-    - *step-delete-git-directories
-    - run:
-        name: Move src folder to the cross-OS portal
-        command: |
-          sudo mkdir -p /portal
-          sudo chown -R $(id -u):$(id -g) /portal
-          mv ./src /portal
    - *step-save-src-cache
    - *step-save-brew-cache

@@ -966,6 +971,88 @@ steps-electron-build: &steps-electron-build

    - *step-maybe-notify-slack-failure

+steps-electron-build-with-inline-checkout-for-tests: &steps-electron-build-with-inline-checkout-for-tests
+  steps:
+    # Checkout - Copied ffrom steps-checkout
+    - *step-checkout-electron
+    - *step-check-for-doc-only-change
+    - *step-persist-doc-only-change
+    - *step-maybe-early-exit-doc-only-change
+    - *step-depot-tools-get
+    - *step-depot-tools-add-to-path
+    - *step-restore-brew-cache
+    - *step-get-more-space-on-mac
+    - *step-install-gnutar-on-mac
+    - *step-generate-deps-hash
+    - *step-touch-sync-done
+    - *step-maybe-restore-src-cache
+    - *step-maybe-restore-git-cache
+    - *step-set-git-cache-path
+    # This sync call only runs if .circle-sync-done is an EMPTY file
+    - *step-gclient-sync
+    # These next few steps reset Electron to the correct commit regardless of which cache was restored
+    - run:
+        name: Wipe Electron
+        command: rm -rf src/electron
+    - *step-checkout-electron
+    - *step-run-electron-only-hooks
+    - *step-generate-deps-hash-cleanly
+    - *step-mark-sync-done
+    - *step-minimize-workspace-size-from-checkout
+
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-restore-brew-cache
+    - *step-get-more-space-on-mac
+    - *step-install-npm-deps-on-mac
+    - *step-fix-sync-on-mac
+    - *step-delete-git-directories
+    - *step-gn-gen-default
+
+    # Electron app
+    - *step-electron-build
+    - *step-maybe-electron-dist-strip
+    - *step-electron-dist-build
+    - *step-electron-dist-store
+    - *step-ninja-summary
+
+    # Native test targets
+    - *step-native-unittests-build
+    - *step-native-unittests-store
+
+    # Node.js headers
+    - *step-nodejs-headers-build
+    - *step-nodejs-headers-store
+
+    - *step-show-sccache-stats
+
+    # mksnapshot
+    - *step-mksnapshot-build
+    - *step-mksnapshot-store
+    - *step-maybe-cross-arch-snapshot
+    - *step-maybe-cross-arch-snapshot-store
+
+    # ffmpeg
+    - *step-ffmpeg-gn-gen
+    - *step-ffmpeg-build
+    - *step-ffmpeg-store
+
+    # hunspell
+    - *step-hunspell-build
+    - *step-hunspell-store
+
+    # Save all data needed for a further tests run.
+    - *step-persist-data-for-tests
+
+    - *step-maybe-generate-breakpad-symbols
+    - *step-maybe-zip-symbols
+    - *step-symbols-store
+
+    # Trigger tests on arm hardware if needed
+    - *step-maybe-trigger-arm-test
+
+    - *step-maybe-notify-slack-failure
+
 steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-change
  steps:
    # Checkout - Copied ffrom steps-checkout
@@ -979,7 +1066,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
    - *step-install-gnutar-on-mac
    - *step-generate-deps-hash
    - *step-touch-sync-done
-    - maybe-restore-portaled-src-cache
+    - *step-maybe-restore-src-cache
    - *step-maybe-restore-git-cache
    - *step-set-git-cache-path
    # This sync call only runs if .circle-sync-done is an EMPTY file
@@ -1147,8 +1234,7 @@ steps-tests: &steps-tests
        command: |
          cd src
          export ELECTRON_OUT_DIR=Default
-          (cd electron && node script/yarn test --runners=main --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split))
-          (cd electron && node script/yarn test --runners=remote --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split))
+          (cd electron && node script/yarn test -- --ci --enable-logging)
    - run:
        name: Check test results existence
        command: |
@@ -1205,193 +1291,6 @@ steps-test-node: &steps-test-node
 chromium-upgrade-branches: &chromium-upgrade-branches
  /chromium\-upgrade\/[0-9]+/

-# Command Aliases
-commands:
-  maybe-restore-portaled-src-cache:
-    steps:
-      - run:
-          name: Prepare for cross-OS sync restore
-          command: |
-            sudo mkdir -p /portal
-            sudo chown -R $(id -u):$(id -g) /portal
-      - *step-maybe-restore-src-cache
-      - run:
-          name: Fix the src cache restore point on macOS
-          command: |
-            if [ -d "/portal/src" ]; then
-              echo Relocating Cache
-              rm -rf src
-              mv /portal/src ./
-            fi
-  checkout-from-cache:
-    steps:
-      - *step-checkout-electron
-      - *step-maybe-early-exit-doc-only-change
-      - *step-depot-tools-get
-      - *step-depot-tools-add-to-path
-      - *step-generate-deps-hash
-      - maybe-restore-portaled-src-cache
-      - run:
-          name: Ensure src checkout worked
-          command: |
-            if [ ! -d "src/third_party/blink" ]; then
-              echo src cache was not restored for some reason, idk what happened here...
-              exit 1
-            fi
-      - run:
-          name: Wipe Electron
-          command: rm -rf src/electron
-      - *step-checkout-electron
-      - *step-run-electron-only-hooks
-      - *step-generate-deps-hash-cleanly
-  electron-build:
-    parameters:
-      attach:
-        type: boolean
-        default: false
-      persist:
-        type: boolean
-        default: true
-      persist-checkout:
-        type: boolean
-        default: false
-      checkout:
-        type: boolean
-        default: true
-      checkout-and-assume-cache:
-        type: boolean
-        default: false
-      build:
-        type: boolean
-        default: true
-    steps:
-      - when:
-          condition: << parameters.attach >>
-          steps:
-            - attach_workspace:
-                at: .
-      - *step-restore-brew-cache
-      - *step-install-gnutar-on-mac
-      - when:
-          condition: << parameters.checkout-and-assume-cache >>
-          steps:
-            - checkout-from-cache
-      - when:
-          condition: << parameters.checkout >>
-          steps:
-            # Checkout - Copied ffrom steps-checkout
-            - *step-checkout-electron
-            - *step-check-for-doc-only-change
-            - *step-persist-doc-only-change
-            - *step-maybe-early-exit-doc-only-change
-            - *step-depot-tools-get
-            - *step-depot-tools-add-to-path
-            - *step-get-more-space-on-mac
-            - *step-generate-deps-hash
-            - *step-touch-sync-done
-            - maybe-restore-portaled-src-cache
-            - *step-maybe-restore-git-cache
-            - *step-set-git-cache-path
-            # This sync call only runs if .circle-sync-done is an EMPTY file
-            - *step-gclient-sync
-            # These next few steps reset Electron to the correct commit regardless of which cache was restored
-            - run:
-                name: Wipe Electron
-                command: rm -rf src/electron
-            - *step-checkout-electron
-            - *step-run-electron-only-hooks
-            - *step-generate-deps-hash-cleanly
-            - *step-mark-sync-done
-            - *step-minimize-workspace-size-from-checkout
-            - when:
-                condition: << parameters.persist-checkout >>
-                steps:
-                  - persist_to_workspace:
-                      root: .
-                      paths:
-                        - depot_tools
-                        - src
-
-      - when:
-          condition: << parameters.build >>
-          steps:
-            - *step-depot-tools-add-to-path
-            - *step-setup-env-for-build
-            - *step-get-more-space-on-mac
-            - *step-fix-sync-on-mac
-            - *step-delete-git-directories
-            - *step-gn-gen-default
-
-            # Electron app
-            - *step-restore-out-cache
-            - *step-gn-gen-default
-            - *step-electron-build
-            - *step-ninja-summary
-            - *step-ninja-report
-            - *step-maybe-electron-dist-strip
-            - *step-electron-dist-build
-            - *step-electron-dist-store
-
-            # Native test targets
-            - *step-native-unittests-build
-            - *step-native-unittests-store
-
-            # Node.js headers
-            - *step-nodejs-headers-build
-            - *step-nodejs-headers-store
-
-            - *step-show-sccache-stats
-
-            # mksnapshot
-            - *step-mksnapshot-build
-            - *step-mksnapshot-store
-            - *step-maybe-cross-arch-snapshot
-            - *step-maybe-cross-arch-snapshot-store
-
-            # ffmpeg
-            - *step-ffmpeg-gn-gen
-            - *step-ffmpeg-build
-            - *step-ffmpeg-store
-
-            # hunspell
-            - *step-hunspell-build
-            - *step-hunspell-store
-
-      # Save all data needed for a further tests run.
-      - when:
-          condition: << parameters.persist >>
-          steps:
-            - *step-persist-data-for-tests
-
-      - when:
-          condition: << parameters.build >>
-          steps:
-            - *step-maybe-generate-breakpad-symbols
-            - *step-maybe-zip-symbols
-            - *step-symbols-store
-
-      - when:
-          condition: << parameters.build >>
-          steps:
-            - run:
-                name: Remove the big things on macOS, this seems to be better on average
-                command: |
-                  if [ "`uname`" == "Darwin" ]; then
-                    mkdir -p src/out/Default
-                    cd src/out/Default
-                    find . -type f -size +50M -delete
-                    mkdir -p gen/electron
-                    cd gen/electron
-                    # These files do not seem to like being in a cache, let us remove them
-                    find . -type f -name '*_pkg_info' -delete
-                  fi
-            - *step-save-out-cache
-
-      # Trigger tests on arm hardware if needed
-      - *step-maybe-trigger-arm-test
-
-      - *step-maybe-notify-slack-failure
-
 # List of all jobs.
 jobs:
  # Layer 0: Lint. Standalone.
@@ -1414,12 +1313,7 @@ jobs:
    environment:
      <<: *env-linux-2xlarge
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
+    <<: *steps-checkout-fast

  linux-checkout-and-save-cache:
    <<: *machine-linux-2xlarge
@@ -1433,49 +1327,47 @@ jobs:
    environment:
      <<: *env-linux-2xlarge
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
+    <<: *steps-checkout-fast

  linux-checkout-for-native-tests-with-no-patches:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
      GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
+    <<: *steps-checkout-fast

  mac-checkout-fast:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
-      <<: *env-testing-build
-      <<: *env-macos-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
+    <<: *steps-checkout-fast

  mac-checkout-and-save-cache:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
-      <<: *env-testing-build
-      <<: *env-macos-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    <<: *steps-checkout-and-save-cache

  # Layer 2: Builds.
+  linux-x64-debug:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    <<: *steps-electron-build-with-inline-checkout-for-tests
+
+  linux-x64-debug-gn-check:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check
+
  linux-x64-testing:
    <<: *machine-linux-2xlarge
    environment:
@@ -1484,10 +1376,7 @@ jobs:
      <<: *env-enable-sccache
      <<: *env-ninja-status
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: true
+    <<: *steps-electron-build-with-inline-checkout-for-tests

  linux-x64-testing-no-run-as-node:
    <<: *machine-linux-2xlarge
@@ -1498,10 +1387,7 @@ jobs:
      <<: *env-ninja-status
      <<: *env-disable-run-as-node
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          checkout: true
+    <<: *steps-electron-build-with-inline-checkout-for-tests

  linux-x64-testing-gn-check:
    <<: *machine-linux-medium
@@ -1539,6 +1425,17 @@ jobs:
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    <<: *steps-electron-build-for-publish

+  linux-ia32-debug:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-ia32
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    <<: *steps-electron-build-with-inline-checkout-for-tests
+
  linux-ia32-testing:
    <<: *machine-linux-2xlarge
    environment:
@@ -1548,10 +1445,7 @@ jobs:
      <<: *env-enable-sccache
      <<: *env-ninja-status
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: true
+    <<: *steps-electron-build-with-inline-checkout-for-tests

  linux-ia32-chromedriver:
    <<: *machine-linux-medium
@@ -1586,6 +1480,17 @@ jobs:
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    <<: *steps-electron-build-for-publish

+  linux-arm-debug:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-arm
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    <<: *steps-electron-build-with-inline-checkout-for-tests
+
  linux-arm-testing:
    <<: *machine-linux-2xlarge
    environment:
@@ -1596,10 +1501,7 @@ jobs:
      <<: *env-ninja-status
      TRIGGER_ARM_TEST: true
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          checkout: true
+    <<: *steps-electron-build-with-inline-checkout-for-tests

  linux-arm-chromedriver:
    <<: *machine-linux-medium
@@ -1634,6 +1536,25 @@ jobs:
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    <<: *steps-electron-build-for-publish

+  linux-arm64-debug:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-arm64
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    <<: *steps-electron-build-with-inline-checkout-for-tests
+
+  linux-arm64-debug-gn-check:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm64
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check
+
  linux-arm64-testing:
    <<: *machine-linux-2xlarge
    environment:
@@ -1644,10 +1565,7 @@ jobs:
      <<: *env-ninja-status
      TRIGGER_ARM_TEST: true
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          checkout: true
+    <<: *steps-electron-build-with-inline-checkout-for-tests

  linux-arm64-testing-gn-check:
    <<: *machine-linux-medium
@@ -1696,14 +1614,24 @@ jobs:
      <<: *env-testing-build
      <<: *env-enable-sccache
      <<: *env-ninja-status
-      <<: *env-macos-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: false
-          checkout-and-assume-cache: true
-          attach: false
+    <<: *steps-electron-build
+
+  osx-debug:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-debug-build
+      <<: *env-mac-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+    <<: *steps-electron-build
+
+  osx-debug-gn-check:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check

  osx-testing-gn-check:
    <<: *machine-mac
@@ -1748,14 +1676,26 @@ jobs:
      <<: *env-testing-build
      <<: *env-enable-sccache
      <<: *env-ninja-status
-      <<: *env-macos-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: false
-          checkout-and-assume-cache: true
-          attach: false
+    <<: *steps-electron-build
+
+  mas-debug:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-mas
+      <<: *env-debug-build
+      <<: *env-mac-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+    <<: *steps-electron-build
+
+  mas-debug-gn-check:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-mas
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check

  mas-testing-gn-check:
    <<: *machine-mac
@@ -1841,7 +1781,6 @@ jobs:
      <<: *env-linux-medium
      <<: *env-headless-testing
      <<: *env-stack-dumping
-    parallelism: 3
    <<: *steps-tests

  linux-x64-testing-nan:
@@ -1891,7 +1830,6 @@ jobs:
      <<: *env-ia32
      <<: *env-headless-testing
      <<: *env-stack-dumping
-    parallelism: 3
    <<: *steps-tests

  linux-ia32-testing-nan:
@@ -1944,7 +1882,6 @@ jobs:
    environment:
      <<: *env-mac-large
      <<: *env-stack-dumping
-    parallelism: 2
    <<: *steps-tests

  osx-release-tests:
@@ -1974,7 +1911,6 @@ jobs:
    environment:
      <<: *env-mac-large
      <<: *env-stack-dumping
-    parallelism: 2
    <<: *steps-tests

  mas-release-tests:
@@ -2104,6 +2040,10 @@ workflows:
      - linux-checkout-fast
      - linux-checkout-and-save-cache

+      - linux-x64-debug
+      - linux-x64-debug-gn-check:
+          requires:
+            - linux-checkout-fast
      - linux-x64-testing
      - linux-x64-testing-no-run-as-node
      - linux-x64-testing-gn-check:
@@ -2119,6 +2059,7 @@ workflows:
          requires:
            - linux-x64-testing

+      - linux-ia32-debug
      - linux-ia32-testing
      - linux-ia32-testing-tests:
          requires:
@@ -2130,8 +2071,13 @@ workflows:
          requires:
            - linux-ia32-testing

+      - linux-arm-debug
      - linux-arm-testing

+      - linux-arm64-debug
+      - linux-arm64-debug-gn-check:
+          requires:
+            - linux-checkout-fast
      - linux-arm64-testing
      - linux-arm64-testing-gn-check:
          requires:
@@ -2146,7 +2092,7 @@ workflows:

      - osx-testing:
          requires:
-            - mac-checkout-and-save-cache
+            - mac-checkout-fast

      - osx-testing-gn-check:
          requires:
@@ -2158,7 +2104,7 @@ workflows:

      - mas-testing:
          requires:
-            - mac-checkout-and-save-cache
+            - mac-checkout-fast

      - mas-testing-gn-check:
          requires:
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -17,29 +17,18 @@
    "prefer-const": ["error", {
      "destructuring": "all"
    }],
-    "standard/no-callback-literal": "off",
    "node/no-deprecated-api": 0
  },
  "parserOptions": {
    "ecmaVersion": 6,
    "sourceType": "module"
  },
-  "globals": {
-    "standardScheme": "readonly"
-  },
  "overrides": [
    {
      "files": "*.js",
      "rules": {
          "@typescript-eslint/no-unused-vars": "off"
      }
-    },
-    {
-      "files": "*.d.ts",
-      "rules": {
-          "no-useless-constructor": "off",
-          "@typescript-eslint/no-unused-vars": "off"
-      }
    }
  ]
 }
--- a/.github/ISSUE_TEMPLATE/security_report.md
+++ b/.github/ISSUE_TEMPLATE/security_report.md
@@ -0,0 +1,10 @@
+---
+name: Security report
+about: Do not create an issue for security reports, send an email to security@electronjs.org
+
+---
+
+### Notice 
+
+**DO NOT** create an issue for security reports.
+Send an email to: **security@electronjs.org**.
--- a/.gitignore
+++ b/.gitignore
@@ -65,4 +65,3 @@ ts-gen

 # Used to accelerate CI builds
 .depshash
-.depshash-target
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -4,7 +4,6 @@ import("//build/config/win/manifest.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//content/public/app/mac_helpers.gni")
 import("//pdf/features.gni")
-import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//testing/test.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
@@ -355,6 +354,7 @@ source_set("electron_lib") {
    "buildflags",
    "chromium_src:chrome",
    "chromium_src:chrome_spellchecker",
+    "native_mate",
    "shell/common/api:mojo",
    "//base:base_static",
    "//base/allocator:buildflags",
@@ -575,12 +575,8 @@ source_set("electron_lib") {
    deps += [ "//third_party/crashpad/crashpad/client" ]
  }

-  if (enable_plugins) {
-    deps += [ "chromium_src:plugins" ]
-    sources += [
-      "shell/renderer/pepper_helper.cc",
-      "shell/renderer/pepper_helper.h",
-    ]
+  if (enable_pdf) {
+    deps += [ "//pdf" ]
  }

  if (enable_run_as_node) {
@@ -664,6 +660,10 @@ source_set("electron_lib") {
    ]
  }

+  if (enable_pepper_flash) {
+    deps += [ "components/pepper_flash" ]
+  }
+
  public_deps += [ "shell/common/extensions/api:extensions_features" ]
  deps += [
    "//components/pref_registry",
@@ -677,22 +677,6 @@ source_set("electron_lib") {
  if (enable_electron_extensions) {
    sources += filenames.lib_sources_extensions
  }
-
-  if (enable_pdf) {
-    # Printing depends on some //pdf code, so it needs to be built even if the
-    # pdf viewer isn't enabled.
-    deps += [ "//pdf" ]
-  }
-  if (enable_pdf_viewer) {
-    deps += [
-      "//components/pdf/browser",
-      "//components/pdf/renderer",
-    ]
-    sources += [
-      "shell/browser/electron_pdf_web_contents_helper_client.cc",
-      "shell/browser/electron_pdf_web_contents_helper_client.h",
-    ]
-  }
 }

 electron_paks("packed_resources") {
@@ -1368,18 +1352,12 @@ dist_zip("electron_chromedriver_zip") {
  ]
 }

-mksnapshot_deps = [
-  ":licenses",
-  "//tools/v8_context_snapshot:v8_context_snapshot_generator",
-  "//v8:mksnapshot($v8_snapshot_toolchain)",
-]
-
-group("electron_mksnapshot") {
-  public_deps = mksnapshot_deps
-}
-
 dist_zip("electron_mksnapshot_zip") {
-  data_deps = mksnapshot_deps
+  data_deps = [
+    "//v8:mksnapshot($v8_snapshot_toolchain)",
+    "//tools/v8_context_snapshot:v8_context_snapshot_generator",
+    ":licenses",
+  ]
  outputs = [
    "$root_build_dir/mksnapshot.zip",
  ]
--- a/4
+++ b/4
@@ -11,9 +11,9 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    'd0c764fc71894cc24d3bb17a7406ba6c6cc6dc29',
+    '80.0.3987.51',
  'node_version':
-    'v12.14.0',
+    'v12.13.0',
  'nan_version':
    '2ee313aaca52e2b478965ac50eb5082520380d1b',

--- a/50
+++ b/50
@@ -0,0 +1,50 @@
+FROM ubuntu:18.04
+
+RUN groupadd --gid 1000 builduser \
+  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
+
+# Set up TEMP directory
+ENV TEMP=/tmp
+RUN chmod a+rwx /tmp
+
+# Install Linux packages
+ADD build/install-build-deps.sh /setup/install-build-deps.sh
+RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
+RUN dpkg --add-architecture i386
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    curl \
+    libnotify-bin \
+    locales \
+    lsb-release \
+    nano \
+    python-dbus \
+    python-pip \
+    python-setuptools \
+    sudo \
+    vim-nox \
+    wget \
+    g++-multilib \
+    libgl1:i386 \
+  && /setup/install-build-deps.sh --syms --no-prompt --no-chromeos-fonts --lib32 --arm \
+  && rm -rf /var/lib/apt/lists/*
+
+# Install Node.js
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+# crcmod is required by gsutil, which is used for filling the gclient git cache
+RUN pip install -U crcmod
+
+# dbusmock is needed for Electron tests
+RUN pip install python-dbusmock
+
+RUN mkdir /tmp/workspace
+RUN chown builduser:builduser /tmp/workspace
+
+# Add xvfb init script
+ADD tools/xvfb-init.sh /etc/init.d/xvfb
+RUN chmod a+x /etc/init.d/xvfb
+
+USER builduser
+WORKDIR /home/builduser
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -0,0 +1,59 @@
+FROM arm32v7/ubuntu:18.04
+
+RUN groupadd --gid 1000 builduser \
+  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
+
+# Set up TEMP directory
+ENV TEMP=/tmp
+RUN chmod a+rwx /tmp
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ bison \
+ build-essential \
+ clang \
+ curl \
+ gperf \
+ git \
+ libasound2 \
+ libasound2-dev \
+ libcap-dev \
+ libcups2-dev \
+ libdbus-1-dev \
+ libgnome-keyring-dev \
+ libgtk2.0-0 \
+ libgtk2.0-dev \
+ libgtk-3-0 \
+ libgtk-3-dev \
+ libnotify-bin \
+ libnss3 \
+ libnss3-dev \
+ libxss1 \
+ libxtst-dev \
+ libxtst6 \
+ lsb-release \
+ locales \
+ nano \
+ python-setuptools \
+ python-pip \
+ python-dbusmock \
+ sudo \
+ unzip \
+ wget \
+ xvfb \
+&& rm -rf /var/lib/apt/lists/*
+
+# Install Node.js
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+# crcmod is required by gsutil, which is used for filling the gclient git cache
+RUN pip install -U crcmod
+
+ADD tools/xvfb-init.sh /etc/init.d/xvfb
+RUN chmod a+x /etc/init.d/xvfb
+
+RUN usermod -aG sudo builduser
+RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+WORKDIR /home/builduser
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -0,0 +1,65 @@
+FROM arm64v8/ubuntu:18.04
+
+RUN groupadd --gid 1000 builduser \
+  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
+
+# Set up TEMP directory
+ENV TEMP=/tmp
+RUN chmod a+rwx /tmp
+
+RUN dpkg --add-architecture armhf
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ bison \
+ build-essential \
+ clang \
+ curl \
+ gperf \
+ git \
+ libasound2 \
+ libasound2-dev \
+ libc6:armhf \
+ libcap-dev \
+ libcups2-dev \
+ libdbus-1-dev \
+ libgnome-keyring-dev \
+ libgtk2.0-0 \
+ libgtk2.0-dev \
+ libgtk-3-0 \
+ libgtk-3-dev \
+ libnotify-bin \
+ libnss3 \
+ libnss3-dev \
+ libstdc++6:armhf \
+ libxss1 \
+ libxtst-dev \
+ libxtst6 \
+ lsb-release \
+ locales \
+ nano \
+ python-setuptools \
+ python-pip \
+ sudo \
+ unzip \
+ wget \
+ xvfb \
+&& rm -rf /var/lib/apt/lists/*
+
+# Install Node.js
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+# crcmod is required by gsutil, which is used for filling the gclient git cache
+RUN pip install -U crcmod
+
+# dbusmock is needed for Electron tests
+RUN pip install python-dbusmock
+
+ADD tools/xvfb-init.sh /etc/init.d/xvfb
+RUN chmod a+x /etc/init.d/xvfb
+
+RUN usermod -aG sudo builduser
+RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+WORKDIR /home/builduser
--- a/2
+++ b/2
@@ -1 +1 @@
-9.0.0-nightly.20191222
+8.0.0-beta.6
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 # The config expects the following environment variables to be set:
-#  - "GN_CONFIG" Build type. One of {'testing', 'release'}.
+#  - "GN_CONFIG" Build type. One of {'debug', 'testing', 'release'}.
 #  - "GN_EXTRA_ARGS" Additional gn arguments for a build config,
 #      e.g. 'target_cpu="x86"' to build for a 32bit platform.
 #      https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu
@@ -76,38 +76,7 @@ build_script:
      --unmanaged
      %GCLIENT_EXTRA_ARGS%
      "https://github.com/electron/electron"
-  - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
-        $env:RUN_GCLIENT_SYNC="true"
-      } else {
-        cd src\electron
-        node script\generate-deps-hash.js
-        $depshash = Get-Content .\.depshash -Raw 
-        $zipfile = "Z:\$depshash.7z"
-        cd ..\..
-        if (Test-Path -Path $zipfile) {
-          # file exists, unzip and then gclient sync
-          7z x -y $zipfile -mmt=30 -aoa
-          # update external binaries
-          python src/electron/script/update-external-binaries.py
-        } else {    
-          # file does not exist, gclient sync, then zip
-          $env:RUN_GCLIENT_SYNC="true"
-          if ($env:TARGET_ARCH -ne 'ia32') {
-            # only save on x64/woa to avoid contention saving
-            $env:SAVE_GCLIENT_SRC="true"
-          }
-        }
-      }
-  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags --ignore_locks)
-  - ps: >-
-      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
-        # archive current source for future use 
-        # only run on x64/woa to avoid contention saving
-        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
-          Write-warning "Could not save source to shared drive; continuing anyway"
-        }
-      }
+  - gclient sync --with_branch_heads --with_tags --ignore_locks --break_repo_locks
  - cd src
  - ps: $env:BUILD_CONFIG_PATH="//electron/build/args/%GN_CONFIG%.gn"
  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS% cc_wrapper=\"%SCCACHE_PATH%\""
@@ -126,8 +95,6 @@ build_script:
  - ninja -C out/Default electron:electron_chromedriver_zip
  - ninja -C out/Default third_party/electron_node:headers
  - cmd /C %SCCACHE_PATH% --show-stats
-  - 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
@@ -146,12 +113,12 @@ build_script:
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
        python electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        appveyor PushArtifact out/Default/symbols.zip
      } else {
        # It's useful to have pdb files when debugging testing builds that are
        # built on CI.
        7z a pdb.zip out\Default\*.pdb
-        appveyor-retry appveyor PushArtifact pdb.zip
+        appveyor PushArtifact 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:
@@ -169,7 +136,7 @@ test_script:
        echo "Skipping tests for $env:GN_CONFIG build"
      }
  - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --enable-logging)
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --ci --enable-logging)
  - cd ..
  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
  - echo "About to verify mksnapshot"
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -63,7 +63,7 @@ steps:
    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
    set npm_config_arch=arm64
    cd electron
-    node script/yarn test -- --enable-logging --verbose
+    node script/yarn test -- --ci --enable-logging --verbose
  displayName: 'Run Electron tests'
  env:
    ELECTRON_OUT_DIR: Default
@@ -89,4 +89,4 @@ steps:
    Get-Process | Where Name –Like "electron*" | Stop-Process
    Get-Process | Where Name –Like "MicrosoftEdge*" | Stop-Process
  displayName: 'Kill processes left running from last test run'
-  condition: always()
+  condition: always()
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -8,6 +8,12 @@ v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
 v8_embedder_string = "-electron.0"

+# TODO: this breaks native modules. See e.g. https://www.github.com/nodejs/node/pull/30463
+# We can probably enable this as long as we make sure node native modules
+# also build with the relevant #defines (V8_COMPRESS_POINTERS etc.)
+v8_enable_pointer_compression = false
+v8_enable_31bit_smis_on_64bit_arch = false
+
 # TODO: this breaks mksnapshot
 v8_enable_snapshot_native_code_counters = false

--- a/build/args/debug.gn
+++ b/build/args/debug.gn
@@ -0,0 +1,10 @@
+import("all.gn")
+is_debug = true
+is_component_build = true
+
+# This may be guarded behind is_chrome_branded alongside
+# proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
+# explicitly override here to build OpenH264 encoder/FFmpeg decoder.
+# The initialization of the decoder depends on whether ffmpeg has
+# been built with H.264 support.
+rtc_use_h264 = proprietary_codecs
--- a/build/profile_toolchain.py
+++ b/build/profile_toolchain.py
@@ -1,98 +0,0 @@
-from __future__ import with_statement
-import contextlib
-import sys
-import os
-import optparse
-import json
-
-sys.path.append("%s/../../build" % os.path.dirname(os.path.realpath(__file__)))
-
-import find_depot_tools
-from vs_toolchain import \
-    SetEnvironmentAndGetRuntimeDllDirs, \
-    SetEnvironmentAndGetSDKDir, \
-    GetVisualStudioVersion, \
-    NormalizePath
-
-sys.path.append("%s/win_toolchain" % find_depot_tools.add_depot_tools_to_path())
-
-from get_toolchain_if_necessary import CalculateHash
-
-
-@contextlib.contextmanager
-def cwd(dir):
-    curdir = os.getcwd()
-    try:
-        os.chdir(dir)
-        yield
-    finally:
-        os.chdir(curdir)
-
-
-def calculate_hash(root):
-    with cwd(root):
-        return CalculateHash('.', None)
-
-def windows_installed_software():
-    import win32com.client
-    strComputer = "."
-    objWMIService = win32com.client.Dispatch("WbemScripting.SWbemLocator")
-    objSWbemServices = objWMIService.ConnectServer(strComputer, "root\cimv2")
-    colItems = objSWbemServices.ExecQuery("Select * from Win32_Product")
-    items = []
-
-    for objItem in colItems:
-        item = {}
-        if objItem.Caption:
-            item['caption'] = objItem.Caption
-        if objItem.Caption:
-            item['description'] = objItem.Description
-        if objItem.InstallDate:
-            item['install_date'] = objItem.InstallDate
-        if objItem.InstallDate2:
-            item['install_date_2'] = objItem.InstallDate2
-        if objItem.InstallLocation:
-            item['install_location'] = objItem.InstallLocation
-        if objItem.Name:
-            item['name'] = objItem.Name
-        if objItem.SKUNumber:
-            item['sku_number'] = objItem.SKUNumber
-        if objItem.Vendor:
-            item['vendor'] = objItem.Vendor
-        if objItem.Version:
-            item['version'] = objItem.Version
-        items.append(item)
-
-    return items
-
-
-def windows_profile():
-    runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
-    win_sdk_dir = SetEnvironmentAndGetSDKDir()
-    path = NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH'])
-
-    return {
-        'pwd': os.getcwd(), # since current windows executable are symbols path dependant, profile the current directory too
-        'installed_software': windows_installed_software(),
-        'sdks': [
-            {'name': 'vs', 'path': path, 'hash': calculate_hash(path)},
-            {'name': 'wsdk', 'path': win_sdk_dir, 'hash': calculate_hash(win_sdk_dir)}
-        ],
-        'runtime_lib_dirs': runtime_dll_dirs,
-    }
-
-
-def main(options):
-    if sys.platform == 'win32':
-        with open(options.output_json, 'wb') as f:
-            json.dump(windows_profile(), f)
-    else:
-        raise OSError("Unsupported OS")
-
-
-if __name__ == '__main__':
-  parser = optparse.OptionParser()
-  parser.add_option('--output-json', metavar='FILE', default='profile.json',
-                    help='write information about toolchain to FILE')
-  options, args = parser.parse_args()
-  sys.exit(main(options))
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -231,79 +231,6 @@ static_library("chrome") {
  }
 }

-source_set("plugins") {
-  sources = []
-  deps = []
-  libs = []
-
-  # browser side
-  sources += [
-    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
-    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
-    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h",
-    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
-  ]
-  deps += [
-    "//media:media_buildflags",
-    "//ppapi/buildflags",
-    "//ppapi/proxy:ipc",
-    "//services/device/public/mojom",
-  ]
-  if (enable_pepper_flash) {
-    sources += [
-      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc",
-      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h",
-    ]
-    if (is_mac) {
-      sources += [
-        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
-        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
-      ]
-      libs += [ "CoreGraphics.framework" ]
-    }
-    if (is_linux) {
-      deps += [ "//components/services/font/public/cpp" ]
-    }
-  }
-
-  # renderer side
-  sources += [
-    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
-    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
-    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
-    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
-  ]
-  if (enable_pepper_flash) {
-    sources += [
-      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
-      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
-      "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_menu_host.h",
-      "//chrome/renderer/pepper/pepper_flash_renderer_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
-    ]
-  }
-  deps += [
-    "//components/strings",
-    "//media:media_buildflags",
-    "//ppapi/host",
-    "//ppapi/proxy",
-    "//ppapi/proxy:ipc",
-    "//ppapi/shared_impl",
-    "//skia",
-  ]
-}
-
 # This source set is just so we don't have to depend on all of //chrome/browser
 # You may have to add new files here during the upgrade if //chrome/browser/spellchecker
 # gets more files
@@ -328,7 +255,6 @@ source_set("chrome_spellchecker") {
      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
      "//chrome/browser/spellchecker/spellcheck_service.cc",
      "//chrome/browser/spellchecker/spellcheck_service.h",
-      "//chrome/common/pref_names.h",
    ]

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

 let mainWindow: BrowserWindow | null = null

+app.allowRendererProcessReuse = true
+
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
  app.quit()
--- a/docs/README.md
+++ b/docs/README.md
@@ -39,7 +39,6 @@ an issue:
  * [Using Electron's APIs](tutorial/application-architecture.md#using-electron-apis)
  * [Using Node.js APIs](tutorial/application-architecture.md#using-nodejs-apis)
  * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
-  * [Performance Strategies](tutorial/performance.md)
 * Adding Features to Your App
  * [Notifications](tutorial/notifications.md)
  * [Recent Documents](tutorial/recent-documents.md)
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -487,6 +487,18 @@ Emitted when `remote.getCurrentWebContents()` is called in the renderer process
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.

+### Event: 'remote-get-guest-web-contents'
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+* `guestWebContents` [WebContents](web-contents.md)
+
+Emitted when `<webview>.getWebContents()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 ## Methods

 The `app` object has the following methods:
@@ -1303,7 +1315,7 @@ command line arguments that Chromium uses.

 ### `app.dock` _macOS_ _Readonly_

-A [`Dock`](./dock.md) `| undefined` object that allows you to perform actions on your app icon in the user's
+A [`Dock`](./dock.md) object that allows you to perform actions on your app icon in the user's
 dock on macOS.

 ### `app.isPackaged` _Readonly_
--- a/docs/api/breaking-changes.md
+++ b/docs/api/breaking-changes.md
@@ -6,44 +6,6 @@ Breaking changes will be documented here, and deprecation warnings added to JS c

 The `FIXME` string is used in code comments to denote things that should be fixed for future releases. See https://github.com/electron/electron/search?q=fixme

-## Planned Breaking API Changes (9.0)
-
-### `<webview>.getWebContents()`
-
-This API, which was deprecated in Electron 8.0, is now removed.
-
-```js
-// Removed in Electron 9.0
-webview.getWebContents()
-// Replace with
-const { remote } = require('electron')
-remote.webContents.fromId(webview.getWebContentsId())
-```
-
-### `webFrame.setLayoutZoomLevelLimits()`
-
-Chromium has removed support for changing the layout zoom level limits, and it
-is beyond Electron's capacity to maintain it. The function was deprecated in
-Electron 8.x, and has been removed in Electron 9.x. The layout zoom level limits
-are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
-[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
-
-### Sending non-JS objects over IPC now throws an exception
-
-In Electron 8.0, IPC was changed to use the Structured Clone Algorithm,
-bringing significant performance improvements. To help ease the transition, the
-old IPC serialization algorithm was kept and used for some objects that aren't
-serializable with Structured Clone. In particular, DOM objects (e.g. `Element`,
-`Location` and `DOMMatrix`), Node.js objects backed by C++ classes (e.g.
-`process.env`, some members of `Stream`), and Electron objects backed by C++
-classes (e.g. `WebContents`, `BrowserWindow` and `WebFrame`) are not
-serializable with Structured Clone. Whenever the old algorithm was invoked, a
-deprecation warning was printed.
-
-In Electron 9.0, the old serialization algorithm has been removed, and sending
-such non-serializable objects will now throw an "object could not be cloned"
-error.
-
 ## Planned Breaking API Changes (8.0)

 ### Values sent over IPC are now serialized with Structured Clone Algorithm
@@ -209,15 +171,15 @@ webFrame.setIsolatedWorldInfo(
 This property was removed in Chromium 77, and as such is no longer available.

 ### `webkitdirectory` attribute for `<input type="file"/>`
-
+
 The `webkitdirectory` property on HTML file inputs allows them to select folders.
 Previous versions of Electron had an incorrect implementation where the `event.target.files`
 of the input returned a `FileList` that returned one `File` corresponding to the selected folder.
-
+
 As of Electron 7, that `FileList` is now list of all files contained within
 the folder, similarly to Chrome, Firefox, and Edge
 ([link to MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/webkitdirectory)).
-
+
 As an illustration, take a folder with this structure:
 ```console
 folder
@@ -225,22 +187,23 @@ folder
 ├── file2
 └── file3
 ```
-
+
 In Electron <=6, this would return a `FileList` with a `File` object for:
 ```console
 path/to/folder
 ```
-
+
 In Electron 7, this now returns a `FileList` with a `File` object for:
 ```console
 /path/to/folder/file3
 /path/to/folder/file2
 /path/to/folder/file1
 ```
-
+
 Note that `webkitdirectory` no longer exposes the path to the selected folder.
 If you require the path to the selected folder rather than the folder contents,
 see the `dialog.showOpenDialog` API ([link](https://github.com/electron/electron/blob/master/docs/api/dialog.md#dialogshowopendialogbrowserwindow-options)).
+
 ## Planned Breaking API Changes (6.0)

 ### `win.setMenu(null)`
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -386,7 +386,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      to accessibility tools such as screen readers. This string is not directly
      visible to users.
    * `spellcheck` Boolean (optional) - Whether to enable the builtin spellchecker.
-      Default is `true`.
+      Default is `false`.

 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -772,7 +772,7 @@ events.

 #### `win.id` _Readonly_

-A `Integer` property representing the unique ID of the window. Each ID is unique among all `BrowserWindow` instances of the entire Electron application.
+A `Integer` property representing the unique ID of the window.

 #### `win.autoHideMenuBar`

@@ -946,11 +946,11 @@ Returns `Boolean` - Whether the window is in simple (pre-Lion) fullscreen mode.

 Returns `Boolean` - Whether the window is in normal state (not maximized, not minimized, not in fullscreen mode).

-#### `win.setAspectRatio(aspectRatio[, extraSize])` _macOS_ _Linux_
+#### `win.setAspectRatio(aspectRatio[, extraSize])` _macOS_

 * `aspectRatio` Float - The aspect ratio to maintain for some portion of the
 content view.
- * `extraSize` [Size](structures/size.md) (optional) _macOS_ - The extra size not to be included while
+* `extraSize` [Size](structures/size.md) (optional) - The extra size not to be included while
 maintaining the aspect ratio.

 This will make a window maintain an aspect ratio. The extra size allows a
@@ -1019,11 +1019,6 @@ console.log(win.getBounds())

 Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `Object`.

-#### `win.getBackgroundColor()`
-
-Returns `String` - Gets the background color of the window. See [Setting
-`backgroundColor`](#setting-backgroundcolor).
-
 #### `win.setContentBounds(bounds[, animate])`

 * `bounds` [Rectangle](structures/rectangle.md)
@@ -1632,7 +1627,7 @@ Returns `Boolean` - Whether the menu bar is visible.
 * `visible` Boolean
 * `options` Object (optional)
  * `visibleOnFullScreen` Boolean (optional) _macOS_ - Sets whether
-    the window should be visible above fullscreen windows
+    the window should be visible above fullscreen windows _deprecated_

 Sets whether the window should be visible on all workspaces.

--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -190,6 +190,7 @@ Enables caller stack logging for the following APIs (filtering events):
 - `remote.getBuiltin()` / `remote-get-global`
 - `remote.getCurrentWindow()` / `remote-get-current-window`
 - `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
+- `remote.getGuestWebContents()` / `remote-get-guest-web-contents`

 ## --no-sandbox

--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -38,9 +38,6 @@ Get a set of category groups. The category groups can change as new code paths
 are reached. See also the [list of built-in tracing
 categories](https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h).

-> **NOTE:** Electron adds a non-default tracing category called `"electron"`.
-> This category can be used to capture Electron-specific tracing events.
-
 ### `contentTracing.startRecording(options)`

 * `options` ([TraceConfig](structures/trace-config.md) | [TraceCategoriesAndOptions](structures/trace-categories-and-options.md))
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -44,11 +44,7 @@ Unsupported options are:
 --use-openssl-ca
 ```

-`NODE_OPTIONS` are explicitly disallowed in packaged apps, except for the following:
-
-```sh
--max-http-header-size
-```
+`NODE_OPTIONS` are explicitly disallowed in packaged apps.

 ### `GOOGLE_API_KEY`

@@ -125,5 +121,5 @@ the `electron` command to use the specified build of Electron instead of
 the one downloaded by `npm install`. Usage:

 ```sh
-export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Testing
+export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Debug
 ```
--- a/docs/api/in-app-purchase.md
+++ b/docs/api/in-app-purchase.md
@@ -40,17 +40,11 @@ Retrieves the product descriptions.

 ### `inAppPurchase.canMakePayments()`

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

 ### `inAppPurchase.getReceiptURL()`

-Returns `String` - the path to the receipt.
+Returns `String`, the path to the receipt.

 ### `inAppPurchase.finishAllTransactions()`

--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
    * `menuItem` MenuItem
    * `browserWindow` [BrowserWindow](browser-window.md)
    * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `close`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
    `click` property will be ignored. See [roles](#roles).
  * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
    `radio`.
--- a/docs/api/modernization/promisification.md
+++ b/docs/api/modernization/promisification.md
@@ -1,6 +1,17 @@
 ## Promisification

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

 - [app.getFileIcon(path[, options], callback)](https://github.com/electron/electron/blob/master/docs/api/app.md#getFileIcon)
 - [contents.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#capturePage)
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -82,6 +82,12 @@ A `Boolean` that controls whether or not deprecation warnings are printed to `st
 Setting this to `true` will silence deprecation warnings. This property is used
 instead of the `--no-deprecation` command line flag.

+### `process.enablePromiseAPIs`
+
+A `Boolean` that controls whether or not deprecation warnings are printed to `stderr` when
+formerly callback-based APIs converted to Promises are invoked using callbacks. Setting this to `true`
+will enable deprecation warnings.
+
 ### `process.resourcesPath` _Readonly_

 A `String` representing the path to the resources directory.
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -126,10 +126,9 @@ Clears the session’s HTTP cache.
    `scheme://host:port`.
  * `storages` String[] (optional) - The types of storages to clear, can contain:
    `appcache`, `cookies`, `filesystem`, `indexdb`, `localstorage`,
-    `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
-    specified, clear all storage types.
+    `shadercache`, `websql`, `serviceworkers`, `cachestorage`.
  * `quotas` String[] (optional) - The types of quotas to clear, can contain:
-    `temporary`, `persistent`, `syncable`. If not specified, clear all quotas.
+    `temporary`, `persistent`, `syncable`.

 Returns `Promise<void>` - resolves when the storage data has been cleared.

@@ -465,16 +464,12 @@ The built in spellchecker does not automatically detect what language a user is
 spell checker to correctly check their words you must call this API with an array of language codes.  You can
 get the list of supported language codes with the `ses.availableSpellCheckerLanguages` property.

-**Note:** On macOS the OS spellchecker is used and will detect your language automatically.  This API is a no-op on macOS.
-
 #### `ses.getSpellCheckerLanguages()`

 Returns `String[]` - An array of language codes the spellchecker is enabled for.  If this list is empty the spellchecker
 will fallback to using `en-US`.  By default on launch if this setting is an empty list Electron will try to populate this
 setting with the current OS locale.  This setting is persisted across restarts.

-**Note:** On macOS the OS spellchecker is used and has it's own list of languages.  This API is a no-op on macOS.
-
 #### `ses.setSpellCheckerDictionaryDownloadURL(url)`

 * `url` String - A base URL for Electron to download hunspell dictionaries from.
@@ -484,16 +479,6 @@ behavior you can use this API to point the dictionary downloader at your own hos
 dictionaries.  We publish a `hunspell_dictionaries.zip` file with each release which contains the files you need
 to host here.

-**Note:** On macOS the OS spellchecker is used and therefore we do not download any dictionary files.  This API is a no-op on macOS.
-
-#### `ses.addWordToSpellCheckerDictionary(word)`
-
-* `word` String - The word you want to add to the dictionary
-
-Returns `Boolean` - Whether the word was successfully written to the custom dictionary.
-
-**Note:** On macOS and Windows 10 this word will be written to the OS custom dictionary as well
-
 ### Instance Properties

 The following properties are available on instances of `Session`:
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -24,14 +24,11 @@ The `shell` module has the following methods:

 Show the given file in a file manager. If possible, select the file.

-### `shell.openPath(path)`
+### `shell.openItem(fullPath)`

-* `path` String
+* `fullPath` String

-Returns `Promise<Object>` - Resolve with an object containing the following:
-
-* `success` Boolean - whether or not the path was successfully opened in the desktop's default manner.
-* `errorMessage` String (optional) - The error message corresponding to the failure if a failure occurred, otherwise empty string.
+Returns `Boolean` - Whether the item was successfully opened.

 Open the given file in the desktop's default manner.

--- a/docs/api/structures/ipc-main-event.md
+++ b/docs/api/structures/ipc-main-event.md
@@ -4,5 +4,4 @@
 * `returnValue` any - Set this to the value to be returned in a synchronous message
 * `sender` WebContents - Returns the `webContents` that sent the message
 * `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
-  * `channel` String
  * `...args` any[]
--- a/docs/api/structures/printer-info.md
+++ b/docs/api/structures/printer-info.md
@@ -1,13 +1,9 @@
 # PrinterInfo Object

-* `name` String - the name of the printer as understood by the OS.
-* `displayName` String - the name of the printer as shown in Print Preview.
-* `description` String - a longer description of the printer's type.
-* `status` Number - the current status of the printer.
-* `isDefault` Boolean - whether or not a given printer is set as the default printer on the OS.
-* `options` Object - an object containing a variable number of platform-specific printer information.
-
-The number represented by `status` means different things on different platforms: on Windows it's potential values can be found [here](https://docs.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).
+* `name` String
+* `description` String
+* `status` Number
+* `isDefault` Boolean

 ## Example

@@ -16,14 +12,13 @@ may be different on each platform.

 ```javascript
 {
-  name: 'Austin_4th_Floor_Printer___C02XK13BJHD4',
-  displayName: 'Austin 4th Floor Printer @ C02XK13BJHD4',
-  description: 'TOSHIBA ColorMFP',
+  name: 'Zebra_LP2844',
+  description: 'Zebra LP2844',
  status: 3,
  isDefault: false,
  options: {
    copies: '1',
-    'device-uri': 'dnssd://Austin%204th%20Floor%20Printer%20%40%20C02XK13BJHD4._ipps._tcp.local./?uuid=71687f1e-1147-3274-6674-22de61b110bd',
+    'device-uri': 'usb://Zebra/LP2844?location=14200000',
    finishings: '3',
    'job-cancel-after': '10800',
    'job-hold-until': 'no-hold',
@@ -31,19 +26,18 @@ may be different on each platform.
    'job-sheets': 'none,none',
    'marker-change-time': '0',
    'number-up': '1',
-    'printer-commands': 'ReportLevels,PrintSelfTestPage,com.toshiba.ColourProfiles.update,com.toshiba.EFiling.update,com.toshiba.EFiling.checkPassword',
-    'printer-info': 'Austin 4th Floor Printer @ C02XK13BJHD4',
+    'printer-commands': 'none',
+    'printer-info': 'Zebra LP2844',
    'printer-is-accepting-jobs': 'true',
-    'printer-is-shared': 'false',
-    'printer-is-temporary': 'false',
+    'printer-is-shared': 'true',
    'printer-location': '',
-    'printer-make-and-model': 'TOSHIBA ColorMFP',
+    'printer-make-and-model': 'Zebra EPL2 Label Printer',
    'printer-state': '3',
-    'printer-state-change-time': '1573472937',
-    'printer-state-reasons': 'offline-report,com.toshiba.snmp.failed',
-    'printer-type': '10531038',
-    'printer-uri-supported': 'ipp://localhost/printers/Austin_4th_Floor_Printer___C02XK13BJHD4',
-    system_driverinfo: 'T'
+    'printer-state-change-time': '1484872644',
+    'printer-state-reasons': 'offline-report',
+    'printer-type': '36932',
+    'printer-uri-supported': 'ipp://localhost/printers/Zebra_LP2844',
+    system_driverinfo: 'Z'
  }
 }
 ```
--- a/docs/api/touch-bar-button.md
+++ b/docs/api/touch-bar-button.md
@@ -14,7 +14,6 @@ Process: [Main](../tutorial/application-architecture.md#main-and-renderer-proces
  * `icon` [NativeImage](native-image.md) | String (optional) - Button icon.
  * `iconPosition` String (optional) - Can be `left`, `right` or `overlay`. Defaults to `overlay`.
  * `click` Function (optional) - Function to call when the button is clicked.
-  * `enabled` Boolean (optional) - Whether the button is in an enabled state.  Default is `true`.

 When defining `accessibilityLabel`, ensure you have considered macOS [best practices](https://developer.apple.com/documentation/appkit/nsaccessibilitybutton/1524910-accessibilitylabel?language=objc).

@@ -40,7 +39,3 @@ the button in the touch bar.

 A `NativeImage` representing the button's current icon. Changing this value immediately updates the button
 in the touch bar.
-
-#### `touchBarButton.enabled`
-
-A `Boolean` representing whether the button is in an enabled state.
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -800,6 +800,17 @@ Emitted when `remote.getCurrentWebContents()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.

+#### Event: 'remote-get-guest-web-contents'
+
+Returns:
+
+* `event` IpcMainEvent
+* `guestWebContents` [WebContents](web-contents.md)
+
+Emitted when `<webview>.getWebContents()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 ### Instance Methods

 #### `contents.loadURL(url[, options])`
@@ -1113,6 +1124,17 @@ Sets the maximum and minimum pinch-to-zoom level.
 > contents.setVisualZoomLevelLimits(1, 3)
 > ```

+#### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)` _Deprecated_
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Returns `Promise<void>`
+
+Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
+
+**Deprecated:** This API is no longer supported by Chromium.
+
 #### `contents.undo()`

 Executes the editing command `undo` in web page.
@@ -1381,20 +1403,13 @@ An example of showing devtools in a `<webview>` tag:
 </head>
 <body>
  <webview id="browser" src="https://github.com"></webview>
-  <webview id="devtools" src="about:blank"></webview>
+  <webview id="devtools"></webview>
  <script>
-    const { webContents } = require('electron').remote
-    const emittedOnce = (element, eventName) => new Promise(resolve => {
-      element.addEventListener(eventName, event => resolve(event), { once: true })
-    })
    const browserView = document.getElementById('browser')
    const devtoolsView = document.getElementById('devtools')
-    const browserReady = emittedOnce(browserView, 'dom-ready')
-    const devtoolsReady = emittedOnce(devtoolsView, 'dom-ready')
-    Promise.all([browserReady, devtoolsReady]).then(() => {
-      const browser = webContents.fromId(browserView.getWebContentsId())
-      const devtools = webContents.fromId(devtoolsView.getWebContentsId())
-      browser.setDevToolsWebContents(devtools)
+    browserView.addEventListener('dom-ready', () => {
+      const browser = browserView.getWebContents()
+      browser.setDevToolsWebContents(devtoolsView.getWebContents())
      browser.openDevTools()
    })
  </script>
@@ -1774,7 +1789,7 @@ Only applicable if *offscreen rendering* is enabled.

 #### `contents.id` _Readonly_

-A `Integer` representing the unique ID of this WebContents. Each ID is unique among all `WebContents` instances of the entire Electron application.
+A `Integer` representing the unique ID of this WebContents.

 #### `contents.session` _Readonly_

--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -56,6 +56,15 @@ Sets the maximum and minimum pinch-to-zoom level.
 > webFrame.setVisualZoomLevelLimits(1, 3)
 > ```

+### `webFrame.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)` _Deprecated_
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
+
+**Deprecated:** This API is no longer supported by Chromium.
+
 ### `webFrame.setSpellCheckProvider(language, provider)`

 * `language` String
--- a/docs/api/web-request.md
+++ b/docs/api/web-request.md
@@ -146,7 +146,7 @@ response are visible by the time this listener is fired.
    * `timestamp` Double
    * `statusLine` String
    * `statusCode` Integer
-    * `responseHeaders` Record<string, string> (optional)
+    * `responseHeaders` Record<string, string[]> (optional)
  * `callback` Function
    * `headersReceivedResponse` Object
      * `cancel` Boolean (optional)
@@ -175,7 +175,7 @@ The `callback` has to be called with a `response` object.
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
-    * `responseHeaders` Record<string, string> (optional)
+    * `responseHeaders` Record<string, string[]> (optional)
    * `fromCache` Boolean - Indicates whether the response was fetched from disk
      cache.
    * `statusCode` Integer
@@ -205,7 +205,7 @@ and response headers are available.
    * `ip` String (optional) - The server IP address that the request was
      actually sent to.
    * `fromCache` Boolean
-    * `responseHeaders` Record<string, string> (optional)
+    * `responseHeaders` Record<string, string[]> (optional)

 The `listener` will be called with `listener(details)` when a server initiated
 redirect is about to occur.
@@ -224,7 +224,7 @@ redirect is about to occur.
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
-    * `responseHeaders` Record<string, string> (optional)
+    * `responseHeaders` Record<string, string[]> (optional)
    * `fromCache` Boolean
    * `statusCode` Integer
    * `statusLine` String
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -635,10 +635,29 @@ Returns `Promise<void>`

 Sets the maximum and minimum pinch-to-zoom level.

+### `<webview>.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)` _Deprecated_
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Returns `Promise<void>`
+
+Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
+
+**Deprecated:** This API is no longer supported by Chromium.
+
 ### `<webview>.showDefinitionForSelection()` _macOS_

 Shows pop-up dictionary that searches the selected word on the page.

+### `<webview>.getWebContents()` _Deprecated_
+
+Returns [`WebContents`](web-contents.md) - The web contents associated with
+this `webview`.
+
+It depends on the [`remote`](remote.md) module,
+it is therefore not available when this module is disabled.
+
 ### `<webview>.getWebContentsId()`

 Returns `Number` - The WebContents ID of this `webview`.
--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -96,30 +96,30 @@ $ cd src
 $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
 # this next line is needed only if building with sccache
 $ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
-$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
+$ gn gen out/Debug --args="import(\"//electron/build/args/debug.gn\") $GN_EXTRA_ARGS"
 ```

 Or on Windows (without the optional argument):
 ```sh
 $ cd src
 $ set CHROMIUM_BUILDTOOLS_PATH=%cd%\buildtools
-$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\")"
+$ gn gen out/Debug --args="import(\"//electron/build/args/debug.gn\")"
 ```

-This will generate a build directory `out/Testing` under `src/` with
-the testing build configuration. You can replace `Testing` with another name,
+This will generate a build directory `out/Debug` under `src/` with
+debug build configuration. You can replace `Debug` with another name,
 but it should be a subdirectory of `out`.
 Also you shouldn't have to run `gn gen` again—if you want to change the
-build arguments, you can run `gn args out/Testing` to bring up an editor.
+build arguments, you can run `gn args out/Debug` to bring up an editor.

 To see the list of available build configuration options, run `gn args
-out/Testing --list`.
+out/Debug --list`.

-**For generating Testing build config of
+**For generating Debug (aka "component" or "shared") build config of
 Electron:**

 ```sh
-$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
+$ gn gen out/Debug --args="import(\"//electron/build/args/debug.gn\") $GN_EXTRA_ARGS"
 ```

 **For generating Release (aka "non-component" or "static") build config of
@@ -132,9 +132,9 @@ $ gn gen out/Release --args="import(\"//electron/build/args/release.gn\") $GN_EX
 **To build, run `ninja` with the `electron` target:**
 Nota Bene: This will also take a while and probably heat up your lap.

-For the testing configuration:
+For the debug configuration:
 ```sh
-$ ninja -C out/Testing electron
+$ ninja -C out/Debug electron
 ```

 For the release configuration:
@@ -147,19 +147,19 @@ This will build all of what was previously 'libchromiumcontent' (i.e. the
 so it will take a while.

 To speed up subsequent builds, you can use [sccache][sccache]. Add the GN arg
-`cc_wrapper = "sccache"` by running `gn args out/Testing` to bring up an
+`cc_wrapper = "sccache"` by running `gn args out/Debug` to bring up an
 editor and adding a line to the end of the file.

 [sccache]: https://github.com/mozilla/sccache

-The built executable will be under `./out/Testing`:
+The built executable will be under `./out/Debug`:

 ```sh
-$ ./out/Testing/Electron.app/Contents/MacOS/Electron
+$ ./out/Debug/Electron.app/Contents/MacOS/Electron
 # or, on Windows
-$ ./out/Testing/electron.exe
+$ ./out/Debug/electron.exe
 # or, on Linux
-$ ./out/Testing/electron
+$ ./out/Debug/electron
 ```

 ### Packaging
@@ -181,7 +181,7 @@ set the `target_cpu` and `target_os` GN arguments. For example, to compile an
 x86 target from an x64 host, specify `target_cpu = "x86"` in `gn args`.

 ```sh
-$ gn gen out/Testing-x86 --args='... target_cpu = "x86"'
+$ gn gen out/Debug-x86 --args='... target_cpu = "x86"'
 ```

 Not all combinations of source and target CPU/OS are supported by Chromium.
@@ -226,7 +226,7 @@ generate build headers for the modules to compile against, run the following
 under `src/` directory.

 ```sh
-$ ninja -C out/Testing third_party/electron_node:headers
+$ ninja -C out/Debug third_party/electron_node:headers
 ```

 You can now [run the tests](testing.md#unit-tests).
@@ -235,8 +235,8 @@ If you're debugging something, it can be helpful to pass some extra flags to
 the Electron binary:

 ```sh
-$ npm run test -- \
-  --enable-logging -g 'BrowserWindow module'
+$ ./out/Debug/Electron.app/Contents/MacOS/Electron electron/spec \
+  --ci --enable-logging -g 'BrowserWindow module'
 ```

 ## Sharing the git cache between multiple machines
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -79,7 +79,7 @@ And to cross-compile for `arm` or `ia32` targets, you should pass the
 `target_cpu` parameter to `gn gen`:

 ```sh
-$ gn gen out/Testing --args='import(...) target_cpu="arm"'
+$ gn gen out/Debug --args='import(...) target_cpu="arm"'
 ```

 ## Building
@@ -114,7 +114,7 @@ GN args.
 For example if you installed `clang` under `/usr/local/bin/clang`:

 ```sh
-$ gn gen out/Testing --args='import("//electron/build/args/testing.gn") clang_base_path = "/usr/local/bin"'
+$ gn gen out/Debug --args='import("//electron/build/args/debug.gn") clang_base_path = "/usr/local/bin"'
 ```

 ### Using compilers other than `clang`
--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -11,8 +11,9 @@ Follow the guidelines below for building Electron on Windows.
  components are required.
  * If your Visual Studio is installed in a directory other than the default, you'll need to
  set a few environment variables to point the toolchains to your installation path.
-    * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`, replacing `2019` and `Community` with your installed versions and replacing `DRIVE:` with the drive that Visual Studio is on. Often, this will be `C:`.
-    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`, replacing `DRIVE:` with the drive that Windows Kits is on. Often, this will be `C:`.
+    * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`
+       (replace `2019` and `Community` with your installed versions)
+    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`
 * [Python 2.7.10 or higher](http://www.python.org/download/releases/2.7/)
  * Contrary to the `depot_tools` setup instructions linked below, you will need
  to use your locally installed Python with at least version 2.7.10 (with
@@ -73,7 +74,7 @@ To generate a Visual Studio project, you can pass the `--ide=vs2017` parameter
 to `gn gen`:

 ```powershell
-$ gn gen out/Testing --ide=vs2017
+$ gn gen out/Debug --ide=vs2017
 ```

 ## Troubleshooting
--- a/docs/development/coding-style.md
+++ b/docs/development/coding-style.md
@@ -54,7 +54,7 @@ formatted correctly.
  the `module-name` form. This rule only applies to `.js` files.
 * Use newer ES6/ES2015 syntax where appropriate
  * [`const`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const)
-    for requires and other constants.  If the value is a primitive, use uppercase naming (eg `const NUMBER_OF_RETRIES = 5`).
+    for requires and other constants
  * [`let`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let)
    for defining variables
  * [Arrow functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions)
--- a/docs/development/debug-instructions-windows.md
+++ b/docs/development/debug-instructions-windows.md
@@ -36,7 +36,7 @@ To start a debugging session, open up PowerShell/CMD and execute your debug
 build of Electron, using the application to open as a parameter.

 ```powershell
-$ ./out/Testing/electron.exe ~/my-electron-app/
+$ ./out/Debug/electron.exe ~/my-electron-app/
 ```

 ### Setting Breakpoints
--- a/docs/development/debugging-instructions-macos-xcode.md
+++ b/docs/development/debugging-instructions-macos-xcode.md
@@ -3,7 +3,7 @@
 ### Generate xcode project for debugging sources (cannot build code from xcode)
 Run `gn gen` with the --ide=xcode argument.
 ```sh
-$ gn gen out/Testing --ide=xcode
+$ gn gen out/Debug --ide=xcode
 ```
 This will generate the electron.ninja.xcworkspace. You will have to open this workspace
 to set breakpoints and inspect.
--- a/docs/development/debugging-instructions-macos.md
+++ b/docs/development/debugging-instructions-macos.md
@@ -25,13 +25,13 @@ you prefer a graphical interface.

 ## Attaching to and Debugging Electron

-To start a debugging session, open up Terminal and start `lldb`, passing a non-release
+To start a debugging session, open up Terminal and start `lldb`, passing a debug
 build of Electron as a parameter.

 ```sh
-$ lldb ./out/Testing/Electron.app
-(lldb) target create "./out/Testing/Electron.app"
-Current executable set to './out/Testing/Electron.app' (x86_64).
+$ lldb ./out/Debug/Electron.app
+(lldb) target create "./out/Debug/Electron.app"
+Current executable set to './out/Debug/Electron.app' (x86_64).
 ```

 ### Setting Breakpoints
@@ -62,7 +62,7 @@ The app will immediately be paused, since Electron sets the app's name on launch

 ```sh
 (lldb) run
-Process 25244 launched: '/Users/fr/Code/electron/out/Testing/Electron.app/Contents/MacOS/Electron' (x86_64)
+Process 25244 launched: '/Users/fr/Code/electron/out/Debug/Electron.app/Contents/MacOS/Electron' (x86_64)
 Process 25244 stopped
 * thread #1: tid = 0x839a4c, 0x0000000100162db4 Electron Framework`atom::Browser::SetName(this=0x0000000108b14f20, name="Electron") + 20 at browser.cc:118, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1
    frame #0: 0x0000000100162db4 Electron Framework`atom::Browser::SetName(this=0x0000000108b14f20, name="Electron") + 20 at browser.cc:118
--- a/docs/development/patches.md
+++ b/docs/development/patches.md
@@ -41,7 +41,7 @@ To help manage these patch sets, we provide two tools: `git-import-patches` and
 ### Usage

 #### Adding a new patch
-```bash
+```bash session
 $ cd src/third_party/electron_node
 $ vim some/code/file.cc
 $ git commit
@@ -53,7 +53,7 @@ $ ../../electron/script/git-export-patches -o ../../electron/patches/node
 Re-exporting patches will sometimes cause shasums in unrelated patches to change. This is generally harmless and can be ignored (but go ahead and add those changes to your PR, it'll stop them from showing up for other people).

 #### Editing an existing patch
-```bash
+```bash session
 $ cd src/v8
 $ vim some/code/file.cc
 $ git log
@@ -64,7 +64,7 @@ $ ../electron/script/git-export-patches -o ../electron/patches/v8
 ```

 #### Removing a patch
-```bash
+```bash session
 $ vim src/electron/patches/node/.patches
 # Delete the line with the name of the patch you want to remove
 $ cd src/third_party/electron_node
@@ -78,7 +78,7 @@ Note that `git-import-patches` will mark the commit that was `HEAD` when it was
 #### Resolving conflicts
 When updating an upstream dependency, patches may fail to apply cleanly. Often, the conflict can be resolved automatically by git with a 3-way merge. You can instruct `git-import-patches` to use the 3-way merge algorithm by passing the `-3` argument:

-```bash
+```bash session
 $ cd src/third_party/electron_node
 # If the patch application failed midway through, you can reset it with:
 $ git am --abort
--- a/docs/development/source-code-directory-structure.md
+++ b/docs/development/source-code-directory-structure.md
@@ -42,6 +42,8 @@ Electron
 |   |   └── api/ - Javascript API implementation.
 |   └── renderer/ - Javascript renderer process initialization code.
 |       └── api/ - Javascript API implementation.
+├── native_mate/ - A fork of Chromium's gin library that makes it easier to marshal
+|                  types between C++ and JavaScript.
 ├── spec/ - Automatic tests.
 └── BUILD.gn - Building rules of Electron.
 ```
--- a/docs/fiddles/communication/two-processes/synchronous-messages/index.html
+++ b/docs/fiddles/communication/two-processes/synchronous-messages/index.html
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-  </head>
-  <body>
-    <div>
-      <div>
-        <h1>Synchronous messages</h1>
-        <i>Supports: Win, macOS, Linux <span>|</span> Process: Both</i>
-        <div>
-          <div>
-            <button id="sync-msg">Ping</button>
-            <span id="sync-reply"></span>
-          </div>
-          <p>You can use the <code>ipc</code> module to send synchronous messages between processes as well, but note that the synchronous nature of this method means that it <b>will block</b> other operations while completing its task.</p>
-          
-          <p>This example sends a synchronous message, "ping", from this process (renderer) to the main process. The main process then replies with "pong".</p>
-        </div>
-      </div>
-    </div>
-    <script>
-      // You can also require other files to run in this process
-      require('./renderer.js')
-    </script>
-  </body>
-</html> 
--- a/docs/fiddles/communication/two-processes/synchronous-messages/main.js
+++ b/docs/fiddles/communication/two-processes/synchronous-messages/main.js
@@ -1,29 +0,0 @@
-const { app, BrowserWindow, ipcMain } = require('electron')
-
-let mainWindow = null
-
-function createWindow () {
-  const windowOptions = {
-    width: 600,
-    height: 400,
-    title: 'Synchronous Messages',
-    webPreferences: {
-      nodeIntegration: true
-    }
-  }
-
-  mainWindow = new BrowserWindow(windowOptions)
-  mainWindow.loadFile('index.html')
-
-  mainWindow.on('closed', () => {
-    mainWindow = null
-  })
-}
-
-app.on('ready', () => {
-  createWindow()
-})
-
-ipcMain.on('synchronous-message', (event, arg) => {
-    event.returnValue = 'pong'
-})
--- a/docs/fiddles/communication/two-processes/synchronous-messages/renderer.js
+++ b/docs/fiddles/communication/two-processes/synchronous-messages/renderer.js
@@ -1,9 +0,0 @@
-const { ipcRenderer } = require('electron')
-
-const syncMsgBtn = document.getElementById('sync-msg')
-
-syncMsgBtn.addEventListener('click', () => {
-    const reply = ipcRenderer.sendSync('synchronous-message', 'ping')
-    const message = `Synchronous message reply: ${reply}`
-    document.getElementById('sync-reply').innerHTML = message
-})
--- a/docs/fiddles/menus/customize-menus/main.js
+++ b/docs/fiddles/menus/customize-menus/main.js
@@ -1,360 +1,360 @@
-// Modules to control application life and create native browser window
-const {
-  BrowserWindow,
-  Menu,
-  MenuItem,
-  ipcMain,
-  app,
-  shell,
-  dialog
-} = require('electron')
-
-const menu = new Menu()
-menu.append(new MenuItem({ label: 'Hello' }))
-menu.append(new MenuItem({ type: 'separator' }))
-menu.append(
-  new MenuItem({ label: 'Electron', type: 'checkbox', checked: true })
-)
-
-const template = [
-  {
-    label: 'Edit',
-    submenu: [
-      {
-        label: 'Undo',
-        accelerator: 'CmdOrCtrl+Z',
-        role: 'undo'
-      },
-      {
-        label: 'Redo',
-        accelerator: 'Shift+CmdOrCtrl+Z',
-        role: 'redo'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Cut',
-        accelerator: 'CmdOrCtrl+X',
-        role: 'cut'
-      },
-      {
-        label: 'Copy',
-        accelerator: 'CmdOrCtrl+C',
-        role: 'copy'
-      },
-      {
-        label: 'Paste',
-        accelerator: 'CmdOrCtrl+V',
-        role: 'paste'
-      },
-      {
-        label: 'Select All',
-        accelerator: 'CmdOrCtrl+A',
-        role: 'selectall'
-      }
-    ]
-  },
-  {
-    label: 'View',
-    submenu: [
-      {
-        label: 'Reload',
-        accelerator: 'CmdOrCtrl+R',
-        click: (item, focusedWindow) => {
-          if (focusedWindow) {
-            // on reload, start fresh and close any old
-            // open secondary windows
-            if (focusedWindow.id === 1) {
-              BrowserWindow.getAllWindows().forEach(win => {
-                if (win.id > 1) win.close()
-              })
-            }
-            focusedWindow.reload()
-          }
-        }
-      },
-      {
-        label: 'Toggle Full Screen',
-        accelerator: (() => {
-          if (process.platform === 'darwin') {
-            return 'Ctrl+Command+F'
-          } else {
-            return 'F11'
-          }
-        })(),
-        click: (item, focusedWindow) => {
-          if (focusedWindow) {
-            focusedWindow.setFullScreen(!focusedWindow.isFullScreen())
-          }
-        }
-      },
-      {
-        label: 'Toggle Developer Tools',
-        accelerator: (() => {
-          if (process.platform === 'darwin') {
-            return 'Alt+Command+I'
-          } else {
-            return 'Ctrl+Shift+I'
-          }
-        })(),
-        click: (item, focusedWindow) => {
-          if (focusedWindow) {
-            focusedWindow.toggleDevTools()
-          }
-        }
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'App Menu Demo',
-        click: function (item, focusedWindow) {
-          if (focusedWindow) {
-            const options = {
-              type: 'info',
-              title: 'Application Menu Demo',
-              buttons: ['Ok'],
-              message:
-                'This demo is for the Menu section, showing how to create a clickable menu item in the application menu.'
-            }
-            dialog.showMessageBox(focusedWindow, options, function () {})
-          }
-        }
-      }
-    ]
-  },
-  {
-    label: 'Window',
-    role: 'window',
-    submenu: [
-      {
-        label: 'Minimize',
-        accelerator: 'CmdOrCtrl+M',
-        role: 'minimize'
-      },
-      {
-        label: 'Close',
-        accelerator: 'CmdOrCtrl+W',
-        role: 'close'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Reopen Window',
-        accelerator: 'CmdOrCtrl+Shift+T',
-        enabled: false,
-        key: 'reopenMenuItem',
-        click: () => {
-          app.emit('activate')
-        }
-      }
-    ]
-  },
-  {
-    label: 'Help',
-    role: 'help',
-    submenu: [
-      {
-        label: 'Learn More',
-        click: () => {
-          shell.openExternal('http://electron.atom.io')
-        }
-      }
-    ]
-  }
-]
-
-function addUpdateMenuItems (items, position) {
-  if (process.mas) return
-
-  const version = app.getVersion()
-  const updateItems = [
-    {
-      label: `Version ${version}`,
-      enabled: false
-    },
-    {
-      label: 'Checking for Update',
-      enabled: false,
-      key: 'checkingForUpdate'
-    },
-    {
-      label: 'Check for Update',
-      visible: false,
-      key: 'checkForUpdate',
-      click: () => {
-        require('electron').autoUpdater.checkForUpdates()
-      }
-    },
-    {
-      label: 'Restart and Install Update',
-      enabled: true,
-      visible: false,
-      key: 'restartToUpdate',
-      click: () => {
-        require('electron').autoUpdater.quitAndInstall()
-      }
-    }
-  ]
-
-  items.splice.apply(items, [position, 0].concat(updateItems))
-}
-
-function findReopenMenuItem () {
-  const menu = Menu.getApplicationMenu()
-  if (!menu) return
-
-  let reopenMenuItem
-  menu.items.forEach(item => {
-    if (item.submenu) {
-      item.submenu.items.forEach(item => {
-        if (item.key === 'reopenMenuItem') {
-          reopenMenuItem = item
-        }
-      })
-    }
-  })
-  return reopenMenuItem
-}
-
-if (process.platform === 'darwin') {
-  const name = app.getName()
-  template.unshift({
-    label: name,
-    submenu: [
-      {
-        label: `About ${name}`,
-        role: 'about'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Services',
-        role: 'services',
-        submenu: []
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: `Hide ${name}`,
-        accelerator: 'Command+H',
-        role: 'hide'
-      },
-      {
-        label: 'Hide Others',
-        accelerator: 'Command+Alt+H',
-        role: 'hideothers'
-      },
-      {
-        label: 'Show All',
-        role: 'unhide'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Quit',
-        accelerator: 'Command+Q',
-        click: () => {
-          app.quit()
-        }
-      }
-    ]
-  })
-
-  // Window menu.
-  template[3].submenu.push(
-    {
-      type: 'separator'
-    },
-    {
-      label: 'Bring All to Front',
-      role: 'front'
-    }
-  )
-
-  addUpdateMenuItems(template[0].submenu, 1)
-}
-
-if (process.platform === 'win32') {
-  const helpMenu = template[template.length - 1].submenu
-  addUpdateMenuItems(helpMenu, 0)
-}
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', () => {
-  createWindow()
-  const menu = Menu.buildFromTemplate(template)
-  Menu.setApplicationMenu(menu)
-})
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  const reopenMenuItem = findReopenMenuItem()
-  if (reopenMenuItem) reopenMenuItem.enabled = true
-
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-app.on('browser-window-created', (event, win) => {
-  const reopenMenuItem = findReopenMenuItem()
-  if (reopenMenuItem) reopenMenuItem.enabled = false
-
-  win.webContents.on('context-menu', (e, params) => {
-    menu.popup(win, params.x, params.y)
-  })
-})
-
-ipcMain.on('show-context-menu', event => {
-  const win = BrowserWindow.fromWebContents(event.sender)
-  menu.popup(win)
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
+// Modules to control application life and create native browser window
+const {
+  BrowserWindow,
+  Menu,
+  MenuItem,
+  ipcMain,
+  app,
+  shell,
+  dialog
+} = require('electron')
+
+const menu = new Menu()
+menu.append(new MenuItem({ label: 'Hello' }))
+menu.append(new MenuItem({ type: 'separator' }))
+menu.append(
+  new MenuItem({ label: 'Electron', type: 'checkbox', checked: true })
+)
+
+const template = [
+  {
+    label: 'Edit',
+    submenu: [
+      {
+        label: 'Undo',
+        accelerator: 'CmdOrCtrl+Z',
+        role: 'undo'
+      },
+      {
+        label: 'Redo',
+        accelerator: 'Shift+CmdOrCtrl+Z',
+        role: 'redo'
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Cut',
+        accelerator: 'CmdOrCtrl+X',
+        role: 'cut'
+      },
+      {
+        label: 'Copy',
+        accelerator: 'CmdOrCtrl+C',
+        role: 'copy'
+      },
+      {
+        label: 'Paste',
+        accelerator: 'CmdOrCtrl+V',
+        role: 'paste'
+      },
+      {
+        label: 'Select All',
+        accelerator: 'CmdOrCtrl+A',
+        role: 'selectall'
+      }
+    ]
+  },
+  {
+    label: 'View',
+    submenu: [
+      {
+        label: 'Reload',
+        accelerator: 'CmdOrCtrl+R',
+        click: (item, focusedWindow) => {
+          if (focusedWindow) {
+            // on reload, start fresh and close any old
+            // open secondary windows
+            if (focusedWindow.id === 1) {
+              BrowserWindow.getAllWindows().forEach(win => {
+                if (win.id > 1) win.close()
+              })
+            }
+            focusedWindow.reload()
+          }
+        }
+      },
+      {
+        label: 'Toggle Full Screen',
+        accelerator: (() => {
+          if (process.platform === 'darwin') {
+            return 'Ctrl+Command+F'
+          } else {
+            return 'F11'
+          }
+        })(),
+        click: (item, focusedWindow) => {
+          if (focusedWindow) {
+            focusedWindow.setFullScreen(!focusedWindow.isFullScreen())
+          }
+        }
+      },
+      {
+        label: 'Toggle Developer Tools',
+        accelerator: (() => {
+          if (process.platform === 'darwin') {
+            return 'Alt+Command+I'
+          } else {
+            return 'Ctrl+Shift+I'
+          }
+        })(),
+        click: (item, focusedWindow) => {
+          if (focusedWindow) {
+            focusedWindow.toggleDevTools()
+          }
+        }
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'App Menu Demo',
+        click: function (item, focusedWindow) {
+          if (focusedWindow) {
+            const options = {
+              type: 'info',
+              title: 'Application Menu Demo',
+              buttons: ['Ok'],
+              message:
+                'This demo is for the Menu section, showing how to create a clickable menu item in the application menu.'
+            }
+            dialog.showMessageBox(focusedWindow, options, function () {})
+          }
+        }
+      }
+    ]
+  },
+  {
+    label: 'Window',
+    role: 'window',
+    submenu: [
+      {
+        label: 'Minimize',
+        accelerator: 'CmdOrCtrl+M',
+        role: 'minimize'
+      },
+      {
+        label: 'Close',
+        accelerator: 'CmdOrCtrl+W',
+        role: 'close'
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Reopen Window',
+        accelerator: 'CmdOrCtrl+Shift+T',
+        enabled: false,
+        key: 'reopenMenuItem',
+        click: () => {
+          app.emit('activate')
+        }
+      }
+    ]
+  },
+  {
+    label: 'Help',
+    role: 'help',
+    submenu: [
+      {
+        label: 'Learn More',
+        click: () => {
+          shell.openExternal('http://electron.atom.io')
+        }
+      }
+    ]
+  }
+]
+
+function addUpdateMenuItems (items, position) {
+  if (process.mas) return
+
+  const version = app.getVersion()
+  const updateItems = [
+    {
+      label: `Version ${version}`,
+      enabled: false
+    },
+    {
+      label: 'Checking for Update',
+      enabled: false,
+      key: 'checkingForUpdate'
+    },
+    {
+      label: 'Check for Update',
+      visible: false,
+      key: 'checkForUpdate',
+      click: () => {
+        require('electron').autoUpdater.checkForUpdates()
+      }
+    },
+    {
+      label: 'Restart and Install Update',
+      enabled: true,
+      visible: false,
+      key: 'restartToUpdate',
+      click: () => {
+        require('electron').autoUpdater.quitAndInstall()
+      }
+    }
+  ]
+
+  items.splice.apply(items, [position, 0].concat(updateItems))
+}
+
+function findReopenMenuItem () {
+  const menu = Menu.getApplicationMenu()
+  if (!menu) return
+
+  let reopenMenuItem
+  menu.items.forEach(item => {
+    if (item.submenu) {
+      item.submenu.items.forEach(item => {
+        if (item.key === 'reopenMenuItem') {
+          reopenMenuItem = item
+        }
+      })
+    }
+  })
+  return reopenMenuItem
+}
+
+if (process.platform === 'darwin') {
+  const name = app.getName()
+  template.unshift({
+    label: name,
+    submenu: [
+      {
+        label: `About ${name}`,
+        role: 'about'
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Services',
+        role: 'services',
+        submenu: []
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: `Hide ${name}`,
+        accelerator: 'Command+H',
+        role: 'hide'
+      },
+      {
+        label: 'Hide Others',
+        accelerator: 'Command+Alt+H',
+        role: 'hideothers'
+      },
+      {
+        label: 'Show All',
+        role: 'unhide'
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Quit',
+        accelerator: 'Command+Q',
+        click: () => {
+          app.quit()
+        }
+      }
+    ]
+  })
+
+  // Window menu.
+  template[3].submenu.push(
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Bring All to Front',
+      role: 'front'
+    }
+  )
+
+  addUpdateMenuItems(template[0].submenu, 1)
+}
+
+if (process.platform === 'win32') {
+  const helpMenu = template[template.length - 1].submenu
+  addUpdateMenuItems(helpMenu, 0)
+}
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let mainWindow
+
+function createWindow () {
+  // Create the browser window.
+  mainWindow = new BrowserWindow({
+    width: 800,
+    height: 600,
+    webPreferences: {
+      nodeIntegration: true
+    }
+  })
+
+  // and load the index.html of the app.
+  mainWindow.loadFile('index.html')
+
+  // Open the DevTools.
+  // mainWindow.webContents.openDevTools()
+
+  // Emitted when the window is closed.
+  mainWindow.on('closed', function () {
+    // Dereference the window object, usually you would store windows
+    // in an array if your app supports multi windows, this is the time
+    // when you should delete the corresponding element.
+    mainWindow = null
+  })
+}
+
+// This method will be called when Electron has finished
+// initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
+app.on('ready', () => {
+  createWindow()
+  const menu = Menu.buildFromTemplate(template)
+  Menu.setApplicationMenu(menu)
+})
+
+// Quit when all windows are closed.
+app.on('window-all-closed', function () {
+  // On OS X it is common for applications and their menu bar
+  // to stay active until the user quits explicitly with Cmd + Q
+  const reopenMenuItem = findReopenMenuItem()
+  if (reopenMenuItem) reopenMenuItem.enabled = true
+
+  if (process.platform !== 'darwin') {
+    app.quit()
+  }
+})
+
+app.on('activate', function () {
+  // On OS X it's common to re-create a window in the app when the
+  // dock icon is clicked and there are no other windows open.
+  if (mainWindow === null) {
+    createWindow()
+  }
+})
+
+app.on('browser-window-created', (event, win) => {
+  const reopenMenuItem = findReopenMenuItem()
+  if (reopenMenuItem) reopenMenuItem.enabled = false
+
+  win.webContents.on('context-menu', (e, params) => {
+    menu.popup(win, params.x, params.y)
+  })
+})
+
+ipcMain.on('show-context-menu', event => {
+  const win = BrowserWindow.fromWebContents(event.sender)
+  menu.popup(win)
+})
+
+// In this file you can include the rest of your app's specific main process
+// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/menus/customize-menus/renderer.js
+++ b/docs/fiddles/menus/customize-menus/renderer.js
@@ -1,8 +1,8 @@
-const { ipcRenderer } = require('electron')
-
-// Tell main process to show the menu when demo button is clicked
-const contextMenuBtn = document.getElementById('context-menu')
-
-contextMenuBtn.addEventListener('click', () => {
-  ipcRenderer.send('show-context-menu')
-})
+const { ipcRenderer } = require('electron')
+
+// Tell main process to show the menu when demo button is clicked
+const contextMenuBtn = document.getElementById('context-menu')
+
+contextMenuBtn.addEventListener('click', () => {
+  ipcRenderer.send('show-context-menu')
+})
--- a/docs/fiddles/native-ui/dialogs/error-dialog/index.html
+++ b/docs/fiddles/native-ui/dialogs/error-dialog/index.html
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Error Dialog</title>
-  </head>
-
-  <body>
-    <div>
-      <h1>Use system dialogs</h1>
-
-      <h3>
-        The <code>dialog</code> module in Electron allows you to use native
-        system dialogs for opening files or directories, saving a file or
-        displaying informational messages.
-      </h3>
-
-      <p>
-        This is a main process module because this process is more efficient
-        with native utilities and it allows the call to happen without
-        interrupting the visible elements in your page's renderer process.
-      </p>
-
-      <p>
-        Open the
-        <a href="http://electron.atom.io/docs/api/dialog/">
-          full API documentation (opens in new window)
-          </a>
-        in your browser.
-      </p>
-    </div>
-
-    <div>
-      <div>
-        <h2>Error Dialog</h2>
-        <div>
-          <div>
-            <button id="error-dialog">View Demo</button>
-          </div>
-          <p>
-            In this demo, the <code>ipc</code> module is used to send a message
-            from the renderer process instructing the main process to launch the
-            error dialog.
-          </p>
-
-          <p>
-            You can use an error dialog before the app's
-            <code>ready</code> event, which is useful for showing errors upon
-            startup.
-          </p>
-          <h5>Renderer Process</h5>
-          <pre>
-          <code>
-const {ipcRenderer} = require('electron')
-
-const errorBtn = document.getElementById('error-dialog')
-
-errorBtn.addEventListener('click', (event) => {
-  ipcRenderer.send('open-error-dialog')
-})
-          </code></pre>
-          <h5>Main Process</h5>
-          <pre>
-          <code>
-const {ipcMain, dialog} = require('electron')
-
-ipcMain.on('open-error-dialog', (event) => {
-  dialog.showErrorBox('An Error Message', 'Demonstrating an error message.')
-})
-          </code>
-        </pre>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/dialogs/error-dialog/main.js
+++ b/docs/fiddles/native-ui/dialogs/error-dialog/main.js
@@ -1,95 +0,0 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog } = require('electron')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-ipcMain.on('open-error-dialog', event => {
-  dialog.showErrorBox('An Error Message', 'Demonstrating an error message.')
-})
-
-ipcMain.on('open-information-dialog', event => {
-  const options = {
-    type: 'info',
-    title: 'Information',
-    message: "This is an information dialog. Isn't it nice?",
-    buttons: ['Yes', 'No']
-  }
-  dialog.showMessageBox(options, index => {
-    event.sender.send('information-dialog-selection', index)
-  })
-})
-
-ipcMain.on('open-file-dialog', event => {
-  dialog.showOpenDialog(
-    {
-      properties: ['openFile', 'openDirectory']
-    },
-    files => {
-      if (files) {
-        event.sender.send('selected-directory', files)
-      }
-    }
-  )
-})
-
-ipcMain.on('save-dialog', event => {
-  const options = {
-    title: 'Save an Image',
-    filters: [{ name: 'Images', extensions: ['jpg', 'png', 'gif'] }]
-  }
-  dialog.showSaveDialog(options, filename => {
-    event.sender.send('saved-file', filename)
-  })
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/native-ui/dialogs/error-dialog/renderer.js
+++ b/docs/fiddles/native-ui/dialogs/error-dialog/renderer.js
@@ -1,18 +0,0 @@
-const { ipcRenderer, shell } = require('electron')
-
-const links = document.querySelectorAll('a[href]')
-const errorBtn = document.getElementById('error-dialog')
-
-errorBtn.addEventListener('click', event => {
-  ipcRenderer.send('open-error-dialog')
-})
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
--- a/docs/fiddles/native-ui/dialogs/information-dialog/index.html
+++ b/docs/fiddles/native-ui/dialogs/information-dialog/index.html
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Information Dialog</title>
-  </head>
-
-  <body>
-    <div class="section-wrapper">
-      <h1>Use system dialogs</h1>
-
-      <h3>
-        The <code>dialog</code> module in Electron allows you to use native
-        system dialogs for opening files or directories, saving a file or
-        displaying informational messages.
-      </h3>
-
-      <p>
-        This is a main process module because this process is more efficient
-        with native utilities and it allows the call to happen without
-        interrupting the visible elements in your page's renderer process.
-      </p>
-
-      <p>
-        Open the
-        <a href="http://electron.atom.io/docs/api/dialog/">
-          full API documentation (opens in new window)
-        </a>
-        in your browser.
-      </p>
-    </div>
-
-    <div>
-      <div>
-        <h2>Information Dialog</h2>
-        <div>
-          <div>
-            <button id="information-dialog">
-              View Demo
-            </button>
-            <span id="info-selection"></span>
-          </div>
-          <p>
-            In this demo, the <code>ipc</code> module is used to send a message
-            from the renderer process instructing the main process to launch the
-            information dialog. Options may be provided for responses which can
-            then be relayed back to the renderer process.
-          </p>
-
-          <p>
-            Note: The <code>title</code> property is not displayed in macOS.
-          </p>
-
-          <p>
-            An information dialog can contain an icon, your choice of buttons,
-            title and message.
-          </p>
-          <h5>Renderer Process</h5>
-          <pre>
-            <code>
-const {ipcRenderer} = require('electron')
-
-const informationBtn = document.getElementById('information-dialog')
-
-informationBtn.addEventListener('click', (event) => {
-  ipcRenderer.send('open-information-dialog')
-})
-
-ipcRenderer.on('information-dialog-selection', (event, index) => {
-  let message = 'You selected '
-  if (index === 0) message += 'yes.'
-  else message += 'no.'
-  document.getElementById('info-selection').innerHTML = message
-})
-            </code>
-          </pre>
-          <h5>Main Process</h5>
-          <pre>
-            <code>
-const {ipcMain, dialog} = require('electron')
-
-ipcMain.on('open-information-dialog', (event) => {
-  const options = {
-    type: 'info',
-    title: 'Information',
-    message: "This is an information dialog. Isn't it nice?",
-    buttons: ['Yes', 'No']
-  }
-  dialog.showMessageBox(options, (index) => {
-    event.sender.send('information-dialog-selection', index)
-  })
-})
-            </code>
-          </pre>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/dialogs/information-dialog/main.js
+++ b/docs/fiddles/native-ui/dialogs/information-dialog/main.js
@@ -1,70 +0,0 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog } = require('electron')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-
-ipcMain.on('open-information-dialog', event => {
-  const options = {
-    type: 'info',
-    title: 'Information',
-    message: "This is an information dialog. Isn't it nice?",
-    buttons: ['Yes', 'No']
-  }
-  dialog.showMessageBox(options, index => {
-    event.sender.send('information-dialog-selection', index)
-  })
-})
-
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/native-ui/dialogs/information-dialog/renderer.js
+++ b/docs/fiddles/native-ui/dialogs/information-dialog/renderer.js
@@ -1,25 +0,0 @@
-const { ipcRenderer, shell } = require('electron')
-
-const informationBtn = document.getElementById('information-dialog')
-const links = document.querySelectorAll('a[href]')
-
-informationBtn.addEventListener('click', event => {
-  ipcRenderer.send('open-information-dialog')
-})
-
-ipcRenderer.on('information-dialog-selection', (event, index) => {
-  let message = 'You selected '
-  if (index === 0) message += 'yes.'
-  else message += 'no.'
-  document.getElementById('info-selection').innerHTML = message
-})
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
--- a/docs/fiddles/native-ui/dialogs/open-file-or-directory/index.html
+++ b/docs/fiddles/native-ui/dialogs/open-file-or-directory/index.html
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Open File or Directory</title>
-  </head>
-
-  <body>
-    <div class="section-wrapper">
-      <h1>Use system dialogs</h1>
-
-      <h3>
-        The <code>dialog</code> module in Electron allows you to use native
-        system dialogs for opening files or directories, saving a file or
-        displaying informational messages.
-      </h3>
-
-      <p>
-        This is a main process module because this process is more efficient
-        with native utilities and it allows the call to happen without
-        interrupting the visible elements in your page's renderer process.
-      </p>
-
-      <p>
-        Open the
-        <a href="http://electron.atom.io/docs/api/dialog/">
-          full API documentation (opens in new window)
-        </a>
-        in your browser.
-      </p>
-    </div>
-
-    <div>
-      <div>
-        <h2>Open a File or Directory</h2>
-        <div>
-          <div>
-            <button id="select-directory">View Demo</button>
-            <span id="selected-file"></span>
-          </div>
-          <p>
-            In this demo, the <code>ipc</code> module is used to send a message
-            from the renderer process instructing the main process to launch the
-            open file (or directory) dialog. If a file is selected, the main
-            process can send that information back to the renderer process.
-          </p>
-          <h5>Renderer Process</h5>
-          <pre>
-          <code>
-const {ipcRenderer} = require('electron')
-
-const selectDirBtn = document.getElementById('select-directory')
-
-selectDirBtn.addEventListener('click', (event) => {
-  ipcRenderer.send('open-file-dialog')
-})
-
-ipcRenderer.on('selected-directory', (event, path) => {
-  document.getElementById('selected-file').innerHTML = `You selected: ${path}`
-})
-          </code>
-        </pre>
-          <h5>Main Process</h5>
-          <pre>
-          <code>
-const {ipcMain, dialog} = require('electron')
-
-ipcMain.on('open-file-dialog', (event) => {
-  dialog.showOpenDialog({
-    properties: ['openFile', 'openDirectory']
-  }, (files) => {
-    if (files) {
-      event.sender.send('selected-directory', files)
-    }
-  })
-})
-          </code>
-        </pre>
-
-          <div>
-            <h2>ProTip</h2>
-            <strong>The sheet-style dialog on macOS.</strong>
-            <p>
-              On macOS you can choose between a "sheet" dialog or a default
-              dialog. The sheet version descends from the top of the window. To
-              use sheet version, pass the <code>window</code> as the first
-              argument in the dialog method.
-            </p>
-            <pre><code class="language-js">const ipc = require('electron').ipcMain
-const dialog = require('electron').dialog
-const BrowserWindow = require('electron').BrowserWindow
-
-
-ipc.on('open-file-dialog-sheet', function (event) {
-  const window = BrowserWindow.fromWebContents(event.sender)
-  const files = dialog.showOpenDialog(window, { properties: [ 'openFile' ]})
-})</code></pre>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/dialogs/open-file-or-directory/main.js
+++ b/docs/fiddles/native-ui/dialogs/open-file-or-directory/main.js
@@ -1,70 +0,0 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog } = require('electron')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-
-ipcMain.on('open-file-dialog', event => {
-  dialog.showOpenDialog(
-    {
-      properties: ['openFile', 'openDirectory']
-    },
-    files => {
-      if (files) {
-        event.sender.send('selected-directory', files)
-      }
-    }
-  )
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/native-ui/dialogs/open-file-or-directory/renderer.js
+++ b/docs/fiddles/native-ui/dialogs/open-file-or-directory/renderer.js
@@ -1,22 +0,0 @@
-const { ipcRenderer, shell } = require('electron')
-
-const selectDirBtn = document.getElementById('select-directory')
-const links = document.querySelectorAll('a[href]')
-
-selectDirBtn.addEventListener('click', event => {
-  ipcRenderer.send('open-file-dialog')
-})
-
-ipcRenderer.on('selected-directory', (event, path) => {
-  document.getElementById('selected-file').innerHTML = `You selected: ${path}`
-})
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
--- a/docs/fiddles/native-ui/dialogs/save-dialog/index.html
+++ b/docs/fiddles/native-ui/dialogs/save-dialog/index.html
@@ -1,91 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Save Dialog</title>
-  </head>
-
-  <body>
-    <div>
-      <h1>Use system dialogs</h1>
-
-      <h3>
-        The <code>dialog</code> module in Electron allows you to use native
-        system dialogs for opening files or directories, saving a file or
-        displaying informational messages.
-      </h3>
-
-      <p>
-        This is a main process module because this process is more efficient
-        with native utilities and it allows the call to happen without
-        interrupting the visible elements in your page's renderer process.
-      </p>
-
-      <p>
-        Open the
-        <a href="http://electron.atom.io/docs/api/dialog/">
-          full API documentation (opens in new window)
-        </a>
-        in your browser.
-      </p>
-    </div>
-
-    <div>
-      <div>
-        <h2>Save Dialog</h2>
-        <div>
-          <div>
-            <button button id="save-dialog">View Demo</button>
-            <span id="file-saved"></span>
-          </div>
-          <p>
-            In this demo, the <code>ipc</code> module is used to send a message
-            from the renderer process instructing the main process to launch the
-            save dialog. It returns the path selected by the user which can be
-            relayed back to the renderer process.
-          </p>
-          <h5>Renderer Process</h5>
-          <pre>
-            <code>
-const {ipcRenderer} = require('electron')
-
-const saveBtn = document.getElementById('save-dialog')
-
-saveBtn.addEventListener('click', (event) => {
-  ipcRenderer.send('save-dialog')
-})
-
-ipcRenderer.on('saved-file', (event, path) => {
-  if (!path) path = 'No path'
-  document.getElementById('file-saved').innerHTML = `Path selected: ${path}`
-})
-            </code>
-          </pre>
-          <h5>Main Process</h5>
-          <pre>
-            <code>
-const {ipcMain, dialog} = require('electron')
-
-ipcMain.on('save-dialog', (event) => {
-  const options = {
-    title: 'Save an Image',
-    filters: [
-      { name: 'Images', extensions: ['jpg', 'png', 'gif'] }
-    ]
-  }
-  dialog.showSaveDialog(options, (filename) => {
-    event.sender.send('saved-file', filename)
-  })
-})
-            </code>
-          </pre>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/dialogs/save-dialog/main.js
+++ b/docs/fiddles/native-ui/dialogs/save-dialog/main.js
@@ -1,66 +0,0 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog } = require('electron')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-ipcMain.on('save-dialog', event => {
-  const options = {
-    title: 'Save an Image',
-    filters: [{ name: 'Images', extensions: ['jpg', 'png', 'gif'] }]
-  }
-  dialog.showSaveDialog(options, filename => {
-    event.sender.send('saved-file', filename)
-  })
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/native-ui/dialogs/save-dialog/renderer.js
+++ b/docs/fiddles/native-ui/dialogs/save-dialog/renderer.js
@@ -1,23 +0,0 @@
-const { ipcRenderer, shell } = require('electron')
-
-const saveBtn = document.getElementById('save-dialog')
-const links = document.querySelectorAll('a[href]')
-
-saveBtn.addEventListener('click', event => {
-  ipcRenderer.send('save-dialog')
-})
-
-ipcRenderer.on('saved-file', (event, path) => {
-  if (!path) path = 'No path'
-  document.getElementById('file-saved').innerHTML = `Path selected: ${path}`
-})
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
--- a/docs/fiddles/native-ui/drag-and-drop/main.js
+++ b/docs/fiddles/native-ui/drag-and-drop/main.js
@@ -1,64 +1,64 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, nativeImage } = require('electron')
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-ipcMain.on('ondragstart', (event, filepath) => {
-  const icon = nativeImage.createFromDataURL('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAACsZJREFUWAmtWFlsXFcZ/u82++Jt7IyT2Em6ZFHTpAtWIzspEgjEUhA8VNAiIYEQUvuABBIUwUMkQIVKPCIoEiABLShISEBbhFJwIGRpIKRpbNeJ7bh2HHvssR3PPnPnLnzfmRlju6EQqUc+c++c8y/fv54z1uQOh+/7Glh0TD59TE/TND7lnfa4/64OKsM071QoeZpA/y9WWvk/B4XCC06TUC+Xyw8HTXNQ1+Ww6PpOrMebewXxvBueJ6/XHOdMJBL5J9Y97m2R0SS/wweE6JxkGx5dilWr1S/7dXsEa2o4+LyFmcFcaL5zbX3Y9gh5hpeWYpSB9XV5/H678V89BGYDXnHJlCsWn4gHrGc1K9CXxferOdvPOOKUfF8cH7nUyCtklQZXih/VNNlmirk3GdBSoIcRswW7/vVkLPYi5W2Uze8bh7J+4wLfh4dViFx5/nmrUi7/MhGNvrCkBfpeWqnW/7BUdadqntQ8zwr6vhUV34xpYnDynWvcmwQNaclDXsqgLMqkocPDw7fNx7d5qIX+/PmJxKGD6VdDkeh7ztyqOFfrokGCEWiiZ1mp0uITnuKAosaT7+pNxMYTyefutcQfbA+b1XLpH5fnF97/yD335Fu6mqTqsclDINBVmI4fDxw80KPAvJSt1MZtMcLiGxYUu83p4UkgnJZlqcl3LAj3WnTkIS9lUBYNPJjueVWgg7qocyOgliFqjZsg8gq5tRdiieQTf1gq15Y8CUbRZtyWOzZwc8lEqS3PTCtgqd13ieO68BQ2uNl64tXAewktrFuX2mPdkWAxn3sxnmx7sqUTJGqso8MGS9tbXFz8DMH8bblUX3T9QARVi8RV8qljfcJy0zRlaf6mzHEuzEtmekqCoZB4rqp0OmudHtUnlEWZlE0d1EWd1N3EozourcO65pw4eTIZQTW9VazJtbqvw9XwKVFQMsKDBuNhtp4uvGGFI+IDgKnpMjYyIis3ZsQMBIR7pONsIaMsyqRs6ohY1rPUSd3EQFDqo+kdZ3Fh4aupbdu+99uFQr2A1CBs4uEAjZjIFUMHi4dVxMXzCdCXQj4vBrwVCofl0ulTcv/DAxJJJBUPc8mpoyI2JDw7bFyT+ifTcSubyXytJ51+roWBxwG9Q73WWjZ7eSUU3//nXM0NI+x0PBGrTSgsLS9JFuFxHFrvSqIrJV279gi6tjiVspTza3JjZhY+0CQZj0mlWJSeHTslCro6eFqymCcVVN77kkGjs1p4sy2VOoSlOrFwT+XR+PjkgGaZ+ycKVbRTYUdVrmaImCvzk1dlFCEJdHRJ284+ie/ol0h7p7jFvExcvCCXzp2Rqem3pAMAiqWS6JGYhFI9Mjo6KjevXVUyKEuFHrKpY6JQ8TXT3D8+OTkAHBw6o6LCFo9ag3o4JtlCyTHEt5AxKvS6YUi5kJeZG3Py0NAxlLcJ9xti+K7Mjo/JfGZRuvv6Ze+9+yWEhDZAvzg3JyhX2d6/S7q6e+TimdOS7ElLKBZDwqvmj6rztayr1fVI1IoXi4PAcYZY1tPEEO1wEVlXgRFBDcmIXTqJsS+XyhKLJ5A/OpIVXXptWUYv/UvaenfIocEhMQ2EzHHErlXFCgQl3paU1eVl6QAY8sQTCSmVihKJx1V/ogvgIYF/pACdcMBhqONoHhF88/2d+bojyA6cRvje2IdFjoSjUSnBS8hgyS9lZOzKFdmPxO3o6gQIGzwuDn1dVSCtCKPy1pZXlATXqUsVYMLRmKo87vP4Y1ioqwCdCegmMYx3W/VPn8RrSDwwIMMbcEjkYo29JZVOy+ybI7K4eksODx1VSqvligpReSVLgySM/FI5h2q062jNyL3s7FtoAyGJIlx1225UmwJF6aJRJ3XzHXO9bWvsJa3jQFlBJkz6iuXdu32HzM7MyP0PPNgAU6ko4Qzp6b+flr8MD9OYJg9CwtzL5+T65ITs2bsP3mGxN/ZbBcOn0sk20gAkLQ+huXpFi8vkoY9AoyDjxTR1mbo6Ltt275HpN0dlNxQE40mVM8Ajjxx9VAGhAvQR1akZFCq799ADysMuQqOxh2FNmamEaz51ItGLfFD9+oUJoZkLowHoFA2mljUacqOMflKuVmHpfmnfvlMuvXZeStmMBIMhcWEdjgFJtrUjXI0KchAuAg0ilxLJNoRVBxhIBm0TjjKAuqjTqTs3CQZ6QUUMGFW7eiWMUg6w+yo8YMW7DqtqlZLkUDV2ISfd29KyDwk9MjYmMyOXxQIIKuShqo4VGFNBEgeDQYqVam5N5tEePFQgURIUBCsd1EWd1XrtDUUMLARD9bKaK5ytQ2Gb75g8WMiEP6VkfnZGevv6UF1vSBW5E0PFDAweFRvlfun8WVmamhDNrkmweQ0pwaPt6M4m8mgKTTFXqcrV0ZH1FKBg6qAu6qTuJiCV1Cp2Q0NDr9Uq5Ym+oMEDlSewsoRwrVBEaij7AJ4s7zrOpumxEdm15y6558GHJVe1Zezy6zJx6aJkpq5JFB4z6zVZmBiX1VWUP0IY4CFMYcpQdZ3xqIs6oftCE5DHKwd0q/tzOV8svdDb3nk8VnG9qmgQC0ZURz8Ur91alXgSByZ6ES9kZZTr/PR16UOCh+7dq0CWyyXJ4xqCQ0nKt9YQSlPue2gAeYZzD7yNLk0wmqAreb2WYSxAJ8Dget64wxtEBlDaqVOn/K5dB67t6+t5MhoMJuc8w8UPKiQ9CQR9JK5czhZAQxPt7TKF3OiAIisUViAD2Lg5d0P2HDgoKeRaW0enyqVwBJcO5fFG5dqa7h406qaeX8384uTZL5w9+UqxhYHFp0YLIYA9ddfu3T+4UJF6Rg+YAc9D0+RoIGP1ULhpWspr10evyK7+ftWTrk9PS/++A9KZSm26cih2mMOErem6n/ZsZwA2TM/MPHXs2LEftnSTbh0Q36mIIbx44cLvOnu3f+xUwbWLmoHTCUlF6g2jBQo/GnFrnGNqSHdvr+rIKGMW1KahwEBdzHft98aNwMr8zd8/NDDwccihc0hLi3GubRjY0Bm6H19fPvnZI4c/fHd7PJ2peXYZ+WQ26JufZELjQ6lbAQtnWre0d3apY8TFIdtAo+Qri6mupsB49lBMC+QXF0YefObZT8j0eKWlswVjEyCCOXHihPGb575VCvVuf3lvetsH9rXF0rla3cnhpoIGjgsUPhR3I4TMKYJQV1Z6WO02aEjHa5mNe3OPW3OPRHVrbXFh9Ocvv/KR1372owx1Pf3005uc35Ddgtd8rsf06IdS5777zZ+mUqmPzjm6TPpmvayZOq4LyATeCzkanmiy4qEuC/yXiO8CSMRzvLs1x9phepLNZl868sy3Pyen/5hd1/EfRvWmuvSWNeaRS/RkPDI4+NjE1NSXEoXlpaNB1zqo20abi59/vu/UfM2pie7WUDVq8l3wTwnskeZ+zTbIQ17KoCzKpGzq2KqX32/roRbh8ePHdUzl0s9/5Rv9n/7go19MxCKfCkZiu3V06wrO5gocxL7Dgd/IEobEMH6rejg+auXidL5Y/vWv/vTX53/y/e/MkGajTH7fOt4RUJOY1df4RdtY6ICFRzqTySOhUOA+3Ai3o31H1ZbnlXBruFmt2iMrudy5xx9//BzWV7nXDBGN2xpjbt/5oGUEdhtO3iD47xZOvm8a5CHvpsV38wsUaMwBWsz3rbK5xr0mzdv2t9Jv/f5vhsF4J+Q63IUAAAAASUVORK5CYII=')
-
-  event.sender.startDrag({
-    file: filepath,
-    icon
-  })
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
+// Modules to control application life and create native browser window
+const { app, BrowserWindow, ipcMain, nativeImage } = require('electron')
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let mainWindow
+
+function createWindow () {
+  // Create the browser window.
+  mainWindow = new BrowserWindow({
+    width: 800,
+    height: 600,
+    webPreferences: {
+      nodeIntegration: true
+    }
+  })
+
+  // and load the index.html of the app.
+  mainWindow.loadFile('index.html')
+
+  // Open the DevTools.
+  // mainWindow.webContents.openDevTools()
+
+  // Emitted when the window is closed.
+  mainWindow.on('closed', function () {
+    // Dereference the window object, usually you would store windows
+    // in an array if your app supports multi windows, this is the time
+    // when you should delete the corresponding element.
+    mainWindow = null
+  })
+}
+
+// This method will be called when Electron has finished
+// initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
+app.on('ready', createWindow)
+
+// Quit when all windows are closed.
+app.on('window-all-closed', function () {
+  // On OS X it is common for applications and their menu bar
+  // to stay active until the user quits explicitly with Cmd + Q
+  if (process.platform !== 'darwin') {
+    app.quit()
+  }
+})
+
+app.on('activate', function () {
+  // On OS X it's common to re-create a window in the app when the
+  // dock icon is clicked and there are no other windows open.
+  if (mainWindow === null) {
+    createWindow()
+  }
+})
+
+ipcMain.on('ondragstart', (event, filepath) => {
+  const icon = nativeImage.createFromDataURL('data:image/png;base64,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')
+
+  event.sender.startDrag({
+    file: filepath,
+    icon
+  })
+})
+
+// In this file you can include the rest of your app's specific main process
+// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/native-ui/drag-and-drop/renderer.js
+++ b/docs/fiddles/native-ui/drag-and-drop/renderer.js
@@ -1,21 +1,21 @@
-const { ipcRenderer } = require('electron')
-const shell = require('electron').shell
-
-const links = document.querySelectorAll('a[href]')
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
-
-const dragFileLink = document.getElementById('drag-file-link')
-
-dragFileLink.addEventListener('dragstart', event => {
-  event.preventDefault()
-  ipcRenderer.send('ondragstart', __filename)
-})
+const { ipcRenderer } = require('electron')
+const shell = require('electron').shell
+
+const links = document.querySelectorAll('a[href]')
+
+Array.prototype.forEach.call(links, (link) => {
+  const url = link.getAttribute('href')
+  if (url.indexOf('http') === 0) {
+    link.addEventListener('click', (e) => {
+      e.preventDefault()
+      shell.openExternal(url)
+    })
+  }
+})
+
+const dragFileLink = document.getElementById('drag-file-link')
+
+dragFileLink.addEventListener('dragstart', event => {
+  event.preventDefault()
+  ipcRenderer.send('ondragstart', __filename)
+})
--- a/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html
+++ b/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Open external links</title>
-  </head>
-  <body>
-    <div class="demo">
-      <div class="demo-wrapper">
-        <div class="demo-box">
-          <div class="demo-controls">
-            <button class="demo-button" id="open-ex-links">View Demo</button>
-          </div>
-          <p>
-            If you do not want your app to open website links
-            <em>within</em> the app, you can use the <code>shell</code> module
-            to open them externally. When clicked, the links will open outside
-            of your app and in the user's default web browser.
-          </p>
-          <p>
-            When the demo button is clicked, the electron website will open in
-            your browser.
-          </p>
-          <p></p>
-          <h5>Renderer Process</h5>
-          <pre><code>
-                const { shell } = require('electron')
-                const exLinksBtn = document.getElementById('open-ex-links')
-                exLinksBtn.addEventListener('click', (event) => {
-                shell.openExternal('http://electron.atom.io')
-                }) 
-            </code></pre>
-
-          <div class="demo-protip">
-            <h2>ProTip</h2>
-            <strong>Open all outbound links externally.</strong>
-            <p>
-              You may want to open all <code>http</code> and
-              <code>https</code> links outside of your app. To do this, query
-              the document and loop through each link and add a listener. This
-              app uses the code below which is located in
-              <code>assets/ex-links.js</code>.
-            </p>
-            <h5>Renderer Process</h5>
-            <pre><code>
-                const { shell } = require('electron')
-                const links = document.querySelectorAll('a[href]')
-                Array.prototype.forEach.call(links, (link) => {
-                    const url = link.getAttribute('href')
-                    if (url.indexOf('http') === 0) {
-                    link.addEventListener('click', (e) => {
-                        e.preventDefault()
-                        shell.openExternal(url)
-                    })
-                }})
-            </code></pre>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/external-links-file-manager/external-links/main.js
+++ b/docs/fiddles/native-ui/external-links-file-manager/external-links/main.js
@@ -1,25 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-let mainWindow = null
-
-function createWindow () {
-  const windowOptions = {
-    width: 600,
-    height: 400,
-    title: 'Open External Links',
-    webPreferences: {
-      nodeIntegration: true
-    }
-  }
-
-  mainWindow = new BrowserWindow(windowOptions)
-  mainWindow.loadFile('index.html')
-
-  mainWindow.on('closed', () => {
-    mainWindow = null
-  })
-}
-
-app.on('ready', () => {
-  createWindow()
-})
--- a/docs/fiddles/native-ui/external-links-file-manager/external-links/renderer.js
+++ b/docs/fiddles/native-ui/external-links-file-manager/external-links/renderer.js
@@ -1,21 +0,0 @@
-const { shell } = require('electron')
-
-const exLinksBtn = document.getElementById('open-ex-links')
-
-exLinksBtn.addEventListener('click', (event) => {
-  shell.openExternal('http://electron.atom.io')
-})
-
-const OpenAllOutboundLinks = () => {
-  const links = document.querySelectorAll('a[href]')
-
-  Array.prototype.forEach.call(links, (link) => {
-    const url = link.getAttribute('href')
-    if (url.indexOf('http') === 0) {
-      link.addEventListener('click', (e) => {
-        e.preventDefault()
-        shell.openExternal(url)
-      })
-    }
-  })
-}
--- a/docs/fiddles/native-ui/external-links-file-manager/index.html
+++ b/docs/fiddles/native-ui/external-links-file-manager/index.html
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Open external links and the file manager</title>
-  </head>
-  <body>
-    <div>
-      <h1>  
-        Open external links and the file manager
-      </h1>
-      <h3>
-        The <code>shell</code> module in Electron allows you to access certain
-        native elements like the file manager and default web browser.
-      </h3>
-
-      <p>This module works in both the main and renderer process.</p>
-      <p>
-        Open the
-        <a href="http://electron.atom.io/docs/api/shell">
-          full API documentation (opens in new window)
-        </a>
-        in your browser.
-      </p>
-    </div>
-
-    <div>
-      <div>
-        <h2>Open Path in File Manager</h2>
-        <div>
-          <div>
-            <button id="open-file-manager">
-              View Demo
-            </button>
-          </div>
-          <p>
-            This demonstrates using the <code>shell</code> module to open the
-            system file manager at a particular location.
-          </p>
-          <p>
-            Clicking the demo button will open your file manager at the root.
-          </p>
-        </div>
-      </div>
-    </div>
-
-    <div>
-      <div>
-        <h2>Open External Links</h2>
-        <div>
-          <div>
-            <button id="open-ex-links">View Demo</button>
-          </div>
-          <p>
-            If you do not want your app to open website links
-            <em>within</em> the app, you can use the <code>shell</code> module
-            to open them externally. When clicked, the links will open outside
-            of your app and in the user's default web browser.
-          </p>
-          <p>
-            When the demo button is clicked, the electron website will open in
-            your browser.
-          </p>
-          <p></p>
-
-          <div>
-            <h2>ProTip</h2>
-            <strong>Open all outbound links externally.</strong>
-            <p>
-              You may want to open all <code>http</code> and
-              <code>https</code> links outside of your app. To do this, query
-              the document and loop through each link and add a listener. This
-              app uses the code below which is located in
-              <code>assets/ex-links.js</code>.
-            </p>
-            <h5>Renderer Process</h5>
-            <pre>
-                <code>
-const shell = require('electron').shell
-
-const links = document.querySelectorAll('a[href]')
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
-                </code>
-              </pre>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/external-links-file-manager/main.js
+++ b/docs/fiddles/native-ui/external-links-file-manager/main.js
@@ -1,56 +0,0 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow } = require('electron')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/native-ui/external-links-file-manager/renderer.js
+++ b/docs/fiddles/native-ui/external-links-file-manager/renderer.js
@@ -1,13 +0,0 @@
-const { shell } = require('electron')
-const os = require('os')
-
-const exLinksBtn = document.getElementById('open-ex-links')
-const fileManagerBtn = document.getElementById('open-file-manager')
-
-fileManagerBtn.addEventListener('click', (event) => {
-  shell.showItemInFolder(os.homedir())
-})
-
-exLinksBtn.addEventListener('click', (event) => {
-  shell.openExternal('http://electron.atom.io')
-})
--- a/docs/fiddles/native-ui/notifications/index.html
+++ b/docs/fiddles/native-ui/notifications/index.html
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Desktop notifications</title>
-  </head>
-  <body>
-    <div>
-      <h1>Desktop notifications</h1>
-      <h3>
-        The <code>notification</code> module in Electron allows you to add basic
-        desktop notifications.
-      </h3>
-
-      <p>
-        Electron conveniently allows developers to send notifications with the
-        <a href="https://notifications.spec.whatwg.org/">HTML5 Notification API</a>, 
-        using the currently running operating system’s native notification
-        APIs to display it.
-      </p>
-
-      <p>
-        <b>Note:</b> Since this is an HTML5 API it is only available in the
-        renderer process.
-      </p>
-
-      <p>
-        Open the
-        <a href="https://electron.atom.io/docs/all/#notifications-windows-linux-macos">
-          full API documentation<span>(opens in new window)</span>
-        </a>
-        in your browser.
-      </p>
-    </div>
-
-    <div>
-      <div>
-        <h2>Basic notification</h2>
-        <div>
-          <div>
-            <button id="basic-noti">View demo</button>
-          </div>
-          <p>This demo demonstrates a basic notification. Text only.</p>
-        </div>
-      </div>
-    </div>
-
-    <div>
-      <div>
-        <h2>Notification with image</h2>
-        <div>
-          <div>
-            <button id="advanced-noti">View demo</button>
-          </div>
-          <p>
-            This demo demonstrates a basic notification. Both text and a image
-          </p>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/notifications/main.js
+++ b/docs/fiddles/native-ui/notifications/main.js
@@ -1,56 +0,0 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow } = require('electron')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
--- a/docs/fiddles/native-ui/notifications/renderer.js
+++ b/docs/fiddles/native-ui/notifications/renderer.js
@@ -1,29 +0,0 @@
-const basicNotification = {
-  title: 'Basic Notification',
-  body: 'Short message part'
-}
-
-const notification = {
-  title: 'Notification with image',
-  body: 'Short message plus a custom image',
-  icon: 'https://via.placeholder.com/150'
-}
-
-const basicNotificationButton = document.getElementById('basic-noti')
-const notificationButton = document.getElementById('advanced-noti')
-
-notificationButton.addEventListener('click', () => {
-  const myNotification = new window.Notification(notification.title, notification)
-
-  myNotification.onclick = () => {
-    console.log('Notification clicked')
-  }
-})
-
-basicNotificationButton.addEventListener('click', () => {
-  const myNotification = new window.Notification(basicNotification.title, basicNotification)
-
-  myNotification.onclick = () => {
-    console.log('Notification clicked')
-  }
-})
--- a/docs/fiddles/native-ui/tray/index.html
+++ b/docs/fiddles/native-ui/tray/index.html
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Tray</title>
-  </head>
-  <body>
-    <div>
-      <h1>Tray</h1>
-      <h3>
-        The <code>tray</code> module allows you to create an icon in the
-        operating system's notification area.
-      </h3>
-      <p>This icon can also have a context menu attached.</p>
-
-      <p>
-        Open the
-        <a href="http://electron.atom.io/docs/api/tray">
-          full API documentation (opens in new window)
-        </a>
-        in your browser.
-      </p>
-    </div>
-
-    <div>
-      <div>
-        <div>
-          <div>
-            <button id="put-in-tray">View Demo</button>
-            <span id="tray-countdown"></span>
-          </div>
-          <p>
-            The demo button sends a message to the main process using the
-            <code>ipc</code> module. In the main process the app is told to
-            place an icon, with a context menu, in the tray.
-          </p>
-
-          <p>
-            In this example the tray icon can be removed by clicking 'Remove' in
-            the context menu or selecting the demo button again.
-          </p>
-          <h5>Main Process</h5>
-          <pre>
-              <code>
-const path = require('path')
-const {ipcMain, app, Menu, Tray} = require('electron')
-
-let appIcon = null
-
-ipcMain.on('put-in-tray', (event) => {
-  const iconName = process.platform === 'win32' ? 'windows-icon.png' : 'iconTemplate.png'
-  const iconPath = path.join(__dirname, iconName)
-  appIcon = new Tray(iconPath)
-
-  const contextMenu = Menu.buildFromTemplate([{
-    label: 'Remove',
-    click: () => {
-      event.sender.send('tray-removed')
-    }
-  }])
-
-  appIcon.setToolTip('Electron Demo in the tray.')
-  appIcon.setContextMenu(contextMenu)
-})
-
-ipcMain.on('remove-tray', () => {
-  appIcon.destroy()
-})
-
-app.on('window-all-closed', () => {
-  if (appIcon) appIcon.destroy()
-})
-              </code>
-            </pre>
-          <h5>Renderer Process</h5>
-          <pre>
-              <code>
-const ipc = require('electron').ipcRenderer
-
-const trayBtn = document.getElementById('put-in-tray')
-let trayOn = false
-
-trayBtn.addEventListener('click', function (event) {
-  if (trayOn) {
-    trayOn = false
-    document.getElementById('tray-countdown').innerHTML = ''
-    ipc.send('remove-tray')
-  } else {
-    trayOn = true
-    const message = 'Click demo again to remove.'
-    document.getElementById('tray-countdown').innerHTML = message
-    ipc.send('put-in-tray')
-  }
-})
-// Tray removed from context menu on icon
-ipc.on('tray-removed', function () {
-  ipc.send('remove-tray')
-  trayOn = false
-  document.getElementById('tray-countdown').innerHTML = ''
-})                  
-              </code>
-            </pre>
-
-          <div>
-            <h2>ProTip</h2>
-            <strong>Tray support in Linux.</strong>
-            <p>
-              On Linux distributions that only have app indicator support, users
-              will need to install <code>libappindicator1</code> to make the
-              tray icon work. See the
-              <a href="http://electron.atom.io/docs/api/tray">
-                full API documentation (opens in new window)
-              </a>
-              for more details about using Tray on Linux.
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
-  </body>
-</html>
--- a/docs/fiddles/native-ui/tray/main.js
+++ b/docs/fiddles/native-ui/tray/main.js
--- a/docs/fiddles/native-ui/tray/renderer.js
+++ b/docs/fiddles/native-ui/tray/renderer.js
@@ -1,35 +0,0 @@
-const { ipcRenderer, shell } = require('electron')
-
-const trayBtn = document.getElementById('put-in-tray')
-const links = document.querySelectorAll('a[href]')
-
-let trayOn = false
-
-trayBtn.addEventListener('click', function (event) {
-  if (trayOn) {
-    trayOn = false
-    document.getElementById('tray-countdown').innerHTML = ''
-    ipcRenderer.send('remove-tray')
-  } else {
-    trayOn = true
-    const message = 'Click demo again to remove.'
-    document.getElementById('tray-countdown').innerHTML = message
-    ipcRenderer.send('put-in-tray')
-  }
-})
-// Tray removed from context menu on icon
-ipcRenderer.on('tray-removed', function () {
-  ipcRenderer.send('remove-tray')
-  trayOn = false
-  document.getElementById('tray-countdown').innerHTML = ''
-})
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
--- a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/index.html
+++ b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/index.html
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-  </head>
-<body>
-  <section>
-    <header>
-        <h1>
-          Protocol Handler
-        </h1>
-        <h3>The <code>app</code> module provides methods for handling protocols.</h3>
-        <p>These methods allow you to set and unset the protocols your app should be the default app for. Similar to when a browser asks to be your default for viewing web pages.</p>
-
-        <p>Open the <a href="http://electron.atom.io/docs/api/app">full app API documentation<span class="u-visible-to-screen-reader">(opens in new window)</span></a> in your browser.</p>
-    </header>
-
-    <div >
-        <button id="open-in-browser" class="js-container-target demo-toggle-button">Launch current page in browser
-          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS <span class="demo-meta-divider">|</span> Process: Main</div>
-        </button>
-        <section id='open-app-link'>
-          <a href="electron-api-demos://open">Now... launch the app from a web link</a>
-        </section>
-        <div >
-          <p>You can set your app as the default app to open for a specific protocol. For instance, in this demo we set this app as the default for <code>electron-api-demos://</code>. The demo button above will launch a page in your default browser with a link. Click that link and it will re-launch this app.</p>
-          <h5>Packaging</h5>
-          <p>This feature will only work on macOS when your app is packaged. It will not work when you're launching it in development from the command-line. When you package your app you'll need to make sure the macOS <code>plist</code> for the app is updated to include the new protocol handler. If you're using <code>electron-packager</code> then you can add the flag <code>--extend-info</code> with a path to the <code>plist</code> you've created. The one for this app is below.</p>
-          <h5>Renderer Process</h5>
-          <pre><code>
-            const {shell} = require('electron')
-            const path = require('path')
-            const protocolHandlerBtn = document.getElementById('protocol-handler')
-            protocolHandlerBtn.addEventListener('click', () => {
-                const pageDirectory = __dirname.replace('app.asar', 'app.asar.unpacked')
-                const pagePath = path.join('file://', pageDirectory, '../../sections/system/protocol-link.html')
-                shell.openExternal(pagePath)
-            })
-          </code></pre>
-          <h5>Main Process</h5>
-          <pre><code>
-            const {app, dialog} = require('electron')
-            const path = require('path')
-
-            if (process.defaultApp) {
-                if (process.argv.length >= 2) {
-                    app.setAsDefaultProtocolClient('electron-api-demos', process.execPath, [path.resolve(process.argv[1])])
-                }
-            } else {
-                app.setAsDefaultProtocolClient('electron-api-demos')
-            }
-
-            app.on('open-url', (event, url) => {
-                dialog.showErrorBox('Welcome Back', `You arrived from: ${url}`)
-            })
-
-          </code></pre>
-          <h5>macOS plist</h5>
-          <pre><code>
-            <?xml version="1.0" encoding="UTF-8"?>
-                <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-                    <plist version="1.0">
-                        <dict>
-                            <key>CFBundleURLTypes</key>
-                            <array>
-                                <dict>
-                                    <key>CFBundleURLSchemes</key>
-                                    <array>
-                                        <string>electron-api-demos</string>
-                                    </array>
-                                    <key>CFBundleURLName</key>
-                                    <string>Electron API Demos Protocol</string>
-                                </dict>
-                            </array>
-                            <key>ElectronTeamID</key>
-                            <string>VEKTX9H2N7</string>
-                        </dict>
-                    </plist>
-                </code>
-            </pre>
-        </div>
-    </div>
-    <script type="text/javascript">
-        require('./renderer.js')
-    </script>
-</section>
-</body>
-</html>
-
-  </body>
-</html>
--- a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js
+++ b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js
@@ -1,69 +0,0 @@
-// Modules to control application life and create native browser window
-const { app, BrowserWindow, dialog } = require('electron')
-const path = require('path')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
-
-if (process.defaultApp) {
-  if (process.argv.length >= 2) {
-    app.setAsDefaultProtocolClient('electron-api-demos', process.execPath, [path.resolve(process.argv[1])])
-  }
-} else {
-  app.setAsDefaultProtocolClient('electron-api-demos')
-}
-
-app.on('open-url', (event, url) => {
-  dialog.showErrorBox('Welcome Back', `You arrived from: ${url}`)
-})
--- a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/renderer.js
+++ b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/renderer.js
@@ -1,14 +0,0 @@
-const { shell } = require('electron')
-const path = require('path')
-
-const openInBrowserButton = document.getElementById('open-in-browser')
-const openAppLink = document.getElementById('open-app-link')
-// Hides openAppLink when loaded inside Electron
-openAppLink.style.display = 'none'
-
-openInBrowserButton.addEventListener('click', () => {
-  console.log('clicked')
-  const pageDirectory = __dirname.replace('app.asar', 'app.asar.unpacked')
-  const pagePath = path.join('file://', pageDirectory, 'index.html')
-  shell.openExternal(pagePath)
-})
--- a/docs/fiddles/system/system-app-user-information/app-information/index.html
+++ b/docs/fiddles/system/system-app-user-information/app-information/index.html
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-  </head>
-  <body>
-    <div>
-      <div>
-        <h1>App Information</h1>
-        <div>
-          <div>
-            <button id="app-info">View Demo</button>
-            <span id="got-app-info"></span>
-          </div>
-          <p>The main process <code>app</code> module can be used to get the path at which your app is located on the user's computer.</p>
-          <p>In this example, to get that information from the renderer process, we use the <code>ipc</code> module to send a message to the main process requesting the app's path.</p>
-          <p>See the <a id="electron-docs" href="https://electronjs.org/docs/api/app">app module documentation<span class="u-visible-to-screen-reader">(opens in new window)</span></a> for more.</p>
-        </div>
-      </div>
-    </div>
-    <script>
-      // You can also require other files to run in this process
-      require('./renderer.js')
-    </script>
-  </body>
-</html> 
--- a/docs/fiddles/system/system-app-user-information/app-information/main.js
+++ b/docs/fiddles/system/system-app-user-information/app-information/main.js
@@ -1,5 +0,0 @@
-const {app, ipcMain} = require('electron')
-
-ipcMain.on('get-app-path', (event) => {
-  event.sender.send('got-app-path', app.getAppPath())
-})
--- a/docs/fiddles/system/system-app-user-information/app-information/renderer.js
+++ b/docs/fiddles/system/system-app-user-information/app-information/renderer.js
@@ -1,18 +0,0 @@
-const {ipcRenderer} = require('electron')
-
-const appInfoBtn = document.getElementById('app-info')
-const electron_doc_link = document.querySelectorAll('a[href]')
-
-appInfoBtn.addEventListener('click', () => {
-  ipcRenderer.send('get-app-path')
-})
-
-ipcRenderer.on('got-app-path', (event, path) => {
-  const message = `This app is located at: ${path}`
-  document.getElementById('got-app-info').innerHTML = message
-})
-
-electron_doc_link.addEventListener('click', (e) => {
-  e.preventDefault()
-  shell.openExternal(url)
-})
--- a/docs/fiddles/system/system-app-user-information/.keep
+++ b/docs/fiddles/system/system-app-user-information/.keep
--- a/docs/fiddles/windows/manage-windows/create-frameless-window/index.html
+++ b/docs/fiddles/windows/manage-windows/create-frameless-window/index.html
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-  </head>
-  <body>
-    <div>
-      <div>
-        <h1>Create a frameless window</h1>
-        <i>Supports: Win, macOS, Linux <span>|</span> Process: Main</i>
-        <div>
-          <p>A frameless window is a window that has no <i>"chrome"</i>,
-            such as toolbars, title bars, status bars, borders, etc. You can make 
-            a browser window frameless by setting
-            <code>frame</code> to <code>false</code> when creating the window.</p>
-          <div>
-            <button id="frameless-window">View Demo</button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-  <script>
-    require('./renderer.js')
-  </script>
-</html>
--- a/docs/fiddles/windows/manage-windows/create-frameless-window/main.js
+++ b/docs/fiddles/windows/manage-windows/create-frameless-window/main.js
@@ -1,25 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-let mainWindow = null
-
-function createWindow () {
-  const windowOptions = {
-    width: 600,
-    height: 400,
-    title: 'Create a frameless window',
-    webPreferences: {
-      nodeIntegration: true
-    }
-  }
-
-  mainWindow = new BrowserWindow(windowOptions)
-  mainWindow.loadFile('index.html')
-
-  mainWindow.on('closed', () => {
-    mainWindow = null
-  })
-}
-
-app.on('ready', () => {
-  createWindow()
-})
--- a/docs/fiddles/windows/manage-windows/create-frameless-window/renderer.js
+++ b/docs/fiddles/windows/manage-windows/create-frameless-window/renderer.js
@@ -1,12 +0,0 @@
-const { BrowserWindow } = require('electron').remote
-
-const newWindowBtn = document.getElementById('frameless-window')
-
-newWindowBtn.addEventListener('click', (event) => {
-  let win = new BrowserWindow({ frame: false })
-
-  win.on('close', () => { win = null })
-
-  win.loadURL('data:text/html,<h2>Hello World!</h2><a id="close" href="javascript:window.close()">Close this Window</a>')
-  win.show()
-})
--- a/docs/images/gatekeeper.png
+++ b/docs/images/gatekeeper.png
--- a/docs/tutorial/code-signing.md
+++ b/docs/tutorial/code-signing.md
@@ -3,7 +3,7 @@
 Code signing is a security technology that you use to certify that an app was
 created by you.

-On macOS the system can detect any change to the app, whether the change is
+On macOS the system can detect any change to the  app, whether the change is
 introduced accidentally or by malicious code.

 On Windows the system assigns a trust level to your code signing certificate which
@@ -11,18 +11,15 @@ if you don't have, or if your trust level is low will cause security dialogs to
 appear when users start using your application.  Trust level builds over time
 so it's better to start code signing as early as possible.

-While it is possible to distribute unsigned apps, it is not recommended. Both
-Windows and macOS will, by default, prevent either the download or the
-execution of unsigned applications. Starting with macOS Catalina (version 10.15),
-users have to go through multiple manual steps to open unsigned applications.
+While it is possible to distribute unsigned apps, it is not recommended.
+For example, here's what macOS users see when attempting to start an unsigned app:

-![macOS Catalina Gatekeeper warning: The app cannot be opened because the developer cannot be verified](../images/gatekeeper.png)
+![unsigned app warning on macOS](https://user-images.githubusercontent.com/2289/39488937-bdc854ba-4d38-11e8-88f8-7b3c125baefc.png)

-As you can see, users get two options: Move the app straight to the trash or
-cancel running it. You don't want your users to see that dialog.
+> App can't be opened because it is from an unidentified developer

 If you are building an Electron app that you intend to package and distribute,
-it should be code-signed. The Mac and Windows app stores do not allow unsigned
+it should be code signed. The Mac and Windows app stores do not allow unsigned
 apps.

 # Signing macOS builds
@@ -42,20 +39,7 @@ pass the `--osx-sign=true` flag to sign your build.
    in your forge config.
 - [`electron-builder`] has built-in code-signing capabilities. See [electron.build/code-signing](https://www.electron.build/code-signing)

-## Notarization
-
-Starting with macOS Catalina, Apple requires applications to be notarized.
-"Notarization" as defined by Apple means that you upload your previously signed
-application to Apple for additional verification _before_ distributing the app
-to your users.
-
-To automate this process, you can use the [`electron-notarize`] module. You
-do not necessarily need to complete this step for every build you make – just
-the builds you intend to ship to users.
-
-## Mac App Store
-
-See the [Mac App Store Guide].
+For more info, see the [Mac App Store Submission Guide].

 # Signing Windows builds

@@ -86,9 +70,8 @@ See the [Windows Store Guide].
 [`electron-forge`]: https://github.com/electron-userland/electron-forge
 [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
 [`electron-packager`]: https://github.com/electron/electron-packager
-[`electron-notarize`]: https://github.com/electron/electron-notarize
 [`electron-winstaller`]: https://github.com/electron/windows-installer
 [Xcode]: https://developer.apple.com/xcode
-[signing certificates]: https://github.com/electron/electron-osx-sign/wiki/1.-Getting-Started#certificates
-[Mac App Store Guide]: mac-app-store-submission-guide.md
+[signing certificates]: https://github.com/electron-userland/electron-osx-sign/wiki/1.-Getting-Started#certificates
+[Mac App Store Submission Guide]: mac-app-store-submission-guide.md
 [Windows Store Guide]: windows-store-guide.md
--- a/docs/tutorial/installation.md
+++ b/docs/tutorial/installation.md
@@ -82,7 +82,7 @@ with the network at all.
 On environments that have been using older versions of Electron, you might find the
 cache also in `~/.electron`.

-You can also override the local cache location by providing a `electron_config_cache`
+You can also override the local cache location by providing a `ELECTRON_CACHE`
 environment variable.

 The cache contains the version's official zip file as well as a checksum, stored as
--- a/docs/tutorial/mojave-dark-mode-guide.md
+++ b/docs/tutorial/mojave-dark-mode-guide.md
@@ -21,12 +21,12 @@ If your app has its own dark mode you should toggle it on and off in sync with t
 this by listening for the theme changed event on Electron's `systemPreferences` module.  E.g.

 ```js
-const { nativeTheme } = require('electron')
+const { systemPreferences } = require('electron')

 systemPreferences.subscribeNotification(
  'AppleInterfaceThemeChangedNotification',
  function theThemeHasChanged () {
-    updateMyAppTheme(nativeTheme.shouldUseDarkColors)
+    updateMyAppTheme(systemPreferences.isDarkMode())
  }
 )
 ```
--- a/docs/tutorial/performance.md
+++ b/docs/tutorial/performance.md
@@ -328,7 +328,7 @@ own version of standard web platform features.
 ### How?

 Operate under the assumption that polyfills in current versions of Electron
-are unnecessary. If you have doubts, check [caniuse.com](https://caniuse.com/)
+are unnecessary. If you have doubts, check [caniuse.com][https://caniuse.com/]
 and check if the [version of Chromium used in your Electron version](../api/process.md#processversionschrome-readonly)
 supports the feature you desire.

--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -826,6 +826,10 @@ app.on('remote-get-current-window', (event, webContents) => {
 app.on('remote-get-current-web-contents', (event, webContents) => {
  event.preventDefault()
 })
+
+app.on('remote-get-guest-web-contents', (event, webContents, guestWebContents) => {
+  event.preventDefault()
+})
 ```

 ## 17) Use a current version of Electron
--- a/docs/tutorial/updates.md
+++ b/docs/tutorial/updates.md
@@ -123,8 +123,8 @@ autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
    detail: 'A new version has been downloaded. Restart the application to apply the updates.'
  }

-  dialog.showMessageBox(dialogOpts).then((returnValue) => {
-    if (returnValue.response === 0) autoUpdater.quitAndInstall()
+  dialog.showMessageBox(dialogOpts, (response) => {
+    if (response === 0) autoUpdater.quitAndInstall()
  })
 })
 ```
--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -165,6 +165,7 @@ auto_filenames = {
    "lib/renderer/web-view/web-view-element.ts",
    "lib/renderer/web-view/web-view-impl.ts",
    "lib/renderer/web-view/web-view-init.ts",
+    "lib/renderer/window-setup.ts",
    "lib/sandboxed_renderer/api/exports/electron.ts",
    "lib/sandboxed_renderer/api/module-list.ts",
    "lib/sandboxed_renderer/init.js",
--- a/filenames.gni
+++ b/filenames.gni
@@ -84,8 +84,8 @@ filenames = {
    "shell/browser/api/atom_api_power_monitor_win.cc",
    "shell/browser/api/atom_api_power_save_blocker.cc",
    "shell/browser/api/atom_api_power_save_blocker.h",
-    "shell/browser/api/atom_api_protocol.cc",
-    "shell/browser/api/atom_api_protocol.h",
+    "shell/browser/api/atom_api_protocol_ns.cc",
+    "shell/browser/api/atom_api_protocol_ns.h",
    "shell/browser/api/atom_api_screen.cc",
    "shell/browser/api/atom_api_screen.h",
    "shell/browser/api/atom_api_session.cc",
@@ -108,11 +108,13 @@ filenames = {
    "shell/browser/api/atom_api_web_contents_mac.mm",
    "shell/browser/api/atom_api_web_contents_view.cc",
    "shell/browser/api/atom_api_web_contents_view.h",
-    "shell/browser/api/atom_api_web_request.cc",
-    "shell/browser/api/atom_api_web_request.h",
+    "shell/browser/api/atom_api_web_request_ns.cc",
+    "shell/browser/api/atom_api_web_request_ns.h",
    "shell/browser/api/atom_api_web_view_manager.cc",
    "shell/browser/api/event.cc",
    "shell/browser/api/event.h",
+    "shell/browser/api/event_emitter_deprecated.cc",
+    "shell/browser/api/event_emitter_deprecated.h",
    "shell/browser/api/frame_subscriber.cc",
    "shell/browser/api/frame_subscriber.h",
    "shell/browser/api/gpu_info_enumerator.cc",
@@ -123,10 +125,12 @@ filenames = {
    "shell/browser/api/process_metric.h",
    "shell/browser/api/save_page_handler.cc",
    "shell/browser/api/save_page_handler.h",
+    "shell/browser/api/trackable_object.cc",
+    "shell/browser/api/trackable_object.h",
    "shell/browser/atom_autofill_driver.cc",
+    "shell/browser/atom_autofill_driver.h",
    "shell/browser/atom_autofill_driver_factory.cc",
    "shell/browser/atom_autofill_driver_factory.h",
-    "shell/browser/atom_autofill_driver.h",
    "shell/browser/atom_browser_client.cc",
    "shell/browser/atom_browser_client.h",
    "shell/browser/atom_browser_context.cc",
@@ -186,10 +190,10 @@ filenames = {
    "shell/browser/linux/unity_service.h",
    "shell/browser/login_handler.cc",
    "shell/browser/login_handler.h",
-    "shell/browser/mac/atom_application_delegate.h",
-    "shell/browser/mac/atom_application_delegate.mm",
    "shell/browser/mac/atom_application.h",
    "shell/browser/mac/atom_application.mm",
+    "shell/browser/mac/atom_application_delegate.h",
+    "shell/browser/mac/atom_application_delegate.mm",
    "shell/browser/mac/dict_util.h",
    "shell/browser/mac/dict_util.mm",
    "shell/browser/mac/in_app_purchase.h",
@@ -227,9 +231,9 @@ filenames = {
    "shell/browser/net/cert_verifier_client.cc",
    "shell/browser/net/cert_verifier_client.h",
    "shell/browser/net/network_context_service.cc",
+    "shell/browser/net/network_context_service.h",
    "shell/browser/net/network_context_service_factory.cc",
    "shell/browser/net/network_context_service_factory.h",
-    "shell/browser/net/network_context_service.h",
    "shell/browser/net/node_stream_loader.cc",
    "shell/browser/net/node_stream_loader.h",
    "shell/browser/net/proxying_url_loader_factory.cc",
@@ -255,16 +259,16 @@ filenames = {
    "shell/browser/notifications/mac/notification_presenter_mac.h",
    "shell/browser/notifications/mac/notification_presenter_mac.mm",
    "shell/browser/notifications/notification.cc",
-    "shell/browser/notifications/notification_delegate.h",
    "shell/browser/notifications/notification.h",
+    "shell/browser/notifications/notification_delegate.h",
    "shell/browser/notifications/notification_presenter.cc",
    "shell/browser/notifications/notification_presenter.h",
    "shell/browser/notifications/platform_notification_service.cc",
    "shell/browser/notifications/platform_notification_service.h",
-    "shell/browser/notifications/win/notification_presenter_win7.cc",
-    "shell/browser/notifications/win/notification_presenter_win7.h",
    "shell/browser/notifications/win/notification_presenter_win.cc",
    "shell/browser/notifications/win/notification_presenter_win.h",
+    "shell/browser/notifications/win/notification_presenter_win7.cc",
+    "shell/browser/notifications/win/notification_presenter_win7.h",
    "shell/browser/notifications/win/win32_desktop_notifications/common.h",
    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc",
    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h",
@@ -296,6 +300,10 @@ filenames = {
    "shell/browser/ui/certificate_trust.h",
    "shell/browser/ui/certificate_trust_mac.mm",
    "shell/browser/ui/certificate_trust_win.cc",
+    "shell/browser/ui/cocoa/NSColor+Hex.h",
+    "shell/browser/ui/cocoa/NSColor+Hex.mm",
+    "shell/browser/ui/cocoa/NSString+ANSI.h",
+    "shell/browser/ui/cocoa/NSString+ANSI.mm",
    "shell/browser/ui/cocoa/atom_bundle_mover.h",
    "shell/browser/ui/cocoa/atom_bundle_mover.mm",
    "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h",
@@ -304,10 +312,10 @@ filenames = {
    "shell/browser/ui/cocoa/atom_menu_controller.mm",
    "shell/browser/ui/cocoa/atom_native_widget_mac.h",
    "shell/browser/ui/cocoa/atom_native_widget_mac.mm",
-    "shell/browser/ui/cocoa/atom_ns_window_delegate.h",
-    "shell/browser/ui/cocoa/atom_ns_window_delegate.mm",
    "shell/browser/ui/cocoa/atom_ns_window.h",
    "shell/browser/ui/cocoa/atom_ns_window.mm",
+    "shell/browser/ui/cocoa/atom_ns_window_delegate.h",
+    "shell/browser/ui/cocoa/atom_ns_window_delegate.mm",
    "shell/browser/ui/cocoa/atom_preview_item.h",
    "shell/browser/ui/cocoa/atom_preview_item.mm",
    "shell/browser/ui/cocoa/atom_touch_bar.h",
@@ -316,10 +324,6 @@ filenames = {
    "shell/browser/ui/cocoa/delayed_native_view_host.h",
    "shell/browser/ui/cocoa/event_dispatching_window.h",
    "shell/browser/ui/cocoa/event_dispatching_window.mm",
-    "shell/browser/ui/cocoa/NSColor+Hex.h",
-    "shell/browser/ui/cocoa/NSColor+Hex.mm",
-    "shell/browser/ui/cocoa/NSString+ANSI.h",
-    "shell/browser/ui/cocoa/NSString+ANSI.mm",
    "shell/browser/ui/cocoa/root_view_mac.h",
    "shell/browser/ui/cocoa/root_view_mac.mm",
    "shell/browser/ui/cocoa/views_delegate_mac.h",
@@ -331,30 +335,30 @@ filenames = {
    "shell/browser/ui/drag_util.h",
    "shell/browser/ui/drag_util_mac.mm",
    "shell/browser/ui/drag_util_views.cc",
-    "shell/browser/ui/file_dialog_gtk.cc",
    "shell/browser/ui/file_dialog.h",
+    "shell/browser/ui/file_dialog_gtk.cc",
    "shell/browser/ui/file_dialog_mac.mm",
    "shell/browser/ui/file_dialog_win.cc",
    "shell/browser/ui/inspectable_web_contents.cc",
-    "shell/browser/ui/inspectable_web_contents_delegate.h",
    "shell/browser/ui/inspectable_web_contents.h",
+    "shell/browser/ui/inspectable_web_contents_delegate.h",
    "shell/browser/ui/inspectable_web_contents_impl.cc",
    "shell/browser/ui/inspectable_web_contents_impl.h",
+    "shell/browser/ui/inspectable_web_contents_view.h",
    "shell/browser/ui/inspectable_web_contents_view_delegate.cc",
    "shell/browser/ui/inspectable_web_contents_view_delegate.h",
-    "shell/browser/ui/inspectable_web_contents_view.h",
    "shell/browser/ui/inspectable_web_contents_view_mac.h",
    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
-    "shell/browser/ui/message_box_gtk.cc",
    "shell/browser/ui/message_box.h",
+    "shell/browser/ui/message_box_gtk.cc",
    "shell/browser/ui/message_box_mac.mm",
    "shell/browser/ui/message_box_win.cc",
    "shell/browser/ui/tray_icon.cc",
+    "shell/browser/ui/tray_icon.h",
    "shell/browser/ui/tray_icon_cocoa.h",
    "shell/browser/ui/tray_icon_cocoa.mm",
    "shell/browser/ui/tray_icon_gtk.cc",
    "shell/browser/ui/tray_icon_gtk.h",
-    "shell/browser/ui/tray_icon.h",
    "shell/browser/ui/tray_icon_observer.h",
    "shell/browser/ui/tray_icon_win.cc",
    "shell/browser/ui/views/atom_views_delegate.cc",
@@ -414,11 +418,11 @@ filenames = {
    "shell/browser/web_view_guest_delegate.h",
    "shell/browser/web_view_manager.cc",
    "shell/browser/web_view_manager.h",
+    "shell/browser/win/scoped_hstring.cc",
+    "shell/browser/win/scoped_hstring.h",
    "shell/browser/window_list.cc",
    "shell/browser/window_list.h",
    "shell/browser/window_list_observer.h",
-    "shell/browser/win/scoped_hstring.cc",
-    "shell/browser/win/scoped_hstring.h",
    "shell/browser/zoom_level_delegate.cc",
    "shell/browser/zoom_level_delegate.h",
    "shell/common/api/atom_api_asar.cc",
@@ -433,9 +437,14 @@ filenames = {
    "shell/common/api/atom_api_native_image_mac.mm",
    "shell/common/api/atom_api_shell.cc",
    "shell/common/api/atom_api_v8_util.cc",
+    "shell/common/api/constructor.h",
    "shell/common/api/electron_bindings.cc",
    "shell/common/api/electron_bindings.h",
+    "shell/common/api/event_emitter_caller_deprecated.cc",
+    "shell/common/api/event_emitter_caller_deprecated.h",
    "shell/common/api/features.cc",
+    "shell/common/api/locker.cc",
+    "shell/common/api/locker.h",
    "shell/common/application_info.cc",
    "shell/common/application_info.h",
    "shell/common/application_info_linux.cc",
@@ -467,13 +476,8 @@ filenames = {
    "shell/common/crash_reporter/win/crash_service_main.h",
    "shell/common/deprecate_util.cc",
    "shell/common/deprecate_util.h",
-    "shell/common/gin_converters/accelerator_converter.cc",
-    "shell/common/gin_converters/accelerator_converter.h",
-    "shell/common/gin_converters/blink_converter.cc",
-    "shell/common/gin_converters/blink_converter.h",
+    "shell/common/gin_converters/blink_converter_gin_adapter.h",
    "shell/common/gin_converters/callback_converter.h",
-    "shell/common/gin_converters/content_converter.cc",
-    "shell/common/gin_converters/content_converter.h",
    "shell/common/gin_converters/file_dialog_converter.cc",
    "shell/common/gin_converters/file_dialog_converter.h",
    "shell/common/gin_converters/file_path_converter.h",
@@ -488,46 +492,56 @@ filenames = {
    "shell/common/gin_converters/net_converter.cc",
    "shell/common/gin_converters/net_converter.h",
    "shell/common/gin_converters/std_converter.h",
-    "shell/common/gin_converters/value_converter.cc",
-    "shell/common/gin_converters/value_converter.h",
+    "shell/common/gin_converters/value_converter_gin_adapter.h",
    "shell/common/gin_helper/arguments.cc",
    "shell/common/gin_helper/arguments.h",
    "shell/common/gin_helper/callback.cc",
    "shell/common/gin_helper/callback.h",
-    "shell/common/gin_helper/constructor.h",
    "shell/common/gin_helper/destroyable.cc",
    "shell/common/gin_helper/destroyable.h",
    "shell/common/gin_helper/dictionary.h",
    "shell/common/gin_helper/error_thrower.cc",
    "shell/common/gin_helper/error_thrower.h",
-    "shell/common/gin_helper/event_emitter_caller.cc",
-    "shell/common/gin_helper/event_emitter_caller.h",
    "shell/common/gin_helper/event_emitter.cc",
    "shell/common/gin_helper/event_emitter.h",
+    "shell/common/gin_helper/event_emitter_caller.cc",
+    "shell/common/gin_helper/event_emitter_caller.h",
    "shell/common/gin_helper/function_template.cc",
    "shell/common/gin_helper/function_template.h",
-    "shell/common/gin_helper/locker.cc",
-    "shell/common/gin_helper/locker.h",
    "shell/common/gin_helper/object_template_builder.cc",
    "shell/common/gin_helper/object_template_builder.h",
-    "shell/common/gin_helper/persistent_dictionary.cc",
-    "shell/common/gin_helper/persistent_dictionary.h",
-    "shell/common/gin_helper/promise.h",
-    "shell/common/gin_helper/promise.cc",
-    "shell/common/gin_helper/trackable_object.cc",
-    "shell/common/gin_helper/trackable_object.h",
-    "shell/common/gin_helper/wrappable.cc",
-    "shell/common/gin_helper/wrappable.h",
-    "shell/common/gin_helper/wrappable_base.h",
    "shell/common/heap_snapshot.cc",
    "shell/common/heap_snapshot.h",
+    "shell/common/key_weak_map.h",
    "shell/common/keyboard_util.cc",
    "shell/common/keyboard_util.h",
-    "shell/common/key_weak_map.h",
    "shell/common/mac/main_application_bundle.h",
    "shell/common/mac/main_application_bundle.mm",
    "shell/common/mouse_util.cc",
    "shell/common/mouse_util.h",
+    "shell/common/native_mate_converters/accelerator_converter.cc",
+    "shell/common/native_mate_converters/accelerator_converter.h",
+    "shell/common/native_mate_converters/blink_converter.cc",
+    "shell/common/native_mate_converters/blink_converter.h",
+    "shell/common/native_mate_converters/callback_converter_deprecated.cc",
+    "shell/common/native_mate_converters/callback_converter_deprecated.h",
+    "shell/common/native_mate_converters/content_converter.cc",
+    "shell/common/native_mate_converters/content_converter.h",
+    "shell/common/native_mate_converters/file_dialog_converter.h",
+    "shell/common/native_mate_converters/file_path_converter.h",
+    "shell/common/native_mate_converters/gurl_converter.h",
+    "shell/common/native_mate_converters/image_converter.h",
+    "shell/common/native_mate_converters/native_window_converter.h",
+    "shell/common/native_mate_converters/net_converter.h",
+    "shell/common/native_mate_converters/network_converter.cc",
+    "shell/common/native_mate_converters/network_converter.h",
+    "shell/common/native_mate_converters/once_callback.h",
+    "shell/common/native_mate_converters/string16_converter.h",
+    "shell/common/native_mate_converters/ui_base_types_converter.h",
+    "shell/common/native_mate_converters/v8_value_converter.cc",
+    "shell/common/native_mate_converters/v8_value_converter.h",
+    "shell/common/native_mate_converters/value_converter.cc",
+    "shell/common/native_mate_converters/value_converter.h",
    "shell/common/node_bindings.cc",
    "shell/common/node_bindings.h",
    "shell/common/node_bindings_linux.cc",
@@ -545,10 +559,10 @@ filenames = {
    "shell/common/platform_util_linux.cc",
    "shell/common/platform_util_mac.mm",
    "shell/common/platform_util_win.cc",
+    "shell/common/promise_util.cc",
+    "shell/common/promise_util.h",
    "shell/common/skia_util.cc",
    "shell/common/skia_util.h",
-    "shell/common/v8_value_converter.cc",
-    "shell/common/v8_value_converter.h",
    "shell/renderer/api/atom_api_context_bridge.cc",
    "shell/renderer/api/atom_api_context_bridge.h",
    "shell/renderer/api/atom_api_renderer_ipc.cc",
@@ -559,18 +573,16 @@ filenames = {
    "shell/renderer/api/context_bridge/render_frame_context_bridge_store.h",
    "shell/renderer/atom_autofill_agent.cc",
    "shell/renderer/atom_autofill_agent.h",
-    "shell/renderer/atom_renderer_client.cc",
-    "shell/renderer/atom_renderer_client.h",
    "shell/renderer/atom_render_frame_observer.cc",
    "shell/renderer/atom_render_frame_observer.h",
+    "shell/renderer/atom_renderer_client.cc",
+    "shell/renderer/atom_renderer_client.h",
    "shell/renderer/atom_sandboxed_renderer_client.cc",
    "shell/renderer/atom_sandboxed_renderer_client.h",
    "shell/renderer/content_settings_observer.cc",
    "shell/renderer/content_settings_observer.h",
    "shell/renderer/electron_api_service_impl.cc",
    "shell/renderer/electron_api_service_impl.h",
-    "shell/renderer/electron_renderer_pepper_host_factory.cc",
-    "shell/renderer/electron_renderer_pepper_host_factory.h",
    "shell/renderer/guest_view_container.cc",
    "shell/renderer/guest_view_container.h",
    "shell/renderer/renderer_client_base.cc",
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -116,7 +116,7 @@ BrowserWindow.getFocusedWindow = () => {

 BrowserWindow.fromWebContents = (webContents) => {
  for (const window of BrowserWindow.getAllWindows()) {
-    if (window.webContents && window.webContents.equal(webContents)) return window
+    if (window.webContents.equal(webContents)) return window
  }

  return null
--- a/lib/browser/api/net.js
+++ b/lib/browser/api/net.js
@@ -398,7 +398,7 @@ class ClientRequest extends Writable {
          this.emit('redirect', statusCode, newMethod, newUrl, headers)
        } finally {
          this._followRedirectCb = null
-          if (!_followRedirect) {
+          if (!_followRedirect && !this._aborted) {
            this._die(new Error('Redirect was cancelled'))
          }
        }
--- a/lib/browser/api/touch-bar.js
+++ b/lib/browser/api/touch-bar.js
@@ -196,7 +196,6 @@ TouchBar.TouchBarButton = class TouchBarButton extends TouchBarItem {
    this._addLiveProperty('backgroundColor', config.backgroundColor)
    this._addLiveProperty('icon', config.icon)
    this._addLiveProperty('iconPosition', config.iconPosition)
-    this._addLiveProperty('enabled', typeof config.enabled !== 'boolean' ? true : config.enabled)
    if (typeof config.click === 'function') {
      this._addImmutableProperty('onInteraction', () => {
        config.click()
--- a/Show More
+++ b/Show More