Bump v9.0.0-nightly.20200201

* chore: bump chromium in DEPS to 68d7ef9b31f3f164a967109212e84a8d756cc80f

* Update patches

* Update location of file_info.h

* Update sysroots

* chore: bump chromium in DEPS to 47114394b1c8a35438d19da7538142380551a2ce

* Update patches

* ci: update docker image to pickup new ia32 dep

* Skip .info files in dist.zip

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>

.circleci/config.yml

@@ -53,7 +53,7 @@ parameters:
 # Build machines configs.
 docker-image: &docker-image
   docker:
-    - image: electronjs/build:697b894f36d127155e020f4e8ad4b2e5f6a09613
+    - image: electronjs/build:d09fd95029bd8c1c73069888231b29688ef385ed
 
 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:
@@ -81,6 +81,7 @@ env-release-build: &env-release-build
   GN_CONFIG: //electron/build/args/release.gn
   STRIP_BINARIES: true
   GENERATE_SYMBOLS: true
+  CHECK_DIST_MANIFEST: '1'
 
 env-headless-testing: &env-headless-testing
   DISPLAY: ':99.0'
@@ -151,6 +152,14 @@ env-ninja-status: &env-ninja-status
 env-disable-run-as-node: &env-disable-run-as-node
   GN_BUILDFLAG_ARGS: 'enable_run_as_node = false'
 
+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:
@@ -210,6 +219,15 @@ step-setup-env-for-build: &step-setup-env-for-build
     command: |
       # To find `gn` executable.
       echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
+      # Setup Goma if applicable
+      if [ ! -z "$RAW_GOMA_AUTH" ] && [ "`uname`" == "Linux" ]; then
+        export USE_SCCACHE="false"
+        echo 'export USE_SCCACHE=false' >> $BASH_ENV
+        echo 'export USE_GOMA=true' >> $BASH_ENV
+        echo 'export NUMBER_OF_NINJA_PROCESSES=300' >> $BASH_ENV
+        echo $RAW_GOMA_AUTH > ~/.goma_oauth2_config
+        src/electron/external_binaries/goma/goma_ctl.py ensure_start
+      fi
 
       if [ "$USE_SCCACHE" == "true" ]; then
         # https://github.com/mozilla/sccache
@@ -252,10 +270,11 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
 
 step-delete-git-directories: &step-delete-git-directories
   run:
-    name: Delete src/.git directory on MacOS to free space
+    name: Delete all .git directories under src on MacOS to free space
     command: |
       if [ "`uname`" == "Darwin" ]; then
-        sudo rm -rf src/.git
+        cd src
+        ( find . -type d -name ".git" ) | xargs rm -rf
       fi
 
 # On macOS the yarn install command during gclient sync was run on a linux
@@ -310,7 +329,11 @@ step-gn-gen-default: &step-gn-gen-default
     name: Default GN gen
     command: |
       cd src
-      gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      if [ "$USE_GOMA" == "true" ]; then
+        gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"//electron/build/args/goma.gn\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      else
+        gn gen out/Default --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      fi
 
 step-gn-check: &step-gn-check
   run:
@@ -329,6 +352,12 @@ 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
 
@@ -344,9 +373,18 @@ step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
   run:
     name: Strip electron binaries
     command: |
-      if [ "$STRIP_BINARIES" == "true" ] && [ "`uname`" != "Darwin" ]; then
+      if [ "$STRIP_BINARIES" == "true" ] && [ "`uname`" == "Linux" ]; then
+        if [ x"$TARGET_ARCH" == x ]; then
+          target_cpu=x64
+        elif [ "$TARGET_ARCH" == "ia32" ]; then
+          target_cpu=x86
+        else
+          target_cpu="$TARGET_ARCH"
+        fi
         cd src
-        electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH"
+        electron/script/copy-debug-symbols.py --target-cpu="$target_cpu" --out-dir=out/Default/debug --compress
+        electron/script/strip-binaries.py --target-cpu="$target_cpu"
+        electron/script/add-debug-link.py --target-cpu="$target_cpu" --debug-dir=out/Default/debug
       fi
 
 step-electron-dist-build: &step-electron-dist-build
@@ -420,6 +458,9 @@ step-electron-publish: &step-electron-publish
   run:
     name: Publish Electron Dist
     command: |
+      if [ "`uname`" == "Darwin" ]; then
+        rm -rf src/out/Default/obj
+      fi
       cd src/electron
       if [ "$UPLOAD_TO_S3" == "1" ]; then
         echo 'Uploading Electron release distribution to S3'
@@ -471,7 +512,11 @@ step-ffmpeg-gn-gen: &step-ffmpeg-gn-gen
     name: ffmpeg GN gen
     command: |
       cd src
-      gn gen out/ffmpeg --args='import("//electron/build/args/ffmpeg.gn") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS"
+      if [ "$USE_GOMA" == "true" ]; then
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") import(\"//electron/build/args/goma.gn\") $GN_EXTRA_ARGS"
+      else
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS"
+      fi
 
 step-ffmpeg-build: &step-ffmpeg-build
   run:
@@ -509,17 +554,21 @@ step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
 
 step-show-sccache-stats: &step-show-sccache-stats
   run:
-    name: Check sccache stats after build
+    name: Check sccache/goma stats after build
     command: |
       if [ "$SCCACHE_PATH" != "" ]; then
         $SCCACHE_PATH -s
       fi
+      if [ "$USE_GOMA" == "true" ]; then
+        src/electron/external_binaries/goma/goma_ctl.py stat
+      fi
 
 step-mksnapshot-build: &step-mksnapshot-build
   run:
     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
@@ -527,6 +576,7 @@ 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
@@ -644,7 +694,7 @@ step-ninja-report: &step-ninja-report
 step-generate-deps-hash: &step-generate-deps-hash
   run:
     name: Generate DEPS Hash
-    command: node src/electron/script/generate-deps-hash.js
+    command: node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
 
 step-touch-sync-done: &step-touch-sync-done
   run:
@@ -656,10 +706,8 @@ 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:
-      - v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
+      - v7-src-cache-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache
 
 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@@ -670,10 +718,18 @@ step-maybe-restore-git-cache: &step-maybe-restore-git-cache
     paths:
       - ~/.gclient-cache
     keys:
-      - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-      - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}
+      - v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+      - v2-gclient-cache-{{ 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
@@ -688,9 +744,16 @@ step-save-git-cache: &step-save-git-cache
   save_cache:
     paths:
       - ~/.gclient-cache
-    key: v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+    key: v2-gclient-cache-{{ 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
@@ -699,7 +762,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
+    command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
 
 # Mark the sync as done for future cache saving
 step-mark-sync-done: &step-mark-sync-done
@@ -722,8 +785,8 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
 step-save-src-cache: &step-save-src-cache
   save_cache:
     paths:
-      - ./src
-    key: v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
+      - /portal
+    key: v7-src-cache-{{ checksum "/portal/src/electron/.depshash" }}
     name: Persisting src cache
 
 # Check for doc only change
@@ -816,40 +879,6 @@ 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
@@ -864,7 +893,7 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
 
     - *step-generate-deps-hash
     - *step-touch-sync-done
-    - *step-maybe-restore-src-cache
+    - 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
@@ -879,6 +908,13 @@ 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
 
@@ -903,8 +939,8 @@ steps-electron-build: &steps-electron-build
     - *step-get-more-space-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync-on-mac
-    - *step-gn-gen-default
     - *step-delete-git-directories
+    - *step-gn-gen-default
 
     # Electron app
     - *step-electron-build
@@ -950,89 +986,6 @@ 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-gn-gen-default
-    - *step-delete-git-directories
-
-    # Electron app
-    - *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.
-    - *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
@@ -1046,7 +999,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
-    - *step-maybe-restore-src-cache
+    - 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
@@ -1081,8 +1034,9 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-get-more-space-on-mac
     - *step-gclient-sync
     - *step-setup-env-for-build
-    - *step-gn-gen-default
     - *step-delete-git-directories
+    - *step-minimize-workspace-size-from-checkout
+    - *step-gn-gen-default
 
     # Electron app
     - *step-electron-build
@@ -1271,6 +1225,202 @@ 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
+      use-out-cache:
+        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
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *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
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *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.
@@ -1293,7 +1443,12 @@ jobs:
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    <<: *steps-checkout-fast
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
 
   linux-checkout-and-save-cache:
     <<: *machine-linux-2xlarge
@@ -1307,26 +1462,45 @@ jobs:
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
-    <<: *steps-checkout-fast
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
 
   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-checkout-fast
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
 
   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-checkout-fast
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
 
   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
 
@@ -1339,7 +1513,11 @@ jobs:
       <<: *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
+    steps:
+      - electron-build:
+          persist: true
+          checkout: true
+          use-out-cache: false
 
   linux-x64-testing-no-run-as-node:
     <<: *machine-linux-2xlarge
@@ -1350,7 +1528,11 @@ 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-with-inline-checkout-for-tests
+    steps:
+      - electron-build:
+          persist: false
+          checkout: true
+          use-out-cache: false
 
   linux-x64-testing-gn-check:
     <<: *machine-linux-medium
@@ -1397,7 +1579,11 @@ jobs:
       <<: *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
+    steps:
+      - electron-build:
+          persist: true
+          checkout: true
+          use-out-cache: false
 
   linux-ia32-chromedriver:
     <<: *machine-linux-medium
@@ -1428,6 +1614,7 @@ jobs:
       <<: *env-ia32
       <<: *env-release-build
       <<: *env-enable-sccache
+      <<: *env-32bit-release
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
 
@@ -1441,7 +1628,11 @@ jobs:
       <<: *env-ninja-status
       TRIGGER_ARM_TEST: true
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    <<: *steps-electron-build-with-inline-checkout-for-tests
+    steps:
+      - electron-build:
+          persist: false
+          checkout: true
+          use-out-cache: false
 
   linux-arm-chromedriver:
     <<: *machine-linux-medium
@@ -1471,6 +1662,7 @@ jobs:
       <<: *env-arm
       <<: *env-release-build
       <<: *env-enable-sccache
+      <<: *env-32bit-release
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
@@ -1485,7 +1677,11 @@ jobs:
       <<: *env-ninja-status
       TRIGGER_ARM_TEST: true
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    <<: *steps-electron-build-with-inline-checkout-for-tests
+    steps:
+      - electron-build:
+          persist: false
+          checkout: true
+          use-out-cache: false
 
   linux-arm64-testing-gn-check:
     <<: *machine-linux-medium
@@ -1534,7 +1730,14 @@ jobs:
       <<: *env-testing-build
       <<: *env-enable-sccache
       <<: *env-ninja-status
-    <<: *steps-electron-build
+      <<: *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
 
   osx-testing-gn-check:
     <<: *machine-mac
@@ -1579,7 +1782,14 @@ jobs:
       <<: *env-testing-build
       <<: *env-enable-sccache
       <<: *env-ninja-status
-    <<: *steps-electron-build
+      <<: *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
 
   mas-testing-gn-check:
     <<: *machine-mac
@@ -1970,7 +2180,7 @@ workflows:
 
       - osx-testing:
           requires:
-            - mac-checkout-fast
+            - mac-checkout-and-save-cache
 
       - osx-testing-gn-check:
           requires:
@@ -1982,7 +2192,7 @@ workflows:
 
       - mas-testing:
           requires:
-            - mac-checkout-fast
+            - mac-checkout-and-save-cache
 
       - mas-testing-gn-check:
           requires:

.github/ISSUE_TEMPLATE/security_report.md

@@ -1,10 +0,0 @@
----
-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**.

.gitignore

@@ -65,3 +65,4 @@ ts-gen
 
 # Used to accelerate CI builds
 .depshash
+.depshash-target

BUILD.gn

@@ -79,15 +79,11 @@ npm_action("build_electron_definitions") {
   args = [ rebase_path("$target_gen_dir/tsc/typings/electron.d.ts") ]
   inputs = auto_filenames.api_docs + [ "yarn.lock" ]
 
-  outputs = [
-    "$target_gen_dir/tsc/typings/electron.d.ts",
-  ]
+  outputs = [ "$target_gen_dir/tsc/typings/electron.d.ts" ]
 }
 
 webpack_build("electron_browser_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
 
   inputs = auto_filenames.browser_bundle_deps
 
@@ -96,9 +92,7 @@ webpack_build("electron_browser_bundle") {
 }
 
 webpack_build("electron_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
 
   inputs = auto_filenames.renderer_bundle_deps
 
@@ -107,9 +101,7 @@ webpack_build("electron_renderer_bundle") {
 }
 
 webpack_build("electron_worker_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
 
   inputs = auto_filenames.worker_bundle_deps
 
@@ -118,9 +110,7 @@ webpack_build("electron_worker_bundle") {
 }
 
 webpack_build("electron_sandboxed_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
 
   inputs = auto_filenames.sandbox_bundle_deps
 
@@ -129,9 +119,7 @@ webpack_build("electron_sandboxed_renderer_bundle") {
 }
 
 webpack_build("electron_isolated_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
 
   inputs = auto_filenames.isolated_bundle_deps
 
@@ -140,9 +128,7 @@ webpack_build("electron_isolated_renderer_bundle") {
 }
 
 webpack_build("electron_content_script_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
 
   inputs = auto_filenames.content_script_bundle_deps
 
@@ -155,9 +141,7 @@ copy("atom_js2c_copy") {
     "lib/common/asar.js",
     "lib/common/asar_init.js",
   ]
-  outputs = [
-    "$target_gen_dir/js2c/{{source_file_part}}",
-  ]
+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
 }
 
 action("atom_js2c") {
@@ -173,11 +157,11 @@ action("atom_js2c") {
 
   webpack_sources = [
     "$target_gen_dir/js2c/browser_init.js",
-    "$target_gen_dir/js2c/renderer_init.js",
-    "$target_gen_dir/js2c/worker_init.js",
     "$target_gen_dir/js2c/content_script_bundle.js",
     "$target_gen_dir/js2c/isolated_bundle.js",
+    "$target_gen_dir/js2c/renderer_init.js",
     "$target_gen_dir/js2c/sandbox_bundle.js",
+    "$target_gen_dir/js2c/worker_init.js",
   ]
 
   sources = webpack_sources + [
@@ -186,9 +170,7 @@ action("atom_js2c") {
             ]
 
   inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
-  outputs = [
-    "$root_gen_dir/atom_natives.cc",
-  ]
+  outputs = [ "$root_gen_dir/atom_natives.cc" ]
 
   script = "tools/js2c.py"
   args = [ rebase_path("//third_party/electron_node") ] +
@@ -199,9 +181,7 @@ action("atom_js2c") {
 target_gen_default_app_js = "$target_gen_dir/js/default_app"
 
 typescript_build("default_app_js") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
   type_root = rebase_path("$target_gen_dir/tsc/electron/typings")
 
   sources = filenames.default_app_ts_sources
@@ -213,16 +193,12 @@ typescript_build("default_app_js") {
 
 copy("default_app_static") {
   sources = filenames.default_app_static_sources
-  outputs = [
-    "$target_gen_default_app_js/{{source}}",
-  ]
+  outputs = [ "$target_gen_default_app_js/{{source}}" ]
 }
 
 copy("default_app_octicon_deps") {
   sources = filenames.default_app_octicon_sources
-  outputs = [
-    "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}",
-  ]
+  outputs = [ "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}" ]
 }
 
 asar("default_app_asar") {
@@ -236,9 +212,7 @@ asar("default_app_asar") {
   sources = get_target_outputs(":default_app_js") +
             get_target_outputs(":default_app_static") +
             get_target_outputs(":default_app_octicon_deps")
-  outputs = [
-    "$root_out_dir/resources/default_app.asar",
-  ]
+  outputs = [ "$root_out_dir/resources/default_app.asar" ]
 }
 
 grit("resources") {
@@ -256,20 +230,14 @@ grit("resources") {
     "target_gen_dir=" + rebase_path(target_gen_dir, root_build_dir),
   ]
 
-  deps = [
-    ":copy_shell_devtools_discovery_page",
-  ]
+  deps = [ ":copy_shell_devtools_discovery_page" ]
 
   output_dir = "$target_gen_dir"
 }
 
 copy("copy_shell_devtools_discovery_page") {
-  sources = [
-    "//content/shell/resources/shell_devtools_discovery_page.html",
-  ]
-  outputs = [
-    "$target_gen_dir/shell_devtools_discovery_page.html",
-  ]
+  sources = [ "//content/shell/resources/shell_devtools_discovery_page.html" ]
+  outputs = [ "$target_gen_dir/shell_devtools_discovery_page.html" ]
 }
 
 if (is_linux) {
@@ -315,9 +283,7 @@ source_set("manifests") {
 npm_action("electron_version_args") {
   script = "generate-version-json"
 
-  outputs = [
-    "$target_gen_dir/electron_version.args",
-  ]
+  outputs = [ "$target_gen_dir/electron_version.args" ]
 
   args = rebase_path(outputs)
 
@@ -328,9 +294,7 @@ npm_action("electron_version_args") {
 }
 
 templated_file("electron_version_header") {
-  deps = [
-    ":electron_version_args",
-  ]
+  deps = [ ":electron_version_args" ]
 
   template = "build/templates/electron_version.tmpl"
   output = "$target_gen_dir/electron_version.h"
@@ -354,7 +318,7 @@ source_set("electron_lib") {
     ":resources",
     "buildflags",
     "chromium_src:chrome",
-    "native_mate",
+    "chromium_src:chrome_spellchecker",
     "shell/common/api:mojo",
     "//base:base_static",
     "//base/allocator:buildflags",
@@ -383,12 +347,10 @@ source_set("electron_lib") {
     "//media/mojo/mojom",
     "//net:extras",
     "//net:net_resources",
-    "//net:net_with_v8",
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/shared_impl",
     "//printing/buildflags",
-    "//services/audio/public/mojom:constants",
     "//services/device/public/cpp/geolocation",
     "//services/device/public/mojom",
     "//services/proxy_resolver:lib",
@@ -400,7 +362,7 @@ source_set("electron_lib") {
     "//third_party/electron_node:node_lib",
     "//third_party/leveldatabase",
     "//third_party/libyuv",
-    "//third_party/webrtc_overrides:init_webrtc",
+    "//third_party/webrtc_overrides:webrtc_component",
     "//third_party/widevine/cdm:headers",
     "//ui/base/idle",
     "//ui/events:dom_keycode_converter",
@@ -482,10 +444,6 @@ source_set("electron_lib") {
     ]
   }
 
-  if (enable_builtin_spellchecker) {
-    deps += [ "chromium_src:chrome_spellchecker" ]
-  }
-
   if (is_mac) {
     deps += [
       "//components/remote_cocoa/app_shim",
@@ -536,7 +494,7 @@ source_set("electron_lib") {
     deps += [
       ":libnotify_loader",
       "//build/config/linux/gtk",
-      "//chrome/browser/ui/libgtkui",
+      "//chrome/browser/ui/gtk",
       "//dbus",
       "//device/bluetooth",
       "//third_party/breakpad:client",
@@ -668,9 +626,11 @@ source_set("electron_lib") {
       "shell/renderer/printing/print_render_frame_helper_delegate.cc",
       "shell/renderer/printing/print_render_frame_helper_delegate.h",
     ]
+    deps += [ "//components/printing/common:mojo_interfaces" ]
   }
 
-  public_deps += [ "shell/common/extensions/api:extensions_features" ]
+  deps += [ "shell/common/extensions/api:extensions_features" ]
+  deps += [ "shell/common/extensions/api" ]
   deps += [
     "//components/pref_registry",
     "//components/user_prefs",
@@ -718,15 +678,11 @@ if (is_mac) {
   electron_version = read_file("ELECTRON_VERSION", "trim string")
 
   mac_xib_bundle_data("electron_xibs") {
-    sources = [
-      "shell/common/resources/mac/MainMenu.xib",
-    ]
+    sources = [ "shell/common/resources/mac/MainMenu.xib" ]
   }
 
   bundle_data("electron_framework_resources") {
-    public_deps = [
-      ":packed_resources",
-    ]
+    public_deps = [ ":packed_resources" ]
     sources = []
     if (icu_use_data_file) {
       sources += [ "$root_out_dir/icudtl.dat" ]
@@ -741,9 +697,7 @@ if (is_mac) {
         sources += [ "$root_out_dir/snapshot_blob.bin" ]
       }
     }
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
   }
 
   if (!is_component_build) {
@@ -754,9 +708,7 @@ if (is_mac) {
         sources += [ "$root_out_dir/libffmpeg.dylib" ]
         public_deps += [ "//third_party/ffmpeg:ffmpeg" ]
       }
-      outputs = [
-        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
-      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
     }
   } else {
     group("electron_framework_libraries") {
@@ -769,12 +721,8 @@ if (is_mac) {
         "$root_out_dir/egl_intermediates/libEGL.dylib",
         "$root_out_dir/egl_intermediates/libGLESv2.dylib",
       ]
-      outputs = [
-        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
-      ]
-      public_deps = [
-        "//ui/gl:angle_library_copy",
-      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      public_deps = [ "//ui/gl:angle_library_copy" ]
     }
 
     # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
@@ -783,42 +731,28 @@ if (is_mac) {
         "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
         "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
       ]
-      outputs = [
-        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
-      ]
-      public_deps = [
-        "//ui/gl:swiftshader_library_copy",
-      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      public_deps = [ "//ui/gl:swiftshader_library_copy" ]
     }
   }
   group("electron_angle_library") {
     if (use_egl) {
-      deps = [
-        ":electron_angle_binaries",
-      ]
+      deps = [ ":electron_angle_binaries" ]
     }
   }
 
   group("electron_swiftshader_library") {
     if (use_egl) {
-      deps = [
-        ":electron_swiftshader_binaries",
-      ]
+      deps = [ ":electron_swiftshader_binaries" ]
     }
   }
 
   bundle_data("electron_crashpad_helper") {
-    sources = [
-      "$root_out_dir/crashpad_handler",
-    ]
+    sources = [ "$root_out_dir/crashpad_handler" ]
 
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
 
-    public_deps = [
-      "//third_party/crashpad/crashpad/handler:crashpad_handler",
-    ]
+    public_deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
   }
 
   mac_framework_bundle("electron_framework") {
@@ -876,9 +810,7 @@ if (is_mac) {
       assert(defined(invoker.helper_name_suffix))
 
       output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [
-        ":electron_framework+link",
-      ]
+      deps = [ ":electron_framework+link" ]
       if (!is_mas_build) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
@@ -912,9 +844,7 @@ if (is_mac) {
   }
 
   bundle_data("electron_app_framework_bundle_data") {
-    sources = [
-      "$root_out_dir/$electron_framework_name.framework",
-    ]
+    sources = [ "$root_out_dir/$electron_framework_name.framework" ]
     if (!is_mas_build) {
       sources += [
         "external_binaries/Mantle.framework",
@@ -922,12 +852,8 @@ if (is_mac) {
         "external_binaries/Squirrel.framework",
       ]
     }
-    outputs = [
-      "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}",
-    ]
-    public_deps = [
-      ":electron_framework+link",
-    ]
+    outputs = [ "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}" ]
+    public_deps = [ ":electron_framework+link" ]
 
     foreach(helper_params, content_mac_helpers) {
       sources +=
@@ -947,15 +873,10 @@ if (is_mac) {
   }
 
   bundle_data("electron_login_helper_app") {
-    public_deps = [
-      ":electron_login_helper",
-    ]
-    sources = [
-      "$root_out_dir/$electron_login_helper_name.app",
-    ]
-    outputs = [
-      "{{bundle_contents_dir}}/Library/LoginItems/{{source_file_part}}",
-    ]
+    public_deps = [ ":electron_login_helper" ]
+    sources = [ "$root_out_dir/$electron_login_helper_name.app" ]
+    outputs =
+        [ "{{bundle_contents_dir}}/Library/LoginItems/{{source_file_part}}" ]
   }
 
   action("electron_app_lproj_dirs") {
@@ -970,15 +891,9 @@ if (is_mac) {
 
   foreach(locale, locales_as_mac_outputs) {
     bundle_data("electron_app_strings_${locale}_bundle_data") {
-      sources = [
-        "$target_gen_dir/app_infoplist_strings/$locale.lproj",
-      ]
-      outputs = [
-        "{{bundle_resources_dir}}/$locale.lproj",
-      ]
-      public_deps = [
-        ":electron_app_lproj_dirs",
-      ]
+      sources = [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
+      outputs = [ "{{bundle_resources_dir}}/$locale.lproj" ]
+      public_deps = [ ":electron_app_lproj_dirs" ]
     }
   }
   group("electron_app_strings_bundle_data") {
@@ -997,9 +912,7 @@ if (is_mac) {
       "$root_out_dir/resources/default_app.asar",
       "shell/browser/resources/mac/electron.icns",
     ]
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
   }
 
   mac_app_bundle("electron_app") {
@@ -1030,9 +943,7 @@ if (is_mac) {
       binary = "$root_out_dir/$electron_framework_name.framework/Versions/$electron_framework_version/$electron_framework_name"
       symbol_dir = "$root_out_dir/breakpad_symbols"
       dsym_file = "$root_out_dir/$electron_framework_name.dSYM/Contents/Resources/DWARF/$electron_framework_name"
-      deps = [
-        ":electron_framework",
-      ]
+      deps = [ ":electron_framework" ]
     }
 
     foreach(helper_params, content_mac_helpers) {
@@ -1043,9 +954,7 @@ if (is_mac) {
         binary = "$root_out_dir/$electron_helper_name${_helper_suffix}.app/Contents/MacOS/$electron_helper_name${_helper_suffix}"
         symbol_dir = "$root_out_dir/breakpad_symbols"
         dsym_file = "$root_out_dir/$electron_helper_name${_helper_suffix}.dSYM/Contents/Resources/DWARF/$electron_helper_name${_helper_suffix}"
-        deps = [
-          ":electron_helper_app_${_helper_target}",
-        ]
+        deps = [ ":electron_helper_app_${_helper_target}" ]
       }
     }
 
@@ -1053,18 +962,15 @@ if (is_mac) {
       binary = "$root_out_dir/$electron_product_name.app/Contents/MacOS/$electron_product_name"
       symbol_dir = "$root_out_dir/breakpad_symbols"
       dsym_file = "$root_out_dir/$electron_product_name.dSYM/Contents/Resources/DWARF/$electron_product_name"
-      deps = [
-        ":electron_app",
-      ]
+      deps = [ ":electron_app" ]
     }
 
     extract_symbols("swiftshader_egl_syms") {
       binary = "$root_out_dir/libswiftshader_libEGL.dylib"
       symbol_dir = "$root_out_dir/breakpad_symbols"
       dsym_file = "$root_out_dir/libswiftshader_libEGL.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libEGL.dylib"
-      deps = [
-        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
-      ]
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
     }
 
     extract_symbols("swiftshader_gles_syms") {
@@ -1080,9 +986,7 @@ if (is_mac) {
       binary = "$root_out_dir/crashpad_handler"
       symbol_dir = "$root_out_dir/breakpad_symbols"
       dsym_file = "$root_out_dir/crashpad_handler.dSYM/Contents/Resources/DWARF/crashpad_handler"
-      deps = [
-        "//third_party/crashpad/crashpad/handler:crashpad_handler",
-      ]
+      deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
     }
 
     group("electron_symbols") {
@@ -1143,9 +1047,7 @@ if (is_mac) {
       data += [ "$root_out_dir/resources/default_app.asar" ]
     }
 
-    public_deps = [
-      "//tools/v8_context_snapshot:v8_context_snapshot",
-    ]
+    public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
 
     if (is_win) {
       sources += [
@@ -1202,17 +1104,14 @@ if (is_mac) {
     extract_symbols("electron_app_symbols") {
       binary = "$root_out_dir/$electron_project_name$_target_executable_suffix"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [
-        ":electron_app",
-      ]
+      deps = [ ":electron_app" ]
     }
 
     extract_symbols("swiftshader_egl_symbols") {
       binary = "$root_out_dir/swiftshader/libEGL$_target_shared_library_suffix"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [
-        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
-      ]
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
     }
 
     extract_symbols("swiftshader_gles_symbols") {
@@ -1284,9 +1183,7 @@ template("dist_zip") {
 
   action(target_name) {
     script = "//electron/build/zip.py"
-    deps = [
-      ":$_runtime_deps_target",
-    ]
+    deps = [ ":$_runtime_deps_target" ]
     forward_variables_from(invoker,
                            [
                              "outputs",
@@ -1305,106 +1202,80 @@ template("dist_zip") {
 }
 
 copy("electron_license") {
-  sources = [
-    "LICENSE",
-  ]
-  outputs = [
-    "$root_build_dir/{{source_file_part}}",
-  ]
+  sources = [ "LICENSE" ]
+  outputs = [ "$root_build_dir/{{source_file_part}}" ]
 }
 copy("chromium_licenses") {
-  deps = [
-    "//components/resources:about_credits",
-  ]
-  sources = [
-    "$root_gen_dir/components/resources/about_credits.html",
-  ]
-  outputs = [
-    "$root_build_dir/LICENSES.chromium.html",
-  ]
+  deps = [ "//components/resources:about_credits" ]
+  sources = [ "$root_gen_dir/components/resources/about_credits.html" ]
+  outputs = [ "$root_build_dir/LICENSES.chromium.html" ]
 }
 
 group("licenses") {
   data_deps = [
-    ":electron_license",
     ":chromium_licenses",
+    ":electron_license",
   ]
 }
 
 copy("electron_version") {
-  sources = [
-    "ELECTRON_VERSION",
-  ]
-  outputs = [
-    "$root_build_dir/version",
-  ]
+  sources = [ "ELECTRON_VERSION" ]
+  outputs = [ "$root_build_dir/version" ]
 }
 
 dist_zip("electron_dist_zip") {
   data_deps = [
     ":electron_app",
-    ":licenses",
     ":electron_version",
+    ":licenses",
   ]
   if (is_linux) {
     data_deps += [ "//sandbox/linux:chrome_sandbox" ]
   }
-  outputs = [
-    "$root_build_dir/dist.zip",
-  ]
+  outputs = [ "$root_build_dir/dist.zip" ]
 }
 
 dist_zip("electron_ffmpeg_zip") {
-  data_deps = [
-    "//third_party/ffmpeg",
-  ]
-  outputs = [
-    "$root_build_dir/ffmpeg.zip",
-  ]
+  data_deps = [ "//third_party/ffmpeg" ]
+  outputs = [ "$root_build_dir/ffmpeg.zip" ]
 }
 
 dist_zip("electron_chromedriver_zip") {
   testonly = true
   data_deps = [
-    "//chrome/test/chromedriver",
     ":licenses",
+    "//chrome/test/chromedriver",
   ]
-  outputs = [
-    "$root_build_dir/chromedriver.zip",
-  ]
+  outputs = [ "$root_build_dir/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 = [
-    "//v8:mksnapshot($v8_snapshot_toolchain)",
-    "//tools/v8_context_snapshot:v8_context_snapshot_generator",
-    ":licenses",
-  ]
-  outputs = [
-    "$root_build_dir/mksnapshot.zip",
-  ]
+  data_deps = mksnapshot_deps
+  outputs = [ "$root_build_dir/mksnapshot.zip" ]
 }
 
 copy("hunspell_dictionaries") {
   sources = hunspell_dictionaries + hunspell_licenses
-  outputs = [
-    "$target_gen_dir/electron_hunspell/{{source_file_part}}",
-  ]
+  outputs = [ "$target_gen_dir/electron_hunspell/{{source_file_part}}" ]
 }
 
 dist_zip("hunspell_dictionaries_zip") {
-  data_deps = [
-    ":hunspell_dictionaries",
-  ]
+  data_deps = [ ":hunspell_dictionaries" ]
   flatten = true
 
-  outputs = [
-    "$root_build_dir/hunspell_dictionaries.zip",
-  ]
+  outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
 }
 
 group("electron") {
-  public_deps = [
-    ":electron_app",
-  ]
+  public_deps = [ ":electron_app" ]
 }

DEPS

@@ -6,14 +6,15 @@ gclient_gn_args = [
   'checkout_libaom',
   'checkout_nacl',
   'checkout_oculus_sdk',
-  'checkout_openxr'
+  'checkout_openxr',
+  'checkout_google_benchmark'
 ]
 
 vars = {
   'chromium_version':
-    'dc9525d251bf30828899e4cd7161f6dc6507023f',
+    '47114394b1c8a35438d19da7538142380551a2ce',
   'node_version':
-    'v12.13.0',
+    'v12.14.1',
   'nan_version':
     '2ee313aaca52e2b478965ac50eb5082520380d1b',
 
@@ -69,6 +70,8 @@ vars = {
     False,
   'checkout_android_native_support':
     False,
+  'checkout_google_benchmark':
+    False,
 }
 
 deps = {
@@ -114,7 +117,7 @@ hooks = [
     'pattern': 'src/electron/script/update-external-binaries.py',
     'condition': 'download_external_binaries',
     'action': [
-      'python',
+      'python3',
       'src/electron/script/update-external-binaries.py',
     ],
   },

ELECTRON_VERSION

@@ -1 +1 @@
-9.0.0-nightly.20191114
+9.0.0-nightly.20200201

LICENSE

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

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: libcc-20
-image: vs2019-16.3-10.0.18362
+image: vs2019bt-16.4.0
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -78,7 +78,7 @@ build_script:
       "https://github.com/electron/electron"
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        gclient sync --with_branch_heads --with_tags --reset
+        $env:RUN_GCLIENT_SYNC="true"
       } else {
         cd src\electron
         node script\generate-deps-hash.js
@@ -88,27 +88,50 @@ build_script:
         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
+          if (-not (Test-Path -Path "src\buildtools")) {
+            # the zip file must be corrupt - resync
+            $env:RUN_GCLIENT_SYNC="true"
+            if ($env:TARGET_ARCH -ne 'ia32') {
+              # only save on x64/woa to avoid contention saving
+              $env:SAVE_GCLIENT_SRC="true"
+            }
+          } else {
+            # update external binaries
+            python src/electron/script/update-external-binaries.py
+          }
         } else {    
           # file does not exist, gclient sync, then zip
-          gclient sync --with_branch_heads --with_tags --reset
+          $env:RUN_GCLIENT_SYNC="true"
           if ($env:TARGET_ARCH -ne 'ia32') {
-            # archive current source for future use 
-            # only run on x64/woa to avoid contention saving
-            7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30
+            # only save on x64/woa to avoid contention saving
+            $env:SAVE_GCLIENT_SRC="true"
           }
         }
       }
+  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags --ignore_locks)
+  - ps: >-
+      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
+        # archive current source for future use 
+        # only run on x64/woa to avoid contention saving
+        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
+          Write-warning "Could not save source to shared drive; continuing anyway"
+        }
+      }
+  - ps: >-
+      if (Test-Path 'env:RAW_GOMA_AUTH') {
+        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
+        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
+        .\src\electron\script\start-goma.ps1 -gomaDir "$pwd\src\electron\external_binaries\goma"
+      }
   - 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%\""
+  - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
+  - if DEFINED RAW_GOMA_AUTH (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"//electron/build/args/goma.gn\") %GN_EXTRA_ARGS% ") else (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS% cc_wrapper=\"%SCCACHE_PATH%\"")
   - gn check out/Default //electron:electron_lib
   - gn check out/Default //electron:electron_app
   - gn check out/Default //electron:manifests
   - gn check out/Default //electron/shell/common/api:mojo
-  - ninja -C out/Default electron:electron_app
-  - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default )  
+  - if DEFINED RAW_GOMA_AUTH (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
+  - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
   - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
   - ninja -C out/Default electron:electron_dist_zip
@@ -117,7 +140,7 @@ build_script:
   - ninja -C out/Default electron:hunspell_dictionaries_zip
   - ninja -C out/Default electron:electron_chromedriver_zip
   - ninja -C out/Default third_party/electron_node:headers
-  - cmd /C %SCCACHE_PATH% --show-stats
+  - if DEFINED RAW_GOMA_AUTH (python electron\external_binaries\goma\goma_ctl.py stat)
   - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
   - appveyor PushArtifact out/Default/windows_toolchain_profile.json
   - appveyor PushArtifact out/Default/dist.zip
@@ -138,12 +161,12 @@ build_script:
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         python electron\script\zip-symbols.py
-        appveyor PushArtifact out/Default/symbols.zip
+        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
         7z a pdb.zip out\Default\*.pdb
-        appveyor PushArtifact pdb.zip
+        appveyor-retry appveyor PushArtifact pdb.zip
       }
   - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:

build/args/all.gn

@@ -17,6 +17,7 @@ ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
+dawn_enable_vulkan_validation_layers = false
 
 is_cfi = false
 

build/args/goma.gn

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

build/extract_symbols.gni

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

build/npm.gni

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

build/rules.gni

@@ -81,9 +81,7 @@ template("mac_xib_bundle_data") {
                              "visibility",
                            ])
 
-    public_deps = [
-      ":$_compile_target_name",
-    ]
+    public_deps = [ ":$_compile_target_name" ]
     sources = get_target_outputs(":$_compile_target_name")
 
     _output_path = "{{bundle_resources_dir}}"
@@ -91,8 +89,6 @@ template("mac_xib_bundle_data") {
       _output_path = invoker.output_path
     }
 
-    outputs = [
-      "$_output_path/{{source_file_part}}",
-    ]
+    outputs = [ "$_output_path/{{source_file_part}}" ]
   }
 }

build/templated_file.gni

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

build/webpack/webpack.gni

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

build/zip.py

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

chromium_src/BUILD.gn

@@ -68,6 +68,7 @@ static_library("chrome") {
   ]
   deps = [
     "//chrome/browser:resource_prefetch_predictor_proto",
+    "//chrome/browser/ssl:proto",
     "//components/feature_engagement:buildflags",
   ]
 
@@ -184,9 +185,9 @@ static_library("chrome") {
       "//chrome/services/printing:lib",
       "//components/printing/browser",
       "//components/printing/renderer",
-      "//components/services/pdf_compositor",
-      "//components/services/pdf_compositor/public/cpp",
-      "//components/services/pdf_compositor/public/mojom",
+      "//components/services/print_compositor",
+      "//components/services/print_compositor/public/cpp",
+      "//components/services/print_compositor/public/mojom",
     ]
 
     deps += [
@@ -229,6 +230,15 @@ static_library("chrome") {
       "//components/vector_icons:vector_icons",
     ]
   }
+
+  if (enable_electron_extensions) {
+    sources += [
+      "//chrome/renderer/extensions/extension_hooks_delegate.cc",
+      "//chrome/renderer/extensions/extension_hooks_delegate.h",
+      "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
+      "//chrome/renderer/extensions/tabs_hooks_delegate.h",
+    ]
+  }
 }
 
 source_set("plugins") {
@@ -308,45 +318,51 @@ source_set("plugins") {
 # You may have to add new files here during the upgrade if //chrome/browser/spellchecker
 # gets more files
 source_set("chrome_spellchecker") {
-  sources = [
-    "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
-    "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
-    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
-    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
-    "//chrome/browser/spellchecker/spellcheck_factory.cc",
-    "//chrome/browser/spellchecker/spellcheck_factory.h",
-    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
-    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-    "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
-    "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
-    "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-    "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
-    "//chrome/browser/spellchecker/spellcheck_service.cc",
-    "//chrome/browser/spellchecker/spellcheck_service.h",
-    "//chrome/common/pref_names.h",
-  ]
+  sources = []
+  deps = []
+  libs = []
 
-  if (has_spellcheck_panel) {
+  if (enable_builtin_spellchecker) {
     sources += [
-      "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
-      "//chrome/browser/spellchecker/spell_check_panel_host_impl.h",
+      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
+      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
+      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
+      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
+      "//chrome/browser/spellchecker/spellcheck_factory.cc",
+      "//chrome/browser/spellchecker/spellcheck_factory.h",
+      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
+      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
+      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
+      "//chrome/browser/spellchecker/spellcheck_service.cc",
+      "//chrome/browser/spellchecker/spellcheck_service.h",
+      "//chrome/common/pref_names.h",
+    ]
+
+    if (has_spellcheck_panel) {
+      sources += [
+        "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
+        "//chrome/browser/spellchecker/spell_check_panel_host_impl.h",
+      ]
+    }
+
+    if (use_browser_spellchecker) {
+      sources += [
+        "//chrome/browser/spellchecker/spelling_request.cc",
+        "//chrome/browser/spellchecker/spelling_request.h",
+      ]
+    }
+
+    deps += [
+      "//base:base_static",
+      "//components/language/core/browser",
+      "//components/spellcheck:buildflags",
+      "//components/sync",
     ]
   }
 
-  if (use_browser_spellchecker) {
-    sources += [
-      "//chrome/browser/spellchecker/spelling_request.cc",
-      "//chrome/browser/spellchecker/spelling_request.h",
-    ]
-  }
-
-  deps = [
-    "//base:base_static",
-    "//components/language/core/browser",
-    "//components/spellcheck:buildflags",
-    "//components/sync",
-  ]
-
   public_deps = [
     "//components/spellcheck/browser",
     "//components/spellcheck/common",

chromium_src/chrome/browser/process_singleton_win.cc

@@ -197,7 +197,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
     return PROCESS_NONE;
   }
 
-  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, false)) {
+  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
     case chrome::NOTIFY_SUCCESS:
       return PROCESS_NOTIFIED;
     case chrome::NOTIFY_FAILED:

docs-translations/README.md

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

docs/README.md

@@ -53,6 +53,7 @@ an issue:
   * [Native File Drag & Drop](tutorial/native-file-drag-drop.md)
   * [Offscreen Rendering](tutorial/offscreen-rendering.md)
   * [Supporting macOS Dark Mode](tutorial/mojave-dark-mode-guide.md)
+  * [Web embeds in Electron](tutorial/web-embeds.md)
 * [Accessibility](tutorial/accessibility.md)
   * [Spectron](tutorial/accessibility.md#spectron)
   * [Devtron](tutorial/accessibility.md#devtron)
@@ -111,7 +112,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * [Process Object](api/process.md)
 * [Supported Command Line Switches](api/command-line-switches.md)
 * [Environment Variables](api/environment-variables.md)
-* [Breaking API Changes](api/breaking-changes.md)
+* [Breaking API Changes](breaking-changes.md)
 
 ### Custom DOM Elements:
 

docs/api/app.md

@@ -323,8 +323,8 @@ Returns:
   * `port` Integer
   * `realm` String
 * `callback` Function
-  * `username` String
-  * `password` String
+  * `username` String (optional)
+  * `password` String (optional)
 
 Emitted when `webContents` wants to do basic auth.
 
@@ -341,6 +341,10 @@ app.on('login', (event, webContents, details, authInfo, callback) => {
 })
 ```
 
+If `callback` is called without a username or password, the authentication
+request will be cancelled and the authentication error will be returned to the
+page.
+
 ### Event: 'gpu-info-update'
 
 Emitted whenever there is a GPU info update.
@@ -1187,8 +1191,9 @@ Show the app's about panel options. These options can be overridden with `app.se
   * `website` String (optional) _Linux_ - The app's website.
   * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
 
-Set the about panel options. This will override the values defined in the app's
-`.plist` file on MacOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
+Set the about panel options. This will override the values defined in the app's `.plist` file on MacOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
+
+If you do not set `credits` but still wish to surface them in your app, AppKit will look for a file named "Credits.html", "Credits.rtf", and "Credits.rtfd", in that order, in the bundle returned by the NSBundle class method main. The first file found is used, and if none is found, the info area is left blank. See Apple [documentation](https://developer.apple.com/documentation/appkit/nsaboutpaneloptioncredits?language=objc) for more information.
 
 ### `app.isEmojiPanelSupported()`
 
@@ -1299,7 +1304,7 @@ command line arguments that Chromium uses.
 
 ### `app.dock` _macOS_ _Readonly_
 
-A [`Dock`](./dock.md) object that allows you to perform actions on your app icon in the user's
+A [`Dock`](./dock.md) `| undefined` object that allows you to perform actions on your app icon in the user's
 dock on macOS.
 
 ### `app.isPackaged` _Readonly_

docs/api/browser-view.md

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

docs/api/browser-window.md

@@ -11,10 +11,7 @@ const { BrowserWindow } = require('electron')
 // Or use `remote` from the renderer process.
 // const { BrowserWindow } = require('electron').remote
 
-let win = new BrowserWindow({ width: 800, height: 600 })
-win.on('closed', () => {
-  win = null
-})
+const win = new BrowserWindow({ width: 800, height: 600 })
 
 // Load a remote URL
 win.loadURL('https://github.com')
@@ -229,6 +226,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       unless hovered over in the top left of the window. These custom buttons prevent
       issues with mouse events that occur with the standard window toolbar buttons.
       **Note:** This option is currently experimental.
+  * `trafficLightPosition` [Point](structures/point.md) (optional) - Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`
   * `fullscreenWindowTitle` Boolean (optional) - Shows the title in the
     title bar in full screen mode on macOS for all `titleBarStyle` options.
     Default is `false`.
@@ -272,8 +270,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       OS-level sandbox and disabling the Node.js engine. This is not the same as
       the `nodeIntegration` option and the APIs available to the preload script
       are more limited. Read more about the option [here](sandbox-option.md).
-      **Note:** This option is currently experimental and may change or be
-      removed in future Electron releases.
     * `enableRemoteModule` Boolean (optional) - Whether to enable the [`remote`](remote.md) module.
       Default is `true`.
     * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
@@ -517,7 +513,7 @@ Emitted when the window is restored from a minimized state.
 Returns:
 
 * `event` Event
-* `newBounds` [`Rectangle`](structures/rectangle.md) - Size the window is being resized to.
+* `newBounds` [Rectangle](structures/rectangle.md) - Size the window is being resized to.
 
 Emitted before the window is resized. Calling `event.preventDefault()` will prevent the window from being resized.
 
@@ -532,7 +528,7 @@ Emitted after the window has been resized.
 Returns:
 
 * `event` Event
-* `newBounds` [`Rectangle`](structures/rectangle.md) - Location the window is being moved to.
+* `newBounds` [Rectangle](structures/rectangle.md) - Location the window is being moved to.
 
 Emitted before the window is moved. On Windows, calling `event.preventDefault()` will prevent the window from being moved.
 
@@ -772,7 +768,7 @@ events.
 
 #### `win.id` _Readonly_
 
-A `Integer` property representing the unique ID of the window.
+A `Integer` property representing the unique ID of the window. Each ID is unique among all `BrowserWindow` instances of the entire Electron application.
 
 #### `win.autoHideMenuBar`
 
@@ -963,13 +959,10 @@ Perhaps there are 15 pixels of controls on the left edge, 25 pixels of controls
 on the right edge and 50 pixels of controls below the player. In order to
 maintain a 16:9 aspect ratio (standard aspect ratio for HD @1920x1080) within
 the player itself we would call this function with arguments of 16/9 and
-[ 40, 50 ]. The second argument doesn't care where the extra width and height
+{ width: 40, height: 50 }. The second argument doesn't care where the extra width and height
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.
 
-Calling this function with a value of `0` will remove any previously set aspect
-ratios.
-
 #### `win.setBackgroundColor(backgroundColor)`
 
 * `backgroundColor` String - Window's background color as a hexadecimal value,
@@ -1019,6 +1012,11 @@ 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)
@@ -1622,12 +1620,9 @@ can still bring up the menu bar by pressing the single `Alt` key.
 
 Returns `Boolean` - Whether the menu bar is visible.
 
-#### `win.setVisibleOnAllWorkspaces(visible[, options])`
+#### `win.setVisibleOnAllWorkspaces(visible)`
 
 * `visible` Boolean
-* `options` Object (optional)
-  * `visibleOnFullScreen` Boolean (optional) _macOS_ - Sets whether
-    the window should be visible above fullscreen windows
 
 Sets whether the window should be visible on all workspaces.
 

docs/api/client-request.md

@@ -32,8 +32,8 @@ the hostname and the port number 'hostname:port'.
   * `redirect` String (optional) - The redirect mode for this request. Should be
 one of `follow`, `error` or `manual`. Defaults to `follow`. When mode is `error`,
 any redirection will be aborted. When mode is `manual` the redirection will be
-deferred until [`request.followRedirect`](#requestfollowredirect) is invoked. Listen for the [`redirect`](#event-redirect) event in
-this mode to get more details about the redirect request.
+cancelled unless [`request.followRedirect`](#requestfollowredirect) is invoked
+synchronously during the [`redirect`](#event-redirect) event.
 
 `options` properties such as `protocol`, `host`, `hostname`, `port` and `path`
 strictly follow the Node.js model as described in the
@@ -70,8 +70,8 @@ Returns:
   * `port` Integer
   * `realm` String
 * `callback` Function
-  * `username` String
-  * `password` String
+  * `username` String (optional)
+  * `password` String (optional)
 
 Emitted when an authenticating proxy is asking for user credentials.
 
@@ -136,8 +136,11 @@ Returns:
 * `redirectUrl` String
 * `responseHeaders` Record<String, String[]>
 
-Emitted when there is redirection and the mode is `manual`. Calling
-[`request.followRedirect`](#requestfollowredirect) will continue with the redirection.
+Emitted when the server returns a redirect response (e.g. 301 Moved
+Permanently). Calling [`request.followRedirect`](#requestfollowredirect) will
+continue with the redirection.  If this event is handled,
+[`request.followRedirect`](#requestfollowredirect) must be called
+**synchronously**, otherwise the request will be cancelled.
 
 ### Instance Properties
 
@@ -214,7 +217,8 @@ response object,it will emit the `aborted` event.
 
 #### `request.followRedirect()`
 
-Continues any deferred redirection request when the redirection mode is `manual`.
+Continues any pending redirection. Can only be called during a `'redirect'`
+event.
 
 #### `request.getUploadProgress()`
 

docs/api/content-tracing.md

@@ -38,6 +38,9 @@ Get a set of category groups. The category groups can change as new code paths
 are reached. See also the [list of built-in tracing
 categories](https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h).
 
+> **NOTE:** Electron adds a non-default tracing category called `"electron"`.
+> This category can be used to capture Electron-specific tracing events.
+
 ### `contentTracing.startRecording(options)`
 
 * `options` ([TraceConfig](structures/trace-config.md) | [TraceCategoriesAndOptions](structures/trace-categories-and-options.md))

docs/api/context-bridge.md

@@ -28,13 +28,14 @@ window.electron.doThing()
 
 ### Main World
 
-The "Main World" is the javascript context that your main renderer code runs in.  By default the page you load in your renderer
-executes code in this world.
+The "Main World" is the JavaScript context that your main renderer code runs in. By default, the
+page you load in your renderer executes code in this world.
 
 ### Isolated World
 
-When `contextIsolation` is enabled in your `webPreferences` your `preload` scripts run in an "Isolated World".  You can read more about
-context isolation and what it affects in the [BrowserWindow](browser-window.md) docs.
+When `contextIsolation` is enabled in your `webPreferences`, your `preload` scripts run in an
+"Isolated World".  You can read more about context isolation and what it affects in the
+[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.
 
 ## Methods
 
@@ -50,12 +51,12 @@ The `contextBridge` module has the following methods:
 ### API Objects
 
 The `api` object provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api-experimental) must be an object
-whose keys are strings and values are a `Function`, `String`, `Number`, `Array`, `Boolean` or another nested object that meets the same conditions.
+whose keys are strings and values are a `Function`, `String`, `Number`, `Array`, `Boolean`, or another nested object that meets the same conditions.
 
-`Function` values are proxied to the other context and all other values are **copied** and **frozen**.  I.e. Any data / primitives sent in
+`Function` values are proxied to the other context and all other values are **copied** and **frozen**. Any data / primitives sent in
 the API object become immutable and updates on either side of the bridge do not result in an update on the other side.
 
-An example of a complex API object is shown below.
+An example of a complex API object is shown below:
 
 ```javascript
 const { contextBridge } = require('electron')
@@ -90,22 +91,22 @@ results in some key limitations that we've outlined below.
 
 #### Parameter / Error / Return Type support
 
-Because parameters, errors and return values are **copied** when they are sent over the bridge there are only certain types that can be used.
-At a high level if the type you want to use can be serialized and un-serialized into the same object it will work.  A table of type support
-has been included below for completeness.
+Because parameters, errors and return values are **copied** when they are sent over the bridge, there are only certain types that can be used.
+At a high level, if the type you want to use can be serialized and deserialized into the same object it will work.  A table of type support
+has been included below for completeness:
 
 | Type | Complexity | Parameter Support | Return Value Support | Limitations |
 | ---- | ---------- | ----------------- | -------------------- | ----------- |
 | `String` | Simple | ✅ | ✅ | N/A |
 | `Number` | Simple | ✅ | ✅ | N/A |
 | `Boolean` | Simple | ✅ | ✅ | N/A |
-| `Object` | Complex | ✅ | ✅ | Keys must be supported "Simple" types in this table.  Values must be supported in this table.  Prototype modifications are dropped.  Sending custom classes will copy values but not the prototype. |
+| `Object` | Complex | ✅ | ✅ | Keys must be supported using only "Simple" types in this table.  Values must be supported in this table.  Prototype modifications are dropped.  Sending custom classes will copy values but not the prototype. |
 | `Array` | Complex | ✅ | ✅ | Same limitations as the `Object` type |
 | `Error` | Complex | ✅ | ✅ | Errors that are thrown are also copied, this can result in the message and stack trace of the error changing slightly due to being thrown in a different context |
-| `Promise` | Complex | ✅ | ✅ | Promises are only proxied if they are a the return value or exact parameter.  Promises nested in arrays or obejcts will be dropped. |
+| `Promise` | Complex | ✅ | ✅ | Promises are only proxied if they are the return value or exact parameter.  Promises nested in arrays or objects will be dropped. |
 | `Function` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending classes or constructors will not work. |
 | [Cloneable Types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm) | Simple | ✅ | ✅ | See the linked document on cloneable types |
 | `Symbol` | N/A | ❌ | ❌ | Symbols cannot be copied across contexts so they are dropped |
 
 
-If the type you care about is not in the above table it is probably not supported.
+If the type you care about is not in the above table, it is probably not supported.

docs/api/dialog.md

@@ -120,7 +120,7 @@ Returns `Promise<Object>` - Resolve with an object containing the following:
 
 * `canceled` Boolean - whether or not the dialog was canceled.
 * `filePaths` String[] - An array of file paths chosen by the user. If the dialog is cancelled this will be an empty array.
-* `bookmarks` String[] (optional) _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated.
+* `bookmarks` String[] (optional) _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated. (For return values, see [table here](#bookmarks-array).)
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
 
@@ -215,7 +215,7 @@ The `filters` specifies an array of file types that can be displayed, see
 Returns `Promise<Object>` - Resolve with an object containing the following:
   * `canceled` Boolean - whether or not the dialog was canceled.
   * `filePath` String (optional) - If the dialog is canceled, this will be `undefined`.
-  * `bookmark` String (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present.
+  * `bookmark` String (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present. (For return values, see [table here](#bookmarks-array).)
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
 
@@ -350,6 +350,17 @@ On Windows the options are more limited, due to the Win32 APIs used:
 * The `browserWindow` argument is ignored since it is not possible to make
    this confirmation dialog modal.
 
+## Bookmarks array
+
+`showOpenDialog`, `showOpenDialogSync`, `showSaveDialog`, and `showSaveDialogSync` will return a `bookmarks` array.
+
+| Build Type | securityScopedBookmarks boolean | Return Type | Return Value                   |
+|------------|---------------------------------|:-----------:|--------------------------------|
+| macOS mas  | True                            |   Success   | `['LONGBOOKMARKSTRING']`       |
+| macOS mas  | True                            |    Error    | `['']` (array of empty string) |
+| macOS mas  | False                           |      NA     | `[]` (empty array)             |
+| non mas    | any                             |      NA     | `[]` (empty array)             |
+
 ## Sheets
 
 On macOS, dialogs are presented as sheets attached to a window if you provide

docs/api/environment-variables.md

@@ -48,6 +48,7 @@ Unsupported options are:
 
 ```sh
 --max-http-header-size
+--http-parser
 ```
 
 ### `GOOGLE_API_KEY`

docs/api/in-app-purchase.md

@@ -40,11 +40,17 @@ Retrieves the product descriptions.
 
 ### `inAppPurchase.canMakePayments()`
 
-Returns `Boolean`, whether a user can make a payment.
+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.
 
 ### `inAppPurchase.getReceiptURL()`
 
-Returns `String`, the path to the receipt.
+Returns `String` - the path to the receipt.
 
 ### `inAppPurchase.finishAllTransactions()`
 

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`, `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
+  * `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
     `click` property will be ignored. See [roles](#roles).
   * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
     `radio`.
@@ -130,8 +130,7 @@ dynamically changed.
 
 #### `menuItem.label`
 
-A `String` indicating the item's visible label, this property can be
-dynamically changed.
+A `String` indicating the item's visible label.
 
 #### `menuItem.click`
 
@@ -165,7 +164,7 @@ item's icon, if set.
 
 #### `menuItem.sublabel`
 
-A `String` indicating the item's sublabel, this property can be dynamically changed.
+A `String` indicating the item's sublabel.
 
 #### `menuItem.toolTip` _macOS_
 
@@ -197,7 +196,9 @@ You can add a `click` function for additional behavior.
 #### `menuItem.registerAccelerator`
 
 A `Boolean` indicating if the accelerator should be registered with the
-system or just displayed, this property can be dynamically changed.
+system or just displayed.
+
+This property can be dynamically changed.
 
 #### `menuItem.commandId`
 

docs/api/native-image.md

@@ -329,9 +329,9 @@ can be called on empty images.
 
 [buffer]: https://nodejs.org/api/buffer.html#buffer_class_buffer
 
-## Properties
+### Instance Properties
 
-### `nativeImage.isMacTemplateImage` _macOS_
+#### `nativeImage.isMacTemplateImage` _macOS_
 
 A `Boolean` property that determines whether the image is considered a [template image](https://developer.apple.com/documentation/appkit/nsimage/1520017-template).
 

docs/api/native-theme.md

@@ -27,7 +27,7 @@ should use `themeSource` below.
 
 ### `nativeTheme.themeSource`
 
-A `String` property that can be `system`, `light` or `dark`.  It is used to override and supercede
+A `String` property that can be `system`, `light` or `dark`.  It is used to override and supersede
 the value that Chromium has chosen to use internally.
 
 Setting this property to `system` will remove the override and

docs/api/session.md

@@ -126,9 +126,10 @@ 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`.
+    `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
+    specified, clear all storage types.
   * `quotas` String[] (optional) - The types of quotas to clear, can contain:
-    `temporary`, `persistent`, `syncable`.
+    `temporary`, `persistent`, `syncable`. If not specified, clear all quotas.
 
 Returns `Promise<void>` - resolves when the storage data has been cleared.
 
@@ -271,6 +272,7 @@ the original network configuration.
   * `request` Object
     * `hostname` String
     * `certificate` [Certificate](structures/certificate.md)
+    * `validatedCertificate` [Certificate](structures/certificate.md)
     * `verificationResult` String - Verification result from chromium.
     * `errorCode` Integer - Error code.
   * `callback` Function
@@ -464,12 +466,16 @@ 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.
@@ -479,6 +485,16 @@ 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`:
@@ -504,12 +520,12 @@ A [`Protocol`](protocol.md) object for this session.
 const { app, session } = require('electron')
 const path = require('path')
 
-app.on('ready', function () {
+app.on('ready', () => {
   const protocol = session.fromPartition('some-partition').protocol
-  protocol.registerFileProtocol('atom', function (request, callback) {
-    var url = request.url.substr(7)
+  protocol.registerFileProtocol('atom', (request, callback) => {
+    let url = request.url.substr(7)
     callback({ path: path.normalize(`${__dirname}/${url}`) })
-  }, function (error) {
+  }, (error) => {
     if (error) console.error('Failed to register protocol')
   })
 })
@@ -522,7 +538,7 @@ A [`NetLog`](net-log.md) object for this session.
 ```javascript
 const { app, session } = require('electron')
 
-app.on('ready', async function () {
+app.on('ready', async () => {
   const netLog = session.fromPartition('some-partition').netLog
   netLog.startLogging('/path/to/net-log')
   // After some network events

docs/api/shell.md

@@ -28,10 +28,7 @@ Show the given file in a file manager. If possible, select the file.
 
 * `path` 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 `Promise<String>` - Resolves with an string containing the error message corresponding to the failure if a failure occurred, otherwise "".
 
 Open the given file in the desktop's default manner.
 

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

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

docs/api/tray.md

@@ -58,9 +58,10 @@ If you want to keep exact same behaviors on all platforms, you should not
 rely on the `click` event and always attach a context menu to the tray icon.
 
 
-### `new Tray(image)`
+### `new Tray(image, [guid])`
 
 * `image` ([NativeImage](native-image.md) | String)
+* `guid` String (optional) _Windows_ - Assigns a GUID to the tray icon. If the executable is signed and the signature contains an organization in the subject line then the GUID is permanently associated with that signature. OS level settings like the position of the tray icon in the system tray will persist even if the path to the executable changes. If the executable is not code-signed then the GUID is permanently associated with the path to the executable. Changing the path to the executable will break the creation of the tray icon and a new GUID must be used. However, it is highly recommended to use the GUID parameter only in conjunction with code-signed executable. If an App defines multiple tray icons then each icon must use a separate GUID.
 
 Creates a new tray icon associated with the `image`.
 
@@ -143,6 +144,26 @@ Emitted when a drag operation exits the tray icon.
 
 Emitted when a drag operation ends on the tray or ends at another location.
 
+#### Event: 'mouse-up' _macOS_
+
+Returns:
+
+* `event` [KeyboardEvent](structures/keyboard-event.md)
+* `position` [Point](structures/point.md) - The position of the event.
+
+Emitted when the mouse is released from clicking the tray icon.
+
+Note: This will not be emitted if you have set a context menu for your Tray using `tray.setContextMenu`, as a result of macOS-level constraints.
+
+#### Event: 'mouse-down' _macOS_
+
+Returns:
+
+* `event` [KeyboardEvent](structures/keyboard-event.md)
+* `position` [Point](structures/point.md) - The position of the event.
+
+Emitted when the mouse clicks the tray icon.
+
 #### Event: 'mouse-enter' _macOS_
 
 Returns:
@@ -257,6 +278,10 @@ be shown instead of the tray icon's context menu.
 
 The `position` is only available on Windows, and it is (0, 0) by default.
 
+#### `tray.closeContextMenu()` _macOS_ _Windows_
+
+Closes an open context menu, as set by `tray.setContextMenu()`.
+
 #### `tray.setContextMenu(menu)`
 
 * `menu` Menu | null

docs/api/web-contents.md

@@ -463,8 +463,8 @@ Returns:
   * `port` Integer
   * `realm` String
 * `callback` Function
-  * `username` String
-  * `password` String
+  * `username` String (optional)
+  * `password` String (optional)
 
 Emitted when `webContents` wants to do basic auth.
 
@@ -987,7 +987,7 @@ Injects CSS into the current web page and returns a unique key for the inserted
 stylesheet.
 
 ```js
-contents.on('did-finish-load', function () {
+contents.on('did-finish-load', () => {
   contents.insertCSS('html, body { background-color: #f00; }')
 })
 ```
@@ -1002,7 +1002,7 @@ Removes the inserted CSS from the current web page. The stylesheet is identified
 by its key, which is returned from `contents.insertCSS(css)`.
 
 ```js
-contents.on('did-finish-load', async function () {
+contents.on('did-finish-load', async () => {
   const key = await contents.insertCSS('html, body { background-color: #f00; }')
   contents.removeInsertedCSS(key)
 })
@@ -1031,6 +1031,17 @@ contents.executeJavaScript('fetch("https://jsonplaceholder.typicode.com/users/1"
   })
 ```
 
+#### `contents.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture])`
+
+* `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electron's `contextIsolation` feature.  You can provide any integer here.
+* `scripts` [WebSource[]](structures/web-source.md)
+* `userGesture` Boolean (optional) - Default is `false`.
+
+Returns `Promise<any>` - A promise that resolves with the result of the executed code
+or is rejected if the result of the code is a rejected promise.
+
+Works like `executeJavaScript` but evaluates `scripts` in an isolated context.
+
 #### `contents.setIgnoreMenuShortcuts(ignore)` _Experimental_
 
 * `ignore` Boolean
@@ -1102,15 +1113,6 @@ Sets the maximum and minimum pinch-to-zoom level.
 > contents.setVisualZoomLevelLimits(1, 3)
 > ```
 
-#### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-
-* `minimumLevel` Number
-* `maximumLevel` Number
-
-Returns `Promise<void>`
-
-Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-
 #### `contents.undo()`
 
 Executes the editing command `undo` in web page.
@@ -1223,11 +1225,34 @@ Returns `Promise<NativeImage>` - Resolves with a [NativeImage](native-image.md)
 
 Captures a snapshot of the page within `rect`. Omitting `rect` will capture the whole visible page.
 
+#### `contents.isBeingCaptured()`
+
+Returns `Boolean` - Whether this page is being captured. It returns true when the capturer count
+is large then 0.
+
+#### `contents.incrementCapturerCount([size, stayHidden])`
+
+* `size` [Size](structures/size.md) (optional) - The perferred size for the capturer.
+* `stayHidden` Boolean (optional) -  Keep the page hidden instead of visible.
+
+Increase the capturer count by one. The page is considered visible when its browser window is
+hidden and the capturer count is non-zero. If you would like the page to stay hidden, you should ensure that `stayHidden` is set to true.
+
+This also affects the Page Visibility API.
+
+#### `contents.decrementCapturerCount([stayHidden])`
+
+* `stayHidden` Boolean (optional) -  Keep the page in hidden state instead of visible.
+
+Decrease the capturer count by one. The page will be set to hidden or occluded state when its
+browser window is hidden or occluded and the capturer count reaches zero. If you want to
+decrease the hidden capturer count instead you should set `stayHidden` to true.
+
 #### `contents.getPrinters()`
 
 Get the system printer list.
 
-Returns [`PrinterInfo[]`](structures/printer-info.md).
+Returns [`PrinterInfo[]`](structures/printer-info.md)
 
 #### `contents.print([options], [callback])`
 
@@ -1235,7 +1260,7 @@ Returns [`PrinterInfo[]`](structures/printer-info.md).
   * `silent` Boolean (optional) - Don't ask user for print settings. Default is `false`.
   * `printBackground` Boolean (optional) - Prints the background color and image of
     the web page. Default is `false`.
-  * `deviceName` String (optional) - Set the printer device name to use. Default is `''`.
+  * `deviceName` String (optional) - Set the printer device name to use. Must be the system-defined name and not the 'friendly' name, e.g 'Brother_QL_820NWB' and not 'Brother QL-820NWB'.
   * `color` Boolean (optional) - Set whether the printed web page will be in color or grayscale. Default is `true`.
   * `margins` Object (optional)
     * `marginType` String (optional) - Can be `default`, `none`, `printableArea`, or `custom`. If `custom` is chosen, you will also need to specify `top`, `bottom`, `left`, and `right`.
@@ -1248,9 +1273,11 @@ Returns [`PrinterInfo[]`](structures/printer-info.md).
   * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
   * `collate` Boolean (optional) - Whether the web page should be collated.
   * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Record<string, number> (optional) - The page range to print. Should have two keys: `from` and `to`.
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` Number - the start page.
+    * `to` Number - the end page.
   * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
-  * `dpi` Object (optional)
+  * `dpi` Record<string, number> (optional)
     * `horizontal` Number (optional) - The horizontal dpi.
     * `vertical` Number (optional) - The vertical dpi.
   * `header` String (optional) - String to be printed as page header.
@@ -1276,14 +1303,21 @@ win.webContents.print(options, (success, errorType) => {
 #### `contents.printToPDF(options)`
 
 * `options` Object
+  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
+    * `title` String - The title for the PDF header.
+    * `url` String - the url for the PDF footer.
+  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.
   * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
     default margin, 1 for no margin, and 2 for minimum margin.
-  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
-    `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
     and `width` in microns.
+  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` Number - the first page to print.
+    * `to` Number - the last page to print (inclusive).
+  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
   * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
   * `printSelectionOnly` Boolean (optional) - Whether to print selection only.
-  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.
 
 Returns `Promise<Buffer>` - Resolves with the generated PDF data.
 
@@ -1299,7 +1333,9 @@ By default, an empty `options` will be regarded as:
   marginsType: 0,
   printBackground: false,
   printSelectionOnly: false,
-  landscape: false
+  landscape: false,
+  pageSize: 'A4',
+  scaleFactor: 100
 }
 ```
 
@@ -1316,12 +1352,13 @@ win.loadURL('http://github.com')
 
 win.webContents.on('did-finish-load', () => {
   // Use default printing options
-  win.webContents.printToPDF({}, (error, data) => {
-    if (error) throw error
+  win.webContents.printToPDF({}).then(data => {
     fs.writeFile('/tmp/print.pdf', data, (error) => {
       if (error) throw error
       console.log('Write PDF successfully.')
     })
+  }).catch(error => {
+    console.log(error)
   })
 })
 ```
@@ -1771,7 +1808,7 @@ Only applicable if *offscreen rendering* is enabled.
 
 #### `contents.id` _Readonly_
 
-A `Integer` representing the unique ID of this WebContents.
+A `Integer` representing the unique ID of this WebContents. Each ID is unique among all `WebContents` instances of the entire Electron application.
 
 #### `contents.session` _Readonly_
 

docs/api/web-frame.md

@@ -56,13 +56,6 @@ Sets the maximum and minimum pinch-to-zoom level.
 > webFrame.setVisualZoomLevelLimits(1, 3)
 > ```
 
-### `webFrame.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-
-* `minimumLevel` Number
-* `maximumLevel` Number
-
-Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-
 ### `webFrame.setSpellCheckProvider(language, provider)`
 
 * `language` String

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

docs/api/webview-tag.md

@@ -545,9 +545,30 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
 
 * `options` Object (optional)
   * `silent` Boolean (optional) - Don't ask user for print settings. Default is `false`.
-  * `printBackground` Boolean (optional) - Also prints the background color and image of
+  * `printBackground` Boolean (optional) - Prints the background color and image of
     the web page. Default is `false`.
-  * `deviceName` String (optional) - Set the printer device name to use. Default is `''`.
+  * `deviceName` String (optional) - Set the printer device name to use. Must be the system-defined name and not the 'friendly' name, e.g 'Brother_QL_820NWB' and not 'Brother QL-820NWB'.
+  * `color` Boolean (optional) - Set whether the printed web page will be in color or grayscale. Default is `true`.
+  * `margins` Object (optional)
+    * `marginType` String (optional) - Can be `default`, `none`, `printableArea`, or `custom`. If `custom` is chosen, you will also need to specify `top`, `bottom`, `left`, and `right`.
+    * `top` Number (optional) - The top margin of the printed web page, in pixels.
+    * `bottom` Number (optional) - The bottom margin of the printed web page, in pixels.
+    * `left` Number (optional) - The left margin of the printed web page, in pixels.
+    * `right` Number (optional) - The right margin of the printed web page, in pixels.
+  * `landscape` Boolean (optional) - Whether the web page should be printed in landscape mode. Default is `false`.
+  * `scaleFactor` Number (optional) - The scale factor of the web page.
+  * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
+  * `collate` Boolean (optional) - Whether the web page should be collated.
+  * `copies` Number (optional) - The number of copies of the web page to print.
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` Number - the start page.
+    * `to` Number - the end page.
+  * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
+  * `dpi` Record<string, number> (optional)
+    * `horizontal` Number (optional) - The horizontal dpi.
+    * `vertical` Number (optional) - The vertical dpi.
+  * `header` String (optional) - String to be printed as page header.
+  * `footer` String (optional) - String to be printed as page footer.
 
 Returns `Promise<void>`
 
@@ -556,14 +577,21 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
 ### `<webview>.printToPDF(options)`
 
 * `options` Object
+  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
+    * `title` String - The title for the PDF header.
+    * `url` String - the url for the PDF footer.
+  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.
   * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
     default margin, 1 for no margin, and 2 for minimum margin.
-  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
-    `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
     and `width` in microns.
+  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` Number - the first page to print.
+    * `to` Number - the last page to print (inclusive).
+  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
   * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
   * `printSelectionOnly` Boolean (optional) - Whether to print selection only.
-  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.
 
 Returns `Promise<Uint8Array>` - Resolves with the generated PDF data.
 
@@ -635,15 +663,6 @@ Returns `Promise<void>`
 
 Sets the maximum and minimum pinch-to-zoom level.
 
-### `<webview>.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-
-* `minimumLevel` Number
-* `maximumLevel` Number
-
-Returns `Promise<void>`
-
-Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-
 ### `<webview>.showDefinitionForSelection()` _macOS_
 
 Shows pop-up dictionary that searches the selected word on the page.

docs/breaking-changes.md

@@ -1,6 +1,6 @@
 # Breaking Changes
 
-Breaking changes will be documented here, and deprecation warnings added to JS code where possible, at least [one major version](../tutorial/electron-versioning.md#semver) before the change is made.
+Breaking changes will be documented here, and deprecation warnings added to JS code where possible, at least [one major version](tutorial/electron-versioning.md#semver) before the change is made.
 
 ## `FIXME` comments
 
@@ -20,6 +20,30 @@ 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
@@ -92,7 +116,7 @@ However, it is recommended to avoid using the `remote` module altogether.
 // main
 const { ipcMain, webContents } = require('electron')
 
-const getGuestForWebContents = function (webContentsId, contents) {
+const getGuestForWebContents = (webContentsId, contents) => {
   const guest = webContents.fromId(webContentsId)
   if (!guest) {
     throw new Error(`Invalid webContentsId: ${webContentsId}`)
@@ -114,6 +138,14 @@ const { ipcRenderer } = require('electron')
 ipcRenderer.invoke('openDevTools', webview.getWebContentsId())
 ```
 
+### `webFrame.setLayoutZoomLevelLimits()`
+
+Chromium has removed support for changing the layout zoom level limits, and it
+is beyond Electron's capacity to maintain it. The function will emit a warning
+in Electron 8.x, and cease to exist in Electron 9.x. The layout zoom level
+limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
+[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
+
 ## Planned Breaking API Changes (7.0)
 
 ### Node Headers URL

docs/development/build-instructions-gn.md

@@ -265,8 +265,7 @@ New-ItemProperty -Path "HKLM:\System\CurrentControlSet\Services\Lanmanworkstatio
 
 ### Stale locks in the git cache
 If `gclient sync` is interrupted while using the git cache, it will leave
-the cache locked. To remove the lock, pass the `--break_repo_locks` argument to
-`gclient sync`.
+the cache locked. To remove the lock, pass the `--ignore_locks` argument to `gclient sync`.
 
 ### I'm being asked for a username/password for chromium-internal.googlesource.com
 If you see a prompt for `Username for 'https://chrome-internal.googlesource.com':` when running `gclient sync` on Windows, it's probably because the `DEPOT_TOOLS_WIN_TOOLCHAIN` environment variable is not set to 0. Open `Control Panel` → `System and Security` → `System` → `Advanced system settings` and add a system variable

docs/development/build-instructions-windows.md

@@ -11,9 +11,8 @@ 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`
-       (replace `2019` and `Community` with your installed versions)
-    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`
+    * `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:`.
 * [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

docs/development/build-system-overview.md

@@ -57,7 +57,7 @@ you're currently working on using Mocha's
 `.only` to any `describe` or `it` function call:
 
 ```js
-describe.only('some feature', function () {
+describe.only('some feature', () => {
   // ... only tests in this block will be run
 })
 ```

docs/development/debugging-instructions-macos.md

@@ -23,6 +23,11 @@ you prefer a graphical interface.
   They include LLDB, the default debugger in Xcode on Mac OS X. It supports
   debugging C, Objective-C and C++ on the desktop and iOS devices and simulator.
 
+* **.lldbinit**: Create or edit `~/.lldbinit` to allow Chromium code to be properly source-mapped.
+   ```text
+   command script import ~/electron/src/tools/lldb/lldbinit.py
+   ```
+
 ## Attaching to and Debugging Electron
 
 To start a debugging session, open up Terminal and start `lldb`, passing a non-release
@@ -105,6 +110,8 @@ Process 25244 stopped
    122 	  return badge_count_;
 ```
 
+**NOTE:** If you don't see source code when you think you should, you may not have added the `~/.lldbinit` file above.
+
 To finish debugging at this point, run `process continue`. You can also continue until a certain
 line is hit in this thread (`thread until 100`). This command will run the thread in the current
 frame till it reaches line 100 in this frame or stops if it leaves the current frame.

docs/development/goma.md

@@ -0,0 +1,63 @@
+# Goma
+
+> Goma is a distributed compiler service for open-source projects such as
+> Chromium and Android.
+
+Electron has a deployment of a custom Goma Backend that we make available to
+all Electron Maintainers.  See the [Access](#access) section below for details
+on authentication.
+
+## Enabling Goma
+
+Currently Electron Goma supports Windows, Linux, and macOS.  If you are
+on a supported platform you can enable goma by importing the `goma.gn` config
+file when using `gn`.
+
+```bash
+gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") import(\"//electron/build/args/goma.gn\")"
+```
+
+You must ensure that you do not have `cc_wrapper` configured, this means you
+can't use `sccache` or similar technology.
+
+Before you can use goma to build Electron you need to authenticate against
+the Goma service.  You only need to do this once per-machine.
+
+```bash
+cd electron/external_binaries/goma
+./goma_auth.py login
+```
+
+Once authenticated you need to make sure the goma daemon is running on your
+machine.
+
+```bash
+cd electron/external_binaries/goma
+./goma_ctl.py ensure_start
+```
+
+## Building with Goma
+
+When you are using Goma you can run `ninja` with a substantially higher `j`
+value than would normally be supported by your machine.
+
+Please do not set a value higher than **300** on Windows or Linux and
+**80** on macOS, we monitor the goma system and users found to be abusing
+it with unreasonable concurrency will be de-activated.
+
+```bash
+ninja -C out/Testing electron -j 200
+```
+
+## Monitoring Goma
+
+If you access [http://localhost:8088](http://localhost:8088) on your local
+machine you can monitor compile jobs as they flow through the goma system.
+
+## Access
+
+For security and cost reasons access to Electron Goma is currently restricted
+to Electron Maintainers.  If you want access please head to `#access-requests` in
+Slack and ping `@goma-squad` to ask for access.  Please be aware that being a
+maintainer does not *automatically* grant access and access is determined on a
+case by case basis.

docs/development/issues.md

@@ -13,7 +13,7 @@ contribute:
 
 1. By opening the issue for discussion: If you believe that you have found
    a new bug in Electron, you should report it by creating a new issue in
-   the `electron/electron` issue tracker.
+   the [`electron/electron` issue tracker](https://github.com/electron/electron/issues).
 2. By helping to triage the issue: You can do this either by providing
    assistive details (a reproducible test case that demonstrates a bug) or by
    providing suggestions to address the issue.
@@ -30,7 +30,9 @@ contributing, and more. Please use the issue tracker for bugs only!
 
 ## Submitting a Bug Report
 
-When opening a new issue in the `electron/electron` issue tracker, users
+To submit a bug report:
+
+When opening a new issue in the [`electron/electron` issue tracker](https://github.com/electron/electron/issues/new/choose), users
 will be presented with a template that should be filled in.
 
 ```markdown

docs/development/pull-requests.md

@@ -221,11 +221,12 @@ seem unfamiliar, refer to this
 
 #### Approval and Request Changes Workflow
 
-All pull requests require approval from a [Code Owner](https://github.com/orgs/electron/teams/code-owners) of the area you
-modified in order to land. Whenever a maintainer reviews a pull request they
-may request changes. These may be small, such as fixing a typo, or may involve
-substantive changes. Such requests are intended to be helpful, but at times
-may come across as abrupt or unhelpful, especially if they do not include
+All pull requests require approval from a
+[Code Owner](https://github.com/electron/electron/blob/master/.github/CODEOWNERS)
+of the area you modified in order to land. Whenever a maintainer reviews a pull
+request they may request changes. These may be small, such as fixing a typo, or
+may involve substantive changes. Such requests are intended to be helpful, but
+at times may come across as abrupt or unhelpful, especially if they do not include
 concrete suggestions on *how* to change them.
 
 Try not to be discouraged. If you feel that a review is unfair, say so or seek
@@ -254,7 +255,6 @@ platforms or for so-called "flaky" tests to fail ("be red"). Each CI
 failure must be manually inspected to determine the cause.
 
 CI starts automatically when you open a pull request, but only
-[Releasers](https://github.com/orgs/electron/teams/releasers/members)
-can restart a CI run. If you believe CI is giving a false negative,
-ask a Releaser to restart the tests.
+core maintainers can restart a CI run. If you believe CI is giving a
+false negative, ask a maintainer to restart the tests.
 

docs/development/source-code-directory-structure.md

@@ -11,7 +11,48 @@ to understand the source code better.
 
 ```diff
 Electron
-├── atom/ - C++ source code.
+├── build/ - Build configuration files needed to build with GN.
+├── buildflags/ - Determines the set of features that can be conditionally built.
+├── chromium_src/ - Source code copied from Chromium that isn't part of the content layer.
+├── default_app/ - A default app run when Electron is started without
+|                  providing a consumer app.
+├── docs/ - Electron's documentation.
+|   ├── api/ - Documentation for Electron's externally-facing modules and APIs.
+|   ├── development/ - Documentation to aid in developing for and with Electron.
+|   ├── fiddles/ - A set of code snippets one can run in Electron Fiddle.
+|   ├── images/ - Images used in documentation.
+|   └── tutorial/ - Tutorial documents for various aspects of Electron.
+├── lib/ - JavaScript/TypeScript source code.
+|   ├── browser/ - Main process initialization code.
+|   |   ├── api/ - API implementation for main process modules.
+|   |   └── remote/ - Code related to the remote module as it is
+|   |                 used in the main process.
+|   ├── common/ - Relating to logic needed by both main and renderer processes.
+|   |   └── api/ - API implementation for modules that can be used in
+|   |              both the main and renderer processes
+|   ├── isolated_renderer/ - Handles creation of isolated renderer processes when
+|   |                        contextIsolation is enabled.
+|   ├── renderer/ - Renderer process initialization code.
+|   |   ├── api/ - API implementation for renderer process modules.
+|   |   ├── extension/ - Code related to use of Chrome Extensions
+|   |   |                in Electron's renderer process.
+|   |   ├── remote/ - Logic that handes use of the remote module in
+|   |   |             the main process.
+|   |   └── web-view/ - Logic that handles the use of webviews in the
+|   |                   renderer process.
+|   ├── sandboxed_renderer/ - Logic that handles creation of sandboxed renderer
+|   |   |                     processes.
+|   |   └── api/ - API implementation for sandboxed renderer processes.
+|   └── worker/ - Logic that handles proper functionality of Node.js
+|                 environments in Web Workers.
+├── patches/ - Patches applied on top of Electron's core dependencies
+|   |          in order to handle differences between our use cases and
+|   |          default functionality.
+|   ├── boringssl/ - Patches applied to Google's fork of OpenSSL, BoringSSL.
+|   ├── chromium/ - Patches applied to Chromium.
+|   ├── node/ - Patches applied on top of Node.js.
+|   └── v8/ - Patches applied on top of Google's V8 engine.
+├── shell/ - C++ source code.
 |   ├── app/ - System entry code.
 |   ├── browser/ - The frontend including the main window, UI, and all of the
 |   |   |          main process things. This talks to the renderer to manage web
@@ -31,51 +72,36 @@ Electron
 |       |         message loop into Chromium's message loop.
 |       └── api/ - The implementation of common APIs, and foundations of
 |                  Electron's built-in modules.
-├── chromium_src/ - Source code copied from Chromium. See below.
-├── default_app/ - The default page to show when Electron is started without
-|                  providing an app.
-├── docs/ - Documentations.
-├── lib/ - JavaScript source code.
-|   ├── browser/ - Javascript main process initialization code.
-|   |   └── api/ - Javascript API implementation.
-|   ├── common/ - JavaScript used by both the main and renderer processes
-|   |   └── 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.
+├── spec/ - Components of Electron's test suite run in the renderer process.
+├── spec-main/ - Components of Electron's test suite run in the main process.
 └── BUILD.gn - Building rules of Electron.
 ```
 
-## `/chromium_src`
-
-The files in `/chromium_src` tend to be pieces of Chromium that aren't part of
-the content layer. For example to implement Pepper API, we need some wiring
-similar to what official Chrome does. We could have built the relevant
-sources as a part of [libcc](../glossary.md#libchromiumcontent) but most
-often we don't require all the features (some tend to be proprietary,
-analytics stuff) so we took parts of the code. These could have easily
-been patches in libcc, but at the time when these were written the goal of
-libcc was to maintain very minimal patches and chromium_src changes tend to be
-big ones. Also, note that these patches can never be upstreamed unlike other
-libcc patches we maintain now.
-
 ## Structure of Other Directories
 
-* **script** - Scripts used for development purpose like building, packaging,
-  testing, etc.
-* **tools** - Helper scripts used by GN files, unlike `script`, scripts put
-  here should never be invoked by users directly.
-* **vendor** - Source code of third party dependencies, we didn't use
-  `third_party` as name because it would confuse it with the same directory in
-  Chromium's source code tree.
-* **node_modules** - Third party node modules used for building.
-* **out** - Temporary output directory of `ninja`.
+* **.circleci** - Config file for CI with CircleCI.
+* **.github** - GitHub-specific config files including issues templates and CODEOWNERS.
 * **dist** - Temporary directory created by `script/create-dist.py` script
   when creating a distribution.
 * **external_binaries** - Downloaded binaries of third-party frameworks which
   do not support building with `gn`.
+* **node_modules** - Third party node modules used for building.
+* **npm** - Logic for installation of Electron via npm.
+* **out** - Temporary output directory of `ninja`.
+* **script** - Scripts used for development purpose like building, packaging,
+  testing, etc.
+```diff
+script/ - The set of all scripts Electron runs for a variety of purposes.
+├── codesign/ - Fakes codesigning for Electron apps; used for testing.
+├── lib/ - Miscellaneous python utility scripts.
+└── release/ - Scripts run during Electron's release process.
+    ├── notes/ - Generates release notes for new Electron versions.
+    └── uploaders/ - Uploads various release-related files during release.
+```
+* **tools** - Helper scripts used by GN files.
+  * Scripts put here should never be invoked by users directly, unlike those in `script`.
+* **typings** - TypeScript typings for Electron's internal code.
+* **vendor** - Source code for some third party dependencies, including `boto` and `requests`.
 
 ## Keeping Git Submodules Up to Date
 

docs/development/testing.md

@@ -11,6 +11,7 @@ as well as unit and integration tests. To learn more about Electron's
 coding style, please see the [coding-style](coding-style.md) document.
 
 ## Linting
+
 To ensure that your JavaScript is in compliance with the Electron coding
 style, run `npm run lint-js`, which will run `standard` against both
 Electron itself as well as the unit tests. If you are using an editor
@@ -44,11 +45,29 @@ would run `npm run test -- -g ipc`.
 [standard-addons]: https://standardjs.com/#are-there-text-editor-plugins
 
 ### Testing on Windows 10 devices
+
+#### Extra steps to run the unit test:
+
+1. Visual Studio 2019 must be installed.
+2. Node headers have to be compiled for your configuration.
+   ```powershell
+   ninja -C out\Testing third_party\electron_node:headers
+   ```
+3. The electron.lib has to be copied as node.lib.
+   ```powershell
+   cd out\Testing
+   mkdir gen\node_headers\Release
+   copy electron.lib gen\node_headers\Release\node.lib
+   ```
+
+#### Missing fonts
+
 [Some Windows 10 devices](https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list) do not ship with the Meiryo font installed, which may cause a font fallback test to fail. To install Meiryo:
 1. Push the Windows key and search for _Manage optional features_.
-1. Click _Add a feature_.
-1. Select _Japanese Supplemental Fonts_ and click _Install_.
+2. Click _Add a feature_.
+3. Select _Japanese Supplemental Fonts_ and click _Install_.
 
+#### Pixel measurements
 
 Some tests which rely on precise pixel measurements may not work correctly on
 devices with Hi-DPI screen settings due to floating point precision errors.
@@ -56,4 +75,4 @@ To run these tests correctly, make sure the device is set to 100% scaling.
 
 To configure display scaling:
 1. Push the Windows key and search for _Display settings_.
-1. Under _Scale and layout_, make sure that the device is set to 100%.
+2. Under _Scale and layout_, make sure that the device is set to 100%.

docs/faq.md

@@ -64,9 +64,9 @@ require('electron').remote.getGlobal('sharedObject').someProperty = 'new value'
 console.log(require('electron').remote.getGlobal('sharedObject').someProperty)
 ```
 
-## My app's window/tray disappeared after a few minutes.
+## My app's tray disappeared after a few minutes.
 
-This happens when the variable which is used to store the window/tray gets
+This happens when the variable which is used to store the tray gets
 garbage collected.
 
 If you encounter this problem, the following articles may prove helpful:

docs/fiddles/native-ui/external-links-file-manager/index.html

@@ -0,0 +1,104 @@
+<!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>

docs/fiddles/native-ui/external-links-file-manager/main.js

@@ -0,0 +1,56 @@
+// 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.

docs/fiddles/native-ui/external-links-file-manager/renderer.js

@@ -0,0 +1,13 @@
+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')
+})

docs/fiddles/native-ui/tray/index.html

@@ -0,0 +1,126 @@
+<!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>

docs/fiddles/native-ui/tray/renderer.js

@@ -0,0 +1,35 @@
+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)
+    })
+  }
+})

docs/fiddles/windows/manage-windows/frameless-window/index.html

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>Frameless window</title>
+  </head>
+
+  <body>
+    <div>
+      <h1>Create and Manage Windows</h1>
+
+      <h3>
+        The <code>BrowserWindow</code> module in Electron allows you to create a
+        new browser window or manage an existing one.
+      </h3>
+
+      <p>
+        Each browser window is a separate process, known as the renderer
+        process. This process, like the main process that controls the life
+        cycle of the app, has full access to the Node.js APIs.
+      </p>
+
+      <p>
+        Open the
+        <a href="http://electron.atom.io/docs/api/browser-window">
+          full API documentation (opens in new window)
+        </a>
+        in your browser.
+      </p>
+    </div>
+
+    <div>
+      <div>
+        <h2>Create a frameless window</h2>
+        <div>
+          <div>
+            <button id="frameless-window">View Demo</button>
+          </div>
+          <p>
+            A frameless window is a window that has no
+            <a href="https://developer.mozilla.org/en-US/docs/Glossary/Chrome">
+              "chrome"
+            </a>
+            , 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>
+
+          <p>
+            Windows can have a transparent background, too. By setting the
+            <code>transparent</code> option to <code>true</code>, you can also
+            make your frameless window transparent:
+          </p>
+          <pre>
+<code class="language-js">var win = new BrowserWindow({
+  transparent: true,
+  frame: false
+})</code></pre>
+
+          <p>
+            For more details, see the
+            <a href="http://electron.atom.io/docs/api/frameless-window/">
+              Frameless Window
+            </a>
+            documentation.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
+  </body>
+</html>

docs/fiddles/windows/manage-windows/frameless-window/main.js

@@ -0,0 +1,56 @@
+// 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.

docs/fiddles/windows/manage-windows/frameless-window/renderer.js

@@ -0,0 +1,25 @@
+const { BrowserWindow } = require('electron').remote
+const shell = require('electron').shell
+
+const framelessWindowBtn = document.getElementById('frameless-window')
+
+const links = document.querySelectorAll('a[href]')
+
+framelessWindowBtn.addEventListener('click', (event) => {
+  const modalPath = 'https://electronjs.org'
+  let win = new BrowserWindow({ frame: false })
+
+  win.on('close', () => { win = null })
+  win.loadURL(modalPath)
+  win.show()
+})
+
+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)
+    })
+  }
+})

docs/fiddles/windows/manage-windows/manage-window-state/index.html

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>Manage window state</title>
+  </head>
+
+  <body>
+    <div>
+      <h1>Create and Manage Windows</h1>
+
+      <h3>
+        The <code>BrowserWindow</code> module in Electron allows you to create a
+        new browser window or manage an existing one.
+      </h3>
+
+      <p>
+        Each browser window is a separate process, known as the renderer
+        process. This process, like the main process that controls the life
+        cycle of the app, has full access to the Node.js APIs.
+      </p>
+
+      <p>
+        Open the
+        <a href="http://electron.atom.io/docs/api/browser-window">
+          full API documentation (opens in new window)
+        </a>
+        in your browser.
+      </p>
+    </div>
+
+    <div>
+      <div>
+        <h2>Manage window state</h2>
+        <div>
+          <div>
+            <button id="manage-window">View Demo</button>
+            <span id="manage-window-reply"></span>
+          </div>
+          <p>
+            In this demo we create a new window and listen for
+            <code>move</code> and <code>resize</code> events on it. Click the
+            demo button, change the new window and see the dimensions and
+            position update here, above.
+          </p>
+          <p>
+            There are a lot of methods for controlling the state of the window
+            such as the size, location, and focus status as well as events to
+            listen to for window changes. Visit the
+            <a href="http://electron.atom.io/docs/api/browser-window">
+              documentation (opens in new window)
+            </a>
+            for the full list.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
+  </body>
+</html>

docs/fiddles/windows/manage-windows/manage-window-state/main.js

@@ -0,0 +1,56 @@
+// 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.

docs/fiddles/windows/manage-windows/manage-window-state/renderer.js

@@ -0,0 +1,35 @@
+const { BrowserWindow } = require('electron').remote
+const shell = require('electron').shell
+
+const manageWindowBtn = document.getElementById('manage-window')
+
+const links = document.querySelectorAll('a[href]')
+
+let win
+
+manageWindowBtn.addEventListener('click', (event) => {
+  const modalPath = 'https://electronjs.org'
+  win = new BrowserWindow({ width: 400, height: 275 })
+
+  win.on('resize', updateReply)
+  win.on('move', updateReply)
+  win.on('close', () => { win = null })
+  win.loadURL(modalPath)
+  win.show()
+
+  function updateReply () {
+    const manageWindowReply = document.getElementById('manage-window-reply')
+    const message = `Size: ${win.getSize()} Position: ${win.getPosition()}`
+    manageWindowReply.innerText = 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)
+    })
+  }
+})

docs/fiddles/windows/manage-windows/new-window/index.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+</head>
+<body>
+  <h2>Create a new window</h2>
+  <h3>Supports: Win, MacOS, Linux <span>|</span> Process: Main</h3>
+  <button id="new-window">View Demo</button>
+  <p>The <code>BrowserWindow</code> module gives you the ability to create new windows in your app. This main process module can be used from the renderer process with the <code>remote</code> module, as is shown in this demo.</p>
+  <p>There are a lot of options when creating a new window. A few are in this demo, but visit the <a id="browser-window-link" href="">documentation<span>(opens in new window)</span></a>
+<div>
+            <h2>ProTip</h2>
+            <strong>Use an invisible browser window to run background tasks.</strong>
+            <p>You can set a new browser window to not be shown (be invisible) in order to use that additional renderer process as a kind of new thread in which to run JavaScript in the background of your app. You do this by setting the <code>show</code> property to <code>false</code> when defining the new window.</p>
+            <pre><code><span>var</span> win = <span>new</span> BrowserWindow({
+  <span>width</span>: <span>400</span>, <span>height</span>: <span>225</span>, <span>show</span>: <span>false</span>
+})</code></pre>
+          </div>
+    <script>
+    // You can also require other files to run in this process
+    require('./renderer.js')
+  </script>
+</body>
+</html>

docs/fiddles/windows/manage-windows/new-window/main.js

@@ -0,0 +1,56 @@
+// 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.

docs/fiddles/windows/manage-windows/new-window/renderer.js

@@ -0,0 +1,19 @@
+const { BrowserWindow } = require('electron').remote
+const { shell } = require('electron').remote
+
+const newWindowBtn = document.getElementById('new-window')
+const link = document.getElementById('browser-window-link')
+
+newWindowBtn.addEventListener('click', (event) => {
+
+  let win = new BrowserWindow({ width: 400, height: 320 })
+
+  win.on('close', () => { win = null })
+  win.loadURL('https://electronjs.org')
+  win.show()
+})
+
+link.addEventListener('click', (e) => {
+  e.preventDefault()
+  shell.openExternal("http://electron.atom.io/docs/api/browser-window")
+})

docs/fiddles/windows/manage-windows/window-events/index.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>Window events</title>
+  </head>
+
+  <body>
+    <div>
+      <h1>Create and Manage Windows</h1>
+
+      <h3>
+        The <code>BrowserWindow</code> module in Electron allows you to create a
+        new browser window or manage an existing one.
+      </h3>
+
+      <p>
+        Each browser window is a separate process, known as the renderer
+        process. This process, like the main process that controls the life
+        cycle of the app, has full access to the Node.js APIs.
+      </p>
+
+      <p>
+        Open the
+        <a href="http://electron.atom.io/docs/api/browser-window">
+          full API documentation (opens in new window)
+        </a>
+        in your browser.
+      </p>
+    </div>
+
+    <div>
+      <div>
+        <h2>Window events</h2>
+        <div>
+          <div>
+            <button id="listen-to-window">View Demo</button>
+            <button id="focus-on-modal-window">
+              Focus on Demo
+            </button>
+          </div>
+          <p>
+            In this demo, we create a new window and listen for
+            <code>blur</code> event on it. Click the demo button to create a new
+            modal window, and switch focus back to the parent window by clicking
+            on it. You can click the <i>Focus on Demo</i> button to switch focus
+            to the modal window again.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
+  </body>
+</html>

docs/fiddles/windows/manage-windows/window-events/main.js

@@ -0,0 +1,56 @@
+// 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.

docs/fiddles/windows/manage-windows/window-events/renderer.js

@@ -0,0 +1,48 @@
+const { BrowserWindow } = require('electron').remote
+const shell = require('electron').shell
+
+const listenToWindowBtn = document.getElementById('listen-to-window')
+const focusModalBtn = document.getElementById('focus-on-modal-window')
+
+const links = document.querySelectorAll('a[href]')
+
+let win
+
+listenToWindowBtn.addEventListener('click', () => {
+  const modalPath = 'https://electronjs.org'
+  win = new BrowserWindow({ width: 600, height: 400 })
+
+  const hideFocusBtn = () => {
+    focusModalBtn.classList.add('disappear')
+    focusModalBtn.classList.remove('smooth-appear')
+    focusModalBtn.removeEventListener('click', clickHandler)
+  }
+
+  const showFocusBtn = (btn) => {
+    if (!win) return
+    focusModalBtn.classList.add('smooth-appear')
+    focusModalBtn.classList.remove('disappear')
+    focusModalBtn.addEventListener('click', clickHandler)
+  }
+
+  win.on('focus', hideFocusBtn)
+  win.on('blur', showFocusBtn)
+  win.on('close', () => {
+    hideFocusBtn()
+    win = null
+  })
+  win.loadURL(modalPath)
+  win.show()
+
+  const clickHandler = () => { win.focus() }
+})
+
+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)
+    })
+  }
+})

docs/tutorial/automated-testing-with-a-custom-driver.md

@@ -5,13 +5,13 @@ To write automated tests for your Electron app, you will need a way to "drive" y
 To create a custom driver, we'll use Node.js' [child_process](https://nodejs.org/api/child_process.html) API. The test suite will spawn the Electron process, then establish a simple messaging protocol:
 
 ```js
-var childProcess = require('child_process')
-var electronPath = require('electron')
+const childProcess = require('child_process')
+const electronPath = require('electron')
 
 // spawn the process
-var env = { /* ... */ }
-var stdio = ['inherit', 'inherit', 'inherit', 'ipc']
-var appProcess = childProcess.spawn(electronPath, ['./app'], { stdio, env })
+let env = { /* ... */ }
+let stdio = ['inherit', 'inherit', 'inherit', 'ipc']
+let appProcess = childProcess.spawn(electronPath, ['./app'], { stdio, env })
 
 // listen for IPC messages from the app
 appProcess.on('message', (msg) => {
@@ -50,7 +50,7 @@ class TestDriver {
     // handle rpc responses
     this.process.on('message', (message) => {
       // pop the handler
-      var rpcCall = this.rpcCalls[message.msgId]
+      let rpcCall = this.rpcCalls[message.msgId]
       if (!rpcCall) return
       this.rpcCalls[message.msgId] = null
       // reject/resolve
@@ -70,7 +70,7 @@ class TestDriver {
   // to use: driver.rpc('method', 1, 2, 3).then(...)
   async rpc (cmd, ...args) {
     // send rpc request
-    var msgId = this.rpcCalls.length
+    let msgId = this.rpcCalls.length
     this.process.send({ msgId, cmd, args })
     return new Promise((resolve, reject) => this.rpcCalls.push({ resolve, reject }))
   }
@@ -89,13 +89,13 @@ if (process.env.APP_TEST_DRIVER) {
 }
 
 async function onMessage ({ msgId, cmd, args }) {
-  var method = METHODS[cmd]
+  let method = METHODS[cmd]
   if (!method) method = () => new Error('Invalid method: ' + cmd)
   try {
-    var resolve = await method(...args)
+    let resolve = await method(...args)
     process.send({ msgId, resolve })
   } catch (err) {
-    var reject = {
+    let reject = {
       message: err.message,
       stack: err.stack,
       name: err.name
@@ -116,10 +116,10 @@ const METHODS = {
 Then, in your test suite, you can use your test-driver as follows:
 
 ```js
-var test = require('ava')
-var electronPath = require('electron')
+const test = require('ava')
+const electronPath = require('electron')
 
-var app = new TestDriver({
+let app = new TestDriver({
   path: electronPath,
   args: ['./app'],
   env: {

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,15 +11,18 @@ 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.
-For example, here's what macOS users see when attempting to start an unsigned app:
+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.
 
-![unsigned app warning on macOS](https://user-images.githubusercontent.com/2289/39488937-bdc854ba-4d38-11e8-88f8-7b3c125baefc.png)
+![macOS Catalina Gatekeeper warning: The app cannot be opened because the developer cannot be verified](../images/gatekeeper.png)
 
-> App can't be opened because it is from an unidentified developer
+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.
 
 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
@@ -39,7 +42,20 @@ 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)
 
-For more info, see the [Mac App Store Submission Guide].
+## 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].
 
 # Signing Windows builds
 
@@ -70,8 +86,9 @@ 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-userland/electron-osx-sign/wiki/1.-Getting-Started#certificates
-[Mac App Store Submission Guide]: mac-app-store-submission-guide.md
+[signing certificates]: https://github.com/electron/electron-osx-sign/wiki/1.-Getting-Started#certificates
+[Mac App Store Guide]: mac-app-store-submission-guide.md
 [Windows Store Guide]: windows-store-guide.md

docs/tutorial/devtools-extension.md

@@ -34,7 +34,7 @@ Using the [React Developer Tools][react-devtools] as example:
    const os = require('os')
 
    BrowserWindow.addDevToolsExtension(
-      path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/0.15.0_0')
+      path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/4.3.0_0')
    )
    ```
 

docs/tutorial/first-app.md

@@ -132,13 +132,9 @@ windows on macOS if the user clicks on the app's icon in the dock.
 ```javascript
 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 win
-
 function createWindow () {
   // Create the browser window.
-  win = new BrowserWindow({
+  const win = new BrowserWindow({
     width: 800,
     height: 600,
     webPreferences: {
@@ -151,14 +147,6 @@ function createWindow () {
 
   // Open the DevTools.
   win.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  win.on('closed', () => {
-    // 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.
-    win = null
-  })
 }
 
 // This method will be called when Electron has finished
@@ -178,7 +166,7 @@ app.on('window-all-closed', () => {
 app.on('activate', () => {
   // On macOS 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 (win === null) {
+  if (BrowserWindow.getAllWindows().length === 0) {
     createWindow()
   }
 })

docs/tutorial/in-app-purchases.md

@@ -37,7 +37,7 @@ inAppPurchase.on('transactions-updated', (event, transactions) => {
 
   // Check each transaction.
   transactions.forEach(function (transaction) {
-    var payment = transaction.payment
+    let payment = transaction.payment
 
     switch (transaction.transactionState) {
       case 'purchasing':

docs/tutorial/installation.md

@@ -56,7 +56,7 @@ can do so by either providing a mirror or an existing cache directory.
 
 #### Mirror
 You can use environment variables to override the base URL, the path at which to
-look for Electron binaries, and the binary filename. The url used by `electron-download`
+look for Electron binaries, and the binary filename. The url used by `@electron/get`
 is composed as follows:
 
 ```plaintext
@@ -70,7 +70,7 @@ ELECTRON_MIRROR="https://cdn.npm.taobao.org/dist/electron/"
 ```
 
 #### Cache
-Alternatively, you can override the local cache. `electron-download` will cache
+Alternatively, you can override the local cache. `@electron/get` will cache
 downloaded binaries in a local directory to not stress your network. You can use
 that cache folder to provide custom builds of Electron or to avoid making contact
 with the network at all.
@@ -82,23 +82,33 @@ 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_CACHE`
+You can also override the local cache location by providing a `electron_config_cache`
 environment variable.
 
 The cache contains the version's official zip file as well as a checksum, stored as
 a text file. A typical cache might look like this:
 
 ```sh
-├── electron-v1.7.9-darwin-x64.zip
-├── electron-v1.8.1-darwin-x64.zip
-├── electron-v1.8.2-beta.1-darwin-x64.zip
-├── electron-v1.8.2-beta.2-darwin-x64.zip
-├── electron-v1.8.2-beta.3-darwin-x64.zip
-├── SHASUMS256.txt-1.7.9
-├── SHASUMS256.txt-1.8.1
-├── SHASUMS256.txt-1.8.2-beta.1
-├── SHASUMS256.txt-1.8.2-beta.2
-├── SHASUMS256.txt-1.8.2-beta.3
+├── httpsgithub.comelectronelectronreleasesdownloadv1.7.9electron-v1.7.9-darwin-x64.zip
+│   └── electron-v1.7.9-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.7.9SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.1electron-v1.8.1-darwin-x64.zip
+│   └── electron-v1.8.1-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.1SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.1electron-v1.8.2-beta.1-darwin-x64.zip
+│   └── electron-v1.8.2-beta.1-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.1SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.2electron-v1.8.2-beta.2-darwin-x64.zip
+│   └── electron-v1.8.2-beta.2-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.2SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.3electron-v1.8.2-beta.3-darwin-x64.zip
+│   └── electron-v1.8.2-beta.3-darwin-x64.zip
+└── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.3SHASUMS256.txt
+    └── SHASUMS256.txt
 ```
 
 ## Skip binary download

docs/tutorial/mojave-dark-mode-guide.md

@@ -2,10 +2,10 @@
 
 In macOS 10.14 Mojave, Apple introduced a new [system-wide dark mode](https://developer.apple.com/design/human-interface-guidelines/macos/visual-design/dark-mode/)
 for all macOS computers.  If your app does have a dark mode, you can make your Electron app
-follow the system-wide dark mode setting.
+follow the system-wide dark mode setting using [the nativeTheme api](../api/native-theme.md).
 
 In macOS 10.15 Catalina, Apple introduced a new "automatic" dark mode option for all macOS computers. In order
-for the `isDarkMode` and `Tray` APIs to work correctly in this mode on Catalina you need to either have `NSRequiresAquaSystemAppearance` set to `false` in your `Info.plist` file or be on Electron `>=7.0.0`.
+for the `nativeTheme.shouldUseDarkColors` and `Tray` APIs to work correctly in this mode on Catalina you need to either have `NSRequiresAquaSystemAppearance` set to `false` in your `Info.plist` file or be on Electron `>=7.0.0`.
 
 ## Automatically updating the native interfaces
 
@@ -18,15 +18,12 @@ out of this theming.
 ## Automatically updating your own interfaces
 
 If your app has its own dark mode you should toggle it on and off in sync with the system's dark mode setting.  You can do
-this by listening for the theme changed event on Electron's `systemPreferences` module.  E.g.
+this by listening for the theme updated event on Electron's `nativeTheme` module.  E.g.
 
 ```js
-const { systemPreferences } = require('electron')
+const { nativeTheme } = require('electron')
 
-systemPreferences.subscribeNotification(
-  'AppleInterfaceThemeChangedNotification',
-  function theThemeHasChanged () {
-    updateMyAppTheme(systemPreferences.isDarkMode())
-  }
-)
+nativeTheme.on('updated', function theThemeHasChanged () {
+  updateMyAppTheme(nativeTheme.shouldUseDarkColors)
+})
 ```

docs/tutorial/offscreen-rendering.md

@@ -21,7 +21,7 @@ performance loss.
 GPU accelerated rendering means that the GPU is used for composition. Because of
 that the frame has to be copied from the GPU which requires more performance,
 thus this mode is quite a bit slower than the other one. The benefit of this
-mode that WebGL and 3D CSS animations are supported.
+mode is that WebGL and 3D CSS animations are supported.
 
 ### Software output device
 

docs/tutorial/online-offline-events.md

@@ -54,7 +54,7 @@ const { app, BrowserWindow, ipcMain } = require('electron')
 let onlineStatusWindow
 
 app.on('ready', () => {
-  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false })
+  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false, webPreferences: { nodeIntegration: true } })
   onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`)
 })
 

docs/tutorial/security.md

@@ -241,7 +241,7 @@ prevent the use of Node primitives, `contextIsolation` must also be used.
 
 ### Why?
 
-Context isolation allows each the scripts on running in the renderer to make
+Context isolation allows each of the scripts running in the renderer to make
 changes to its JavaScript environment without worrying about conflicting with
 the scripts in the Electron API or the preload script.
 
@@ -422,8 +422,6 @@ on a page directly in the markup using a `<meta>` tag:
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'">
 ```
 
-#### `webRequest.onHeadersReceived([filter, ]listener)`
-
 
 ## 7) Do Not Set `allowRunningInsecureContent` to `true`
 

docs/tutorial/support.md

@@ -3,7 +3,7 @@
 ## Finding Support
 
 If you have a security concern,
-please see the [security document](../../SECURITY.md).
+please see the [security document](https://github.com/electron/electron/tree/master/SECURITY.md).
 
 If you're looking for programming help,
 for answers to questions,
@@ -22,7 +22,7 @@ forums
 - [`electron-pl`](https://electronpl.github.io) *(Poland)*
 
 If you'd like to contribute to Electron,
-see the [contributing document](../../CONTRIBUTING.md).
+see the [contributing document](https://github.com/electron/electron/blob/master/CONTRIBUTING.md).
 
 If you've found a bug in a [supported version](#supported-versions) of Electron,
 please report it with the [issue tracker](../development/issues.md).
@@ -108,4 +108,4 @@ are also verified to be able to run the prebuilt binaries of Electron:
 * Fedora 21
 * Debian 8
 
-[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
+[arm-breaking-change]: ../breaking-changes.md#duplicate-arm-assets

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, (response) => {
-    if (response === 0) autoUpdater.quitAndInstall()
+  dialog.showMessageBox(dialogOpts).then((returnValue) => {
+    if (returnValue.response === 0) autoUpdater.quitAndInstall()
   })
 })
 ```

docs/tutorial/web-embeds.md

@@ -0,0 +1,22 @@
+# Web embeds in Electron
+
+If you want to embed (third party) web content in an Electron `BrowserWindow`, there are three options available to you: `<iframe>` tags, `<webview>` tags, and `BrowserViews`. Each one offers slightly different functionality and is useful in different situations. To help you choose between these, this guide will explain the differences and capabilities of each.
+
+## Iframes
+
+Iframes in Electron behave like iframes in regular browsers. An `<iframe>` element in your page can show external web pages, provided that their [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) allows it. To limit the amount of capabilities a site in an `<iframe>` tag, it's recommended to use the [`sandbox` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-sandbox) and only allow the capabilities you want to support.
+
+## WebViews
+
+[WebViews](../api/webview-tag.md) are based on Chromium's WebViews and are not explicitly supported by Electron. We do not guarantee that the WebView API will remain available in future versions of Electron. This is why, if you want to use `<webview>` tags, you will need to set `webviewTag` to `true` in the `webPreferences` of your `BrowserWindow`.
+
+WebViews are a custom element (`<webview>`) that will only work inside Electron.
+They are implemented as an "out-of-process iframe". This means that all communication with the `<webview>` is done asynchronously using IPC. The `<webview>` element has many custom methods and events, similar to `webContents`, that allow you much greater control over the contents.
+
+Compared to an `<iframe>`, `<webview>` tends to be slightly slower but offers much greater control in loading and communicating with the third party content and handling various events.
+
+## BrowserViews
+
+[BrowserViews](../api/browser-view.md) are not part of the DOM - instead, they are created in and controlled by your main process. They are simply another layer of web content on top of your existing window. This means that they are completely separate from your own `BrowserWindow` content and that their position is not controlled by the DOM or CSS but by setting the bounds in the main process.
+
+BrowserViews offer the greatest control over their contents, since they implement the `webContents` similarly to how a `BrowserWindow` implements it. However, they are not part of your DOM but are overlaid on top of them, which means you will have to manage their position manually.

docs/tutorial/windows-arm.md

@@ -71,7 +71,7 @@ If you want to develop your application directly on a Windows on Arm device, sub
 
 By default, `node-gyp` unpacks Electron's node headers and downloads the x86 and x64 versions of `node.lib` into `%APPDATA%\..\Local\node-gyp\Cache`, but it does not download the arm64 version ([a fix for this is in development](https://github.com/nodejs/node-gyp/pull/1875).) To fix this:
 
-1. Download the arm64 `node.lib` from https://atom.io/download/v6.0.9/win-arm64/node.lib
+1. Download the arm64 `node.lib` from https://electronjs.org/headers/v6.0.9/win-arm64/node.lib
 2. Move it to `%APPDATA%\..\Local\node-gyp\Cache\6.0.9\arm64\node.lib`
 
 Substitute `6.0.9` for the version you're using.

electron_paks.gni

@@ -1,4 +1,5 @@
 import("//build/config/locales.gni")
+import("//electron/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//tools/grit/repack.gni")
 import("//ui/base/ui_features.gni")
@@ -56,6 +57,7 @@ template("electron_extra_paks") {
       "$root_gen_dir/components/components_resources.pak",
       "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
       "$root_gen_dir/content/content_resources.pak",
+      "$root_gen_dir/content/dev_ui_content_resources.pak",
       "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
@@ -64,7 +66,8 @@ template("electron_extra_paks") {
     ]
     deps = [
       "//components/resources",
-      "//content:resources",
+      "//content:content_resources",
+      "//content:dev_ui_content_resources",
       "//content/browser/tracing:resources",
       "//electron:resources",
       "//mojo/public/js:resources",
@@ -87,6 +90,13 @@ template("electron_extra_paks") {
       sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ]
       deps += [ "//chrome/browser/resources:print_preview_resources" ]
     }
+    if (enable_electron_extensions) {
+      sources += [
+        "$root_gen_dir/extensions/extensions_renderer_resources.pak",
+        "$root_gen_dir/extensions/extensions_resources.pak",
+      ]
+      deps += [ "//extensions:extensions_resources" ]
+    }
   }
 }
 

filenames.auto.gni

@@ -4,8 +4,6 @@ auto_filenames = {
     "docs/api/accelerator.md",
     "docs/api/app.md",
     "docs/api/auto-updater.md",
-    "docs/api/breaking-changes-ns.md",
-    "docs/api/breaking-changes.md",
     "docs/api/browser-view.md",
     "docs/api/browser-window-proxy.md",
     "docs/api/browser-window.md",
@@ -165,6 +163,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",
@@ -246,6 +245,7 @@ auto_filenames = {
     "lib/browser/api/views/text-field.js",
     "lib/browser/api/web-contents-view.js",
     "lib/browser/api/web-contents.js",
+    "lib/browser/chrome-extension-shim.js",
     "lib/browser/chrome-extension.js",
     "lib/browser/crash-reporter-init.js",
     "lib/browser/default-menu.ts",

filenames.gni

@@ -14,11 +14,11 @@ filenames = {
 
   default_app_octicon_sources = [
     "node_modules/@primer/octicons/build/build.css",
+    "node_modules/@primer/octicons/build/svg/gear.svg",
+    "node_modules/@primer/octicons/build/svg/gift.svg",
     "node_modules/@primer/octicons/build/svg/gist.svg",
     "node_modules/@primer/octicons/build/svg/mark-github.svg",
-    "node_modules/@primer/octicons/build/svg/gear.svg",
     "node_modules/@primer/octicons/build/svg/star.svg",
-    "node_modules/@primer/octicons/build/svg/gift.svg",
   ]
 
   lib_sources = [
@@ -98,8 +98,8 @@ filenames = {
     "shell/browser/api/atom_api_top_level_window.h",
     "shell/browser/api/atom_api_tray.cc",
     "shell/browser/api/atom_api_tray.h",
-    "shell/browser/api/atom_api_url_request.cc",
-    "shell/browser/api/atom_api_url_request.h",
+    "shell/browser/api/atom_api_url_loader.cc",
+    "shell/browser/api/atom_api_url_loader.h",
     "shell/browser/api/atom_api_view.cc",
     "shell/browser/api/atom_api_view.h",
     "shell/browser/api/atom_api_web_contents.cc",
@@ -124,9 +124,9 @@ filenames = {
     "shell/browser/api/save_page_handler.cc",
     "shell/browser/api/save_page_handler.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 +186,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 +227,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 +255,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 +296,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 +308,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 +320,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,34 +331,35 @@ 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",
     "shell/browser/ui/views/atom_views_delegate.h",
+    "shell/browser/ui/views/atom_views_delegate_win.cc",
     "shell/browser/ui/views/autofill_popup_view.cc",
     "shell/browser/ui/views/autofill_popup_view.h",
     "shell/browser/ui/views/frameless_view.cc",
@@ -413,11 +414,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",
@@ -432,10 +433,8 @@ 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/constructor.h",
     "shell/common/api/features.cc",
     "shell/common/application_info.cc",
     "shell/common/application_info.h",
@@ -475,6 +474,8 @@ filenames = {
     "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/extension_converter.cc",
+    "shell/common/gin_converters/extension_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",
@@ -495,15 +496,16 @@ filenames = {
     "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",
@@ -512,15 +514,18 @@ filenames = {
     "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/promise.h",
     "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",
@@ -556,10 +561,10 @@ 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",
@@ -586,6 +591,8 @@ filenames = {
   lib_sources_extensions = [
     "shell/browser/extensions/api/runtime/atom_runtime_api_delegate.cc",
     "shell/browser/extensions/api/runtime/atom_runtime_api_delegate.h",
+    "shell/browser/extensions/api/tabs/tabs_api.cc",
+    "shell/browser/extensions/api/tabs/tabs_api.h",
     "shell/browser/extensions/atom_extensions_browser_client.cc",
     "shell/browser/extensions/atom_extensions_browser_client.h",
     "shell/browser/extensions/atom_browser_context_keyed_service_factories.cc",
@@ -604,12 +611,22 @@ filenames = {
     "shell/browser/extensions/atom_extension_web_contents_observer.h",
     "shell/browser/extensions/atom_navigation_ui_data.cc",
     "shell/browser/extensions/atom_navigation_ui_data.h",
+    "shell/browser/extensions/electron_process_manager_delegate.cc",
+    "shell/browser/extensions/electron_process_manager_delegate.h",
+    "shell/browser/extensions/electron_extensions_api_client.cc",
+    "shell/browser/extensions/electron_extensions_api_client.h",
+    "shell/browser/extensions/electron_extensions_browser_api_provider.cc",
+    "shell/browser/extensions/electron_extensions_browser_api_provider.h",
+    "shell/browser/extensions/electron_messaging_delegate.cc",
+    "shell/browser/extensions/electron_messaging_delegate.h",
     "shell/common/extensions/atom_extensions_api_provider.cc",
     "shell/common/extensions/atom_extensions_api_provider.h",
     "shell/common/extensions/atom_extensions_client.cc",
     "shell/common/extensions/atom_extensions_client.h",
     "shell/renderer/extensions/atom_extensions_renderer_client.cc",
     "shell/renderer/extensions/atom_extensions_renderer_client.h",
+    "shell/renderer/extensions/electron_extensions_dispatcher_delegate.cc",
+    "shell/renderer/extensions/electron_extensions_dispatcher_delegate.h",
   ]
 
   app_sources = [

filenames.hunspell.gni

@@ -7,13 +7,13 @@ hunspell_dictionaries = [
   "//third_party/hunspell_dictionaries/da-DK-3-0.bdic",
   "//third_party/hunspell_dictionaries/de-DE-3-0.bdic",
   "//third_party/hunspell_dictionaries/el-GR-3-0.bdic",
-  "//third_party/hunspell_dictionaries/en-AU-8-0.bdic",
-  "//third_party/hunspell_dictionaries/en-CA-8-0.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-8-0.bdic",
-  "//third_party/hunspell_dictionaries/en-US-8-0.bdic",
+  "//third_party/hunspell_dictionaries/en-AU-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-CA-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-GB-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-US-9-0.bdic",
   "//third_party/hunspell_dictionaries/es-ES-3-0.bdic",
   "//third_party/hunspell_dictionaries/et-EE-3-0.bdic",
-  "//third_party/hunspell_dictionaries/fa-IR-8-0.bdic",
+  "//third_party/hunspell_dictionaries/fa-IR-9-0.bdic",
   "//third_party/hunspell_dictionaries/fo-FO-3-0.bdic",
   "//third_party/hunspell_dictionaries/fr-FR-3-0.bdic",
   "//third_party/hunspell_dictionaries/he-IL-3-0.bdic",

lib/browser/api/browser-window.js

@@ -116,7 +116,7 @@ BrowserWindow.getFocusedWindow = () => {
 
 BrowserWindow.fromWebContents = (webContents) => {
   for (const window of BrowserWindow.getAllWindows()) {
-    if (window.webContents.equal(webContents)) return window
+    if (window.webContents && window.webContents.equal(webContents)) return window
   }
 
   return null

lib/browser/api/dialog.js

@@ -163,6 +163,7 @@ const messageBox = (sync, window, options) => {
     defaultId = -1,
     detail = '',
     icon = null,
+    noLink = false,
     message = '',
     title = '',
     type = 'none'
@@ -173,11 +174,15 @@ const messageBox = (sync, window, options) => {
   if (!Array.isArray(buttons)) throw new TypeError('Buttons must be an array')
   if (options.normalizeAccessKeys) buttons = buttons.map(normalizeAccessKey)
   if (typeof title !== 'string') throw new TypeError('Title must be a string')
+  if (typeof noLink !== 'boolean') throw new TypeError('noLink must be a boolean')
   if (typeof message !== 'string') throw new TypeError('Message must be a string')
   if (typeof detail !== 'string') throw new TypeError('Detail must be a string')
   if (typeof checkboxLabel !== 'string') throw new TypeError('checkboxLabel must be a string')
 
   checkboxChecked = !!checkboxChecked
+  if (checkboxChecked && !checkboxLabel) {
+    throw new Error('checkboxChecked requires that checkboxLabel also be passed')
+  }
 
   // Choose a default button to get selected when dialog is cancelled.
   if (cancelId == null) {
@@ -192,15 +197,13 @@ const messageBox = (sync, window, options) => {
     }
   }
 
-  const flags = options.noLink ? messageBoxOptions.noLink : 0
-
   const settings = {
     window,
     messageBoxType,
     buttons,
     defaultId,
     cancelId,
-    flags,
+    noLink,
     title,
     message,
     detail,

lib/browser/api/net.js

@@ -2,17 +2,13 @@
 
 const url = require('url')
 const { EventEmitter } = require('events')
-const { Readable } = require('stream')
+const { Readable, Writable } = require('stream')
 const { app } = require('electron')
 const { Session } = process.electronBinding('session')
-const { net, Net } = process.electronBinding('net')
-const { URLRequest } = net
+const { net, Net, _isValidHeaderName, _isValidHeaderValue } = process.electronBinding('net')
+const { URLLoader } = net
 
-// Net is an EventEmitter.
-Object.setPrototypeOf(Net.prototype, EventEmitter.prototype)
-EventEmitter.call(net)
-
-Object.setPrototypeOf(URLRequest.prototype, EventEmitter.prototype)
+Object.setPrototypeOf(URLLoader.prototype, EventEmitter.prototype)
 
 const kSupportedProtocols = new Set(['http:', 'https:'])
 
@@ -40,43 +36,44 @@ const discardableDuplicateHeaders = new Set([
 ])
 
 class IncomingMessage extends Readable {
-  constructor (urlRequest) {
+  constructor (responseHead) {
     super()
-    this.urlRequest = urlRequest
-    this.shouldPush = false
-    this.data = []
-    this.urlRequest.on('data', (event, chunk) => {
-      this._storeInternalData(chunk)
-      this._pushInternalData()
-    })
-    this.urlRequest.on('end', () => {
-      this._storeInternalData(null)
-      this._pushInternalData()
-    })
+    this._shouldPush = false
+    this._data = []
+    this._responseHead = responseHead
   }
 
   get statusCode () {
-    return this.urlRequest.statusCode
+    return this._responseHead.statusCode
   }
 
   get statusMessage () {
-    return this.urlRequest.statusMessage
+    return this._responseHead.statusMessage
   }
 
   get headers () {
     const filteredHeaders = {}
-    const rawHeaders = this.urlRequest.rawResponseHeaders
-    Object.keys(rawHeaders).forEach(header => {
-      if (header in filteredHeaders && discardableDuplicateHeaders.has(header)) {
+    const { rawHeaders } = this._responseHead
+    rawHeaders.forEach(header => {
+      if (Object.prototype.hasOwnProperty.call(filteredHeaders, header.key) &&
+          discardableDuplicateHeaders.has(header.key)) {
         // do nothing with discardable duplicate headers
       } else {
-        if (header === 'set-cookie') {
+        if (header.key === 'set-cookie') {
           // keep set-cookie as an array per Node.js rules
           // see https://nodejs.org/api/http.html#http_message_headers
-          filteredHeaders[header] = rawHeaders[header]
+          if (Object.prototype.hasOwnProperty.call(filteredHeaders, header.key)) {
+            filteredHeaders[header.key].push(header.value)
+          } else {
+            filteredHeaders[header.key] = [header.value]
+          }
         } else {
           // for non-cookie headers, the values are joined together with ', '
-          filteredHeaders[header] = rawHeaders[header].join(', ')
+          if (Object.prototype.hasOwnProperty.call(filteredHeaders, header.key)) {
+            filteredHeaders[header.key] += `, ${header.value}`
+          } else {
+            filteredHeaders[header.key] = header.value
+          }
         }
       }
     })
@@ -88,11 +85,11 @@ class IncomingMessage extends Readable {
   }
 
   get httpVersionMajor () {
-    return this.urlRequest.httpVersionMajor
+    return this._responseHead.httpVersion.major
   }
 
   get httpVersionMinor () {
-    return this.urlRequest.httpVersionMinor
+    return this._responseHead.httpVersion.minor
   }
 
   get rawTrailers () {
@@ -104,181 +101,197 @@ class IncomingMessage extends Readable {
   }
 
   _storeInternalData (chunk) {
-    this.data.push(chunk)
+    this._data.push(chunk)
+    this._pushInternalData()
   }
 
   _pushInternalData () {
-    while (this.shouldPush && this.data.length > 0) {
-      const chunk = this.data.shift()
-      this.shouldPush = this.push(chunk)
+    while (this._shouldPush && this._data.length > 0) {
+      const chunk = this._data.shift()
+      this._shouldPush = this.push(chunk)
     }
   }
 
   _read () {
-    this.shouldPush = true
+    this._shouldPush = true
     this._pushInternalData()
   }
 }
 
-URLRequest.prototype._emitRequestEvent = function (isAsync, ...rest) {
-  if (isAsync) {
-    process.nextTick(() => {
-      this.clientRequest.emit(...rest)
-    })
-  } else {
-    this.clientRequest.emit(...rest)
-  }
-}
-
-URLRequest.prototype._emitResponseEvent = function (isAsync, ...rest) {
-  if (isAsync) {
-    process.nextTick(() => {
-      this._response.emit(...rest)
-    })
-  } else {
-    this._response.emit(...rest)
-  }
-}
-
-class ClientRequest extends EventEmitter {
-  constructor (options, callback) {
+/** Writable stream that buffers up everything written to it. */
+class SlurpStream extends Writable {
+  constructor () {
     super()
+    this._data = Buffer.alloc(0)
+  }
+  _write (chunk, encoding, callback) {
+    this._data = Buffer.concat([this._data, chunk])
+    callback()
+  }
+  data () { return this._data }
+}
+
+class ChunkedBodyStream extends Writable {
+  constructor (clientRequest) {
+    super()
+    this._clientRequest = clientRequest
+  }
+
+  _write (chunk, encoding, callback) {
+    if (this._downstream) {
+      this._downstream.write(chunk).then(callback, callback)
+    } else {
+      // the contract of _write is that we won't be called again until we call
+      // the callback, so we're good to just save a single chunk.
+      this._pendingChunk = chunk
+      this._pendingCallback = callback
+
+      // The first write to a chunked body stream begins the request.
+      this._clientRequest._startRequest()
+    }
+  }
+
+  _final (callback) {
+    this._downstream.done()
+    callback()
+  }
+
+  startReading (pipe) {
+    if (this._downstream) {
+      throw new Error('two startReading calls???')
+    }
+    this._downstream = pipe
+    if (this._pendingChunk) {
+      const doneWriting = (maybeError) => {
+        const cb = this._pendingCallback
+        delete this._pendingCallback
+        delete this._pendingChunk
+        cb(maybeError)
+      }
+      this._downstream.write(this._pendingChunk).then(doneWriting, doneWriting)
+    }
+  }
+}
+
+function parseOptions (options) {
+  if (typeof options === 'string') {
+    options = url.parse(options)
+  } else {
+    options = { ...options }
+  }
+
+  const method = (options.method || 'GET').toUpperCase()
+  let urlStr = options.url
+
+  if (!urlStr) {
+    const urlObj = {}
+    const protocol = options.protocol || 'http:'
+    if (!kSupportedProtocols.has(protocol)) {
+      throw new Error('Protocol "' + protocol + '" not supported')
+    }
+    urlObj.protocol = protocol
+
+    if (options.host) {
+      urlObj.host = options.host
+    } else {
+      if (options.hostname) {
+        urlObj.hostname = options.hostname
+      } else {
+        urlObj.hostname = 'localhost'
+      }
+
+      if (options.port) {
+        urlObj.port = options.port
+      }
+    }
+
+    if (options.path && / /.test(options.path)) {
+      // The actual regex is more like /[^A-Za-z0-9\-._~!$&'()*+,;=/:@]/
+      // with an additional rule for ignoring percentage-escaped characters
+      // but that's a) hard to capture in a regular expression that performs
+      // well, and b) possibly too restrictive for real-world usage. That's
+      // why it only scans for spaces because those are guaranteed to create
+      // an invalid request.
+      throw new TypeError('Request path contains unescaped characters')
+    }
+    const pathObj = url.parse(options.path || '/')
+    urlObj.pathname = pathObj.pathname
+    urlObj.search = pathObj.search
+    urlObj.hash = pathObj.hash
+    urlStr = url.format(urlObj)
+  }
+
+  const redirectPolicy = options.redirect || 'follow'
+  if (!['follow', 'error', 'manual'].includes(redirectPolicy)) {
+    throw new Error('redirect mode should be one of follow, error or manual')
+  }
+
+  if (options.headers != null && typeof options.headers !== 'object') {
+    throw new TypeError('headers must be an object')
+  }
+
+  const urlLoaderOptions = {
+    method: method,
+    url: urlStr,
+    redirectPolicy,
+    extraHeaders: options.headers || {}
+  }
+  for (const [name, value] of Object.entries(urlLoaderOptions.extraHeaders)) {
+    if (!_isValidHeaderName(name)) {
+      throw new Error(`Invalid header name: '${name}'`)
+    }
+    if (!_isValidHeaderValue(value.toString())) {
+      throw new Error(`Invalid value for header '${name}': '${value}'`)
+    }
+  }
+  if (options.session) {
+    if (options.session instanceof Session) {
+      urlLoaderOptions.session = options.session
+    } else {
+      throw new TypeError('`session` should be an instance of the Session class')
+    }
+  } else if (options.partition) {
+    if (typeof options.partition === 'string') {
+      urlLoaderOptions.partition = options.partition
+    } else {
+      throw new TypeError('`partition` should be a string')
+    }
+  }
+  return urlLoaderOptions
+}
+
+class ClientRequest extends Writable {
+  constructor (options, callback) {
+    super({ autoDestroy: true })
 
     if (!app.isReady()) {
       throw new Error('net module can only be used after app is ready')
     }
 
-    if (typeof options === 'string') {
-      options = url.parse(options)
-    } else {
-      options = Object.assign({}, options)
-    }
-
-    const method = (options.method || 'GET').toUpperCase()
-    let urlStr = options.url
-
-    if (!urlStr) {
-      const urlObj = {}
-      const protocol = options.protocol || 'http:'
-      if (!kSupportedProtocols.has(protocol)) {
-        throw new Error('Protocol "' + protocol + '" not supported')
-      }
-      urlObj.protocol = protocol
-
-      if (options.host) {
-        urlObj.host = options.host
-      } else {
-        if (options.hostname) {
-          urlObj.hostname = options.hostname
-        } else {
-          urlObj.hostname = 'localhost'
-        }
-
-        if (options.port) {
-          urlObj.port = options.port
-        }
-      }
-
-      if (options.path && / /.test(options.path)) {
-        // The actual regex is more like /[^A-Za-z0-9\-._~!$&'()*+,;=/:@]/
-        // with an additional rule for ignoring percentage-escaped characters
-        // but that's a) hard to capture in a regular expression that performs
-        // well, and b) possibly too restrictive for real-world usage. That's
-        // why it only scans for spaces because those are guaranteed to create
-        // an invalid request.
-        throw new TypeError('Request path contains unescaped characters')
-      }
-      const pathObj = url.parse(options.path || '/')
-      urlObj.pathname = pathObj.pathname
-      urlObj.search = pathObj.search
-      urlObj.hash = pathObj.hash
-      urlStr = url.format(urlObj)
-    }
-
-    const redirectPolicy = options.redirect || 'follow'
-    if (!['follow', 'error', 'manual'].includes(redirectPolicy)) {
-      throw new Error('redirect mode should be one of follow, error or manual')
-    }
-
-    const urlRequestOptions = {
-      method: method,
-      url: urlStr,
-      redirect: redirectPolicy
-    }
-    if (options.session) {
-      if (options.session instanceof Session) {
-        urlRequestOptions.session = options.session
-      } else {
-        throw new TypeError('`session` should be an instance of the Session class')
-      }
-    } else if (options.partition) {
-      if (typeof options.partition === 'string') {
-        urlRequestOptions.partition = options.partition
-      } else {
-        throw new TypeError('`partition` should be a string')
-      }
-    }
-
-    const urlRequest = new URLRequest(urlRequestOptions)
-
-    // Set back and forward links.
-    this.urlRequest = urlRequest
-    urlRequest.clientRequest = this
-
-    // This is a copy of the extra headers structure held by the native
-    // net::URLRequest. The main reason is to keep the getHeader API synchronous
-    // after the request starts.
-    this.extraHeaders = {}
-
-    if (options.headers) {
-      for (const key in options.headers) {
-        this.setHeader(key, options.headers[key])
-      }
-    }
-
-    // Set when the request uses chunked encoding. Can be switched
-    // to true only once and never set back to false.
-    this.chunkedEncodingEnabled = false
-
-    urlRequest.on('response', () => {
-      const response = new IncomingMessage(urlRequest)
-      urlRequest._response = response
-      this.emit('response', response)
-    })
-
-    urlRequest.on('login', (event, authInfo, callback) => {
-      this.emit('login', authInfo, (username, password) => {
-        // If null or undefined username/password, force to empty string.
-        if (username === null || username === undefined) {
-          username = ''
-        }
-        if (typeof username !== 'string') {
-          throw new Error('username must be a string')
-        }
-        if (password === null || password === undefined) {
-          password = ''
-        }
-        if (typeof password !== 'string') {
-          throw new Error('password must be a string')
-        }
-        callback(username, password)
-      })
-    })
-
     if (callback) {
       this.once('response', callback)
     }
-  }
 
-  get chunkedEncoding () {
-    return this.chunkedEncodingEnabled
+    const { redirectPolicy, ...urlLoaderOptions } = parseOptions(options)
+    this._urlLoaderOptions = urlLoaderOptions
+    this._redirectPolicy = redirectPolicy
+    this._started = false
   }
 
   set chunkedEncoding (value) {
-    if (!this.urlRequest.notStarted) {
-      throw new Error('Can\'t set the transfer encoding, headers have been sent')
+    if (this._started) {
+      throw new Error('chunkedEncoding can only be set before the request is started')
+    }
+    if (typeof this._chunkedEncoding !== 'undefined') {
+      throw new Error('chunkedEncoding can only be set once')
+    }
+    this._chunkedEncoding = !!value
+    if (this._chunkedEncoding) {
+      this._body = new ChunkedBodyStream(this)
+      this._urlLoaderOptions.body = (pipe) => {
+        this._body.startReading(pipe)
+      }
     }
-    this.chunkedEncodingEnabled = value
   }
 
   setHeader (name, value) {
@@ -288,13 +301,18 @@ class ClientRequest extends EventEmitter {
     if (value == null) {
       throw new Error('`value` required in setHeader("' + name + '", value)')
     }
-    if (!this.urlRequest.notStarted) {
+    if (this._started || this._firstWrite) {
       throw new Error('Can\'t set headers after they are sent')
     }
+    if (!_isValidHeaderName(name)) {
+      throw new Error(`Invalid header name: '${name}'`)
+    }
+    if (!_isValidHeaderValue(value.toString())) {
+      throw new Error(`Invalid value for header '${name}': '${value}'`)
+    }
 
     const key = name.toLowerCase()
-    this.extraHeaders[key] = value
-    this.urlRequest.setExtraHeader(name, value.toString())
+    this._urlLoaderOptions.extraHeaders[key] = value
   }
 
   getHeader (name) {
@@ -302,12 +320,8 @@ class ClientRequest extends EventEmitter {
       throw new Error('`name` is required for getHeader(name)')
     }
 
-    if (!this.extraHeaders) {
-      return
-    }
-
     const key = name.toLowerCase()
-    return this.extraHeaders[key]
+    return this._urlLoaderOptions.extraHeaders[key]
   }
 
   removeHeader (name) {
@@ -315,93 +329,144 @@ class ClientRequest extends EventEmitter {
       throw new Error('`name` is required for removeHeader(name)')
     }
 
-    if (!this.urlRequest.notStarted) {
+    if (this._started || this._firstWrite) {
       throw new Error('Can\'t remove headers after they are sent')
     }
 
     const key = name.toLowerCase()
-    delete this.extraHeaders[key]
-    this.urlRequest.removeExtraHeader(name)
+    delete this._urlLoaderOptions.extraHeaders[key]
   }
 
-  _write (chunk, encoding, callback, isLast) {
-    const chunkIsString = typeof chunk === 'string'
-    const chunkIsBuffer = chunk instanceof Buffer
-    if (!chunkIsString && !chunkIsBuffer) {
-      throw new TypeError('First argument must be a string or Buffer')
+  _write (chunk, encoding, callback) {
+    this._firstWrite = true
+    if (!this._body) {
+      this._body = new SlurpStream()
+      this._body.on('finish', () => {
+        this._urlLoaderOptions.body = this._body.data()
+        this._startRequest()
+      })
     }
-
-    if (chunkIsString) {
-      // We convert all strings into binary buffers.
-      chunk = Buffer.from(chunk, encoding)
-    }
-
-    // Since writing to the network is asynchronous, we conservatively
-    // assume that request headers are written after delivering the first
-    // buffer to the network IO thread.
-    if (this.urlRequest.notStarted) {
-      this.urlRequest.setChunkedUpload(this.chunkedEncoding)
-    }
-
-    // Headers are assumed to be sent on first call to _writeBuffer,
-    // i.e. after the first call to write or end.
-    const result = this.urlRequest.write(chunk, isLast)
-
-    // The write callback is fired asynchronously to mimic Node.js.
-    if (callback) {
-      process.nextTick(callback)
-    }
-
-    return result
+    // TODO: is this the right way to forward to another stream?
+    this._body.write(chunk, encoding, callback)
   }
 
-  write (data, encoding, callback) {
-    if (this.urlRequest.finished) {
-      const error = new Error('Write after end')
-      process.nextTick(writeAfterEndNT, this, error, callback)
-      return true
+  _final (callback) {
+    if (this._body) {
+      // TODO: is this the right way to forward to another stream?
+      this._body.end(callback)
+    } else {
+      // end() called without a body, go ahead and start the request
+      this._startRequest()
+      callback()
     }
-
-    return this._write(data, encoding, callback, false)
   }
 
-  end (data, encoding, callback) {
-    if (this.urlRequest.finished) {
-      return false
+  _startRequest () {
+    this._started = true
+    const stringifyValues = (obj) => {
+      const ret = {}
+      for (const k in obj) {
+        ret[k] = obj[k].toString()
+      }
+      return ret
     }
+    const opts = { ...this._urlLoaderOptions, extraHeaders: stringifyValues(this._urlLoaderOptions.extraHeaders) }
+    this._urlLoader = new URLLoader(opts)
+    this._urlLoader.on('response-started', (event, finalUrl, responseHead) => {
+      const response = this._response = new IncomingMessage(responseHead)
+      this.emit('response', response)
+    })
+    this._urlLoader.on('data', (event, data) => {
+      this._response._storeInternalData(Buffer.from(data))
+    })
+    this._urlLoader.on('complete', () => {
+      if (this._response) { this._response._storeInternalData(null) }
+    })
+    this._urlLoader.on('error', (event, netErrorString) => {
+      const error = new Error(netErrorString)
+      if (this._response) this._response.destroy(error)
+      this._die(error)
+    })
 
-    if (typeof data === 'function') {
-      callback = data
-      encoding = null
-      data = null
-    } else if (typeof encoding === 'function') {
-      callback = encoding
-      encoding = null
-    }
+    this._urlLoader.on('login', (event, authInfo, callback) => {
+      const handled = this.emit('login', authInfo, callback)
+      if (!handled) {
+        // If there were no listeners, cancel the authentication request.
+        callback()
+      }
+    })
 
-    data = data || ''
+    this._urlLoader.on('redirect', (event, redirectInfo, headers) => {
+      const { statusCode, newMethod, newUrl } = redirectInfo
+      if (this._redirectPolicy === 'error') {
+        this._die(new Error(`Attempted to redirect, but redirect policy was 'error'`))
+      } else if (this._redirectPolicy === 'manual') {
+        let _followRedirect = false
+        this._followRedirectCb = () => { _followRedirect = true }
+        try {
+          this.emit('redirect', statusCode, newMethod, newUrl, headers)
+        } finally {
+          this._followRedirectCb = null
+          if (!_followRedirect && !this._aborted) {
+            this._die(new Error('Redirect was cancelled'))
+          }
+        }
+      } else if (this._redirectPolicy === 'follow') {
+        // Calling followRedirect() when the redirect policy is 'follow' is
+        // allowed but does nothing. (Perhaps it should throw an error
+        // though...? Since the redirect will happen regardless.)
+        try {
+          this._followRedirectCb = () => {}
+          this.emit('redirect', statusCode, newMethod, newUrl, headers)
+        } finally {
+          this._followRedirectCb = null
+        }
+      } else {
+        this._die(new Error(`Unexpected redirect policy '${this._redirectPolicy}'`))
+      }
+    })
 
-    return this._write(data, encoding, callback, true)
+    this._urlLoader.on('upload-progress', (event, position, total) => {
+      this._uploadProgress = { active: true, started: true, current: position, total }
+      this.emit('upload-progress', position, total) // Undocumented, for now
+    })
+
+    this._urlLoader.on('download-progress', (event, current) => {
+      if (this._response) {
+        this._response.emit('download-progress', current) // Undocumented, for now
+      }
+    })
   }
 
   followRedirect () {
-    this.urlRequest.followRedirect()
+    if (this._followRedirectCb) {
+      this._followRedirectCb()
+    } else {
+      throw new Error('followRedirect() called, but was not waiting for a redirect')
+    }
   }
 
   abort () {
-    this.urlRequest.cancel()
+    if (!this._aborted) {
+      process.nextTick(() => { this.emit('abort') })
+    }
+    this._aborted = true
+    this._die()
+  }
+
+  _die (err) {
+    this.destroy(err)
+    if (this._urlLoader) {
+      this._urlLoader.cancel()
+      if (this._response) this._response.destroy(err)
+    }
   }
 
   getUploadProgress () {
-    return this.urlRequest.getUploadProgress()
+    return this._uploadProgress ? { ...this._uploadProgress } : { active: false }
   }
 }
 
-function writeAfterEndNT (self, error, callback) {
-  self.emit('error', error)
-  if (callback) callback(error)
-}
-
 Net.prototype.request = function (options, callback) {
   return new ClientRequest(options, callback)
 }

lib/browser/api/power-monitor.ts

@@ -10,18 +10,28 @@ Object.setPrototypeOf(PowerMonitor.prototype, EventEmitter.prototype)
 
 const powerMonitor = createLazyInstance(createPowerMonitor, PowerMonitor, true)
 
-// On Linux we need to call blockShutdown() to subscribe to shutdown event.
 if (process.platform === 'linux') {
-  powerMonitor.on('newListener', (event:string) => {
-    if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
-      powerMonitor.blockShutdown()
-    }
-  })
-
-  powerMonitor.on('removeListener', (event: string) => {
-    if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
-      powerMonitor.unblockShutdown()
-    }
+  // In order to delay system shutdown when e.preventDefault() is invoked
+  // on a powerMonitor 'shutdown' event, we need an org.freedesktop.login1
+  // shutdown delay lock. For more details see the "Taking Delay Locks"
+  // section of https://www.freedesktop.org/wiki/Software/systemd/inhibit/
+  //
+  // So here we watch for 'shutdown' listeners to be added or removed and
+  // set or unset our shutdown delay lock accordingly.
+  const { app } = require('electron')
+  app.whenReady().then(() => {
+    powerMonitor.on('newListener', (event: string) => {
+      // whenever the listener count is incremented to one...
+      if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
+        powerMonitor.blockShutdown()
+      }
+    })
+    powerMonitor.on('removeListener', (event: string) => {
+      // whenever the listener count is decremented to zero...
+      if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
+        powerMonitor.unblockShutdown()
+      }
+    })
   })
 }
 

lib/browser/api/session.js

@@ -36,8 +36,9 @@ NetLog.prototype.startLogging = function (path, ...args) {
 
 const _originalStopLogging = NetLog.prototype.stopLogging
 NetLog.prototype.stopLogging = function () {
+  const logPath = this._currentlyLoggingPath
   this._currentlyLoggingPath = null
-  return _originalStopLogging.call(this)
+  return _originalStopLogging.call(this).then(() => logPath)
 }
 
 const currentlyLoggingPathDeprecated = deprecate.warnOnce('currentlyLoggingPath')

lib/browser/api/web-contents.js

@@ -7,6 +7,7 @@ const path = require('path')
 const url = require('url')
 const { app, ipcMain, session, deprecate } = electron
 
+const { internalWindowOpen } = require('@electron/internal/browser/guest-window-manager')
 const NavigationController = require('@electron/internal/browser/navigation-controller')
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
@@ -64,32 +65,34 @@ const PDFPageSizes = {
 
 // Default printing setting
 const defaultPrintingSetting = {
-  pageRage: [],
+  // Customizable.
+  pageRange: [],
   mediaSize: {},
   landscape: false,
-  color: 2,
   headerFooterEnabled: false,
   marginsType: 0,
-  isFirstRequest: false,
-  previewUIID: 0,
-  previewModifiable: true,
-  printToPDF: true,
+  scaleFactor: 100,
+  shouldPrintBackgrounds: false,
+  shouldPrintSelectionOnly: false,
+  // Non-customizable.
   printWithCloudPrint: false,
   printWithPrivet: false,
   printWithExtension: false,
   pagesPerSheet: 1,
+  isFirstRequest: false,
+  previewUIID: 0,
+  previewModifiable: true,
+  printToPDF: true,
   deviceName: 'Save as PDF',
   generateDraftData: true,
-  fitToPageEnabled: false,
-  scaleFactor: 100,
   dpiHorizontal: 72,
   dpiVertical: 72,
   rasterizePDF: false,
   duplex: 0,
   copies: 1,
-  collate: true,
-  shouldPrintBackgrounds: false,
-  shouldPrintSelectionOnly: false
+  // 2 = color - see ColorModel in //printing/print_job_constants.h
+  color: 2,
+  collate: true
 }
 
 // JavaScript implementations of WebContents.
@@ -173,7 +176,6 @@ const webFrameMethods = [
   'insertCSS',
   'insertText',
   'removeInsertedCSS',
-  'setLayoutZoomLevelLimits',
   'setVisualZoomLevelLimits'
 ]
 
@@ -183,80 +185,158 @@ for (const method of webFrameMethods) {
   }
 }
 
-const executeJavaScript = (contents, code, hasUserGesture) => {
-  return ipcMainUtils.invokeInWebContents(contents, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScript', code, hasUserGesture)
+const waitTillCanExecuteJavaScript = async (webContents) => {
+  if (webContents.getURL() && !webContents.isLoadingMainFrame()) return
+
+  return new Promise((resolve) => {
+    webContents.once('did-stop-loading', () => {
+      resolve()
+    })
+  })
 }
 
 // Make sure WebContents::executeJavaScript would run the code only when the
 // WebContents has been loaded.
-WebContents.prototype.executeJavaScript = function (code, hasUserGesture) {
-  if (this.getURL() && !this.isLoadingMainFrame()) {
-    return executeJavaScript(this, code, hasUserGesture)
-  } else {
-    return new Promise((resolve, reject) => {
-      this.once('did-stop-loading', () => {
-        executeJavaScript(this, code, hasUserGesture).then(resolve, reject)
-      })
-    })
-  }
+WebContents.prototype.executeJavaScript = async function (code, hasUserGesture) {
+  await waitTillCanExecuteJavaScript(this)
+  return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScript', code, hasUserGesture)
+}
+WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (code, hasUserGesture) {
+  await waitTillCanExecuteJavaScript(this)
+  return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScriptInIsolatedWorld', code, hasUserGesture)
 }
 
 // Translate the options of printToPDF.
 WebContents.prototype.printToPDF = function (options) {
-  const printingSetting = {
+  const printSettings = {
     ...defaultPrintingSetting,
     requestID: getNextId()
   }
-  if (options.landscape) {
-    printingSetting.landscape = options.landscape
-  }
-  if (options.fitToPageEnabled) {
-    printingSetting.fitToPageEnabled = options.fitToPageEnabled
-  }
-  if (options.scaleFactor) {
-    printingSetting.scaleFactor = options.scaleFactor
-  }
-  if (options.marginsType) {
-    printingSetting.marginsType = options.marginsType
-  }
-  if (options.printSelectionOnly) {
-    printingSetting.shouldPrintSelectionOnly = options.printSelectionOnly
-  }
-  if (options.printBackground) {
-    printingSetting.shouldPrintBackgrounds = options.printBackground
+
+  if (options.landscape !== undefined) {
+    if (typeof options.landscape !== 'boolean') {
+      const error = new Error('landscape must be a Boolean')
+      return Promise.reject(error)
+    }
+    printSettings.landscape = options.landscape
   }
 
-  if (options.pageSize) {
+  if (options.scaleFactor !== undefined) {
+    if (typeof options.scaleFactor !== 'number') {
+      const error = new Error('scaleFactor must be a Number')
+      return Promise.reject(error)
+    }
+    printSettings.scaleFactor = options.scaleFactor
+  }
+
+  if (options.marginsType !== undefined) {
+    if (typeof options.marginsType !== 'number') {
+      const error = new Error('marginsType must be a Number')
+      return Promise.reject(error)
+    }
+    printSettings.marginsType = options.marginsType
+  }
+
+  if (options.printSelectionOnly !== undefined) {
+    if (typeof options.printSelectionOnly !== 'boolean') {
+      const error = new Error('printSelectionOnly must be a Boolean')
+      return Promise.reject(error)
+    }
+    printSettings.shouldPrintSelectionOnly = options.printSelectionOnly
+  }
+
+  if (options.printBackground !== undefined) {
+    if (typeof options.printBackground !== 'boolean') {
+      const error = new Error('printBackground must be a Boolean')
+      return Promise.reject(error)
+    }
+    printSettings.shouldPrintBackgrounds = options.printBackground
+  }
+
+  if (options.pageRanges !== undefined) {
+    const pageRanges = options.pageRanges
+    if (!pageRanges.hasOwnProperty('from') || !pageRanges.hasOwnProperty('to')) {
+      const error = new Error(`pageRanges must be an Object with 'from' and 'to' properties`)
+      return Promise.reject(error)
+    }
+
+    if (typeof pageRanges.from !== 'number') {
+      const error = new Error('pageRanges.from must be a Number')
+      return Promise.reject(error)
+    }
+
+    if (typeof pageRanges.to !== 'number') {
+      const error = new Error('pageRanges.to must be a Number')
+      return Promise.reject(error)
+    }
+
+    // Chromium uses 1-based page ranges, so increment each by 1.
+    printSettings.pageRange = [{
+      from: pageRanges.from + 1,
+      to: pageRanges.to + 1
+    }]
+  }
+
+  if (options.headerFooter !== undefined) {
+    const headerFooter = options.headerFooter
+    printSettings.headerFooterEnabled = true
+    if (typeof headerFooter === 'object') {
+      if (!headerFooter.url || !headerFooter.title) {
+        const error = new Error('url and title properties are required for headerFooter')
+        return Promise.reject(error)
+      }
+      if (typeof headerFooter.title !== 'string') {
+        const error = new Error('headerFooter.title must be a String')
+        return Promise.reject(error)
+      }
+      printSettings.title = headerFooter.title
+
+      if (typeof headerFooter.url !== 'string') {
+        const error = new Error('headerFooter.url must be a String')
+        return Promise.reject(error)
+      }
+      printSettings.url = headerFooter.url
+    } else {
+      const error = new Error('headerFooter must be an Object')
+      return Promise.reject(error)
+    }
+  }
+
+  // Optionally set size for PDF.
+  if (options.pageSize !== undefined) {
     const pageSize = options.pageSize
     if (typeof pageSize === 'object') {
       if (!pageSize.height || !pageSize.width) {
-        return Promise.reject(new Error('Must define height and width for pageSize'))
+        const error = new Error('height and width properties are required for pageSize')
+        return Promise.reject(error)
       }
       // Dimensions in Microns
       // 1 meter = 10^6 microns
-      printingSetting.mediaSize = {
+      printSettings.mediaSize = {
         name: 'CUSTOM',
         custom_display_name: 'Custom',
         height_microns: Math.ceil(pageSize.height),
         width_microns: Math.ceil(pageSize.width)
       }
     } else if (PDFPageSizes[pageSize]) {
-      printingSetting.mediaSize = PDFPageSizes[pageSize]
+      printSettings.mediaSize = PDFPageSizes[pageSize]
     } else {
-      return Promise.reject(new Error(`Does not support pageSize with ${pageSize}`))
+      const error = new Error(`Unsupported pageSize: ${pageSize}`)
+      return Promise.reject(error)
     }
   } else {
-    printingSetting.mediaSize = PDFPageSizes['A4']
+    printSettings.mediaSize = PDFPageSizes['A4']
   }
 
   // Chromium expects this in a 0-100 range number, not as float
-  printingSetting.scaleFactor = Math.ceil(printingSetting.scaleFactor) % 100
+  printSettings.scaleFactor = Math.ceil(printSettings.scaleFactor) % 100
   // PrinterType enum from //printing/print_job_constants.h
-  printingSetting.printerType = 2
+  printSettings.printerType = 2
   if (features.isPrintingEnabled()) {
-    return this._printToPDF(printingSetting)
+    return this._printToPDF(printSettings)
   } else {
-    return Promise.reject(new Error('Printing feature is disabled'))
+    const error = new Error('Printing feature is disabled')
+    return Promise.reject(error)
   }
 }
 
@@ -273,6 +353,7 @@ WebContents.prototype.getPrinters = function () {
     return this._getPrinters()
   } else {
     console.error('Error: Printing feature is disabled.')
+    return []
   }
 }
 
@@ -394,9 +475,7 @@ WebContents.prototype._init = function () {
         width: 800,
         height: 600
       }
-      ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN',
-        event, url, referrer, frameName, disposition,
-        options, additionalFeatures, postData)
+      internalWindowOpen(event, url, referrer, frameName, disposition, options, additionalFeatures, postData)
     })
 
     // Create a new browser window for the native implementation of
@@ -418,8 +497,7 @@ WebContents.prototype._init = function () {
         webContents
       }
       const referrer = { url: '', policy: 'default' }
-      ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN',
-        event, url, referrer, frameName, disposition, options)
+      internalWindowOpen(event, url, referrer, frameName, disposition, options)
     })
   }
 

lib/browser/chrome-extension-shim.js

@@ -0,0 +1,37 @@
+'use strict'
+
+// This is a temporary shim to aid in transition from the old
+// BrowserWindow-based extensions stuff to the new native-backed extensions
+// API.
+
+if (!process.electronBinding('features').isExtensionsEnabled()) {
+  throw new Error('Attempted to load JS chrome-extension shim without //extensions support enabled')
+}
+
+const { app, session, BrowserWindow, deprecate } = require('electron')
+
+app.once('ready', function () {
+  const addExtension = function (srcDirectory) {
+    return session.defaultSession.loadExtension(srcDirectory)
+  }
+
+  const removeExtension = function (name) {
+    const extension = session.defaultSession.getAllExtensions().find(e => e.name === name)
+    if (extension) { session.defaultSession.removeExtension(extension.id) }
+  }
+
+  const getExtensions = function () {
+    const extensions = {}
+    session.defaultSession.getAllExtensions().forEach(e => {
+      extensions[e.name] = e
+    })
+    return extensions
+  }
+
+  BrowserWindow.addExtension = deprecate.moveAPI(addExtension, 'BrowserWindow.addExtension', 'session.loadExtension')
+  BrowserWindow.removeExtension = deprecate.moveAPI(removeExtension, 'BrowserWindow.removeExtension', 'session.removeExtension')
+  BrowserWindow.getExtensions = deprecate.moveAPI(getExtensions, 'BrowserWindow.getExtensions', 'session.getAllExtensions')
+  BrowserWindow.addDevToolsExtension = deprecate.moveAPI(addExtension, 'BrowserWindow.addDevToolsExtension', 'session.loadExtension')
+  BrowserWindow.removeDevToolsExtension = deprecate.moveAPI(removeExtension, 'BrowserWindow.removeDevToolsExtension', 'session.removeExtension')
+  BrowserWindow.getDevToolsExtensions = deprecate.moveAPI(getExtensions, 'BrowserWindow.getDevToolsExtensions', 'session.getAllExtensions')
+})

lib/browser/chrome-extension.js

@@ -57,18 +57,25 @@ const getManifestFromPath = function (srcDirectory) {
   if (!manifestNameMap[manifest.name]) {
     const extensionId = generateExtensionIdFromName(manifest.name)
     manifestMap[extensionId] = manifestNameMap[manifest.name] = manifest
+
+    let extensionURL = url.format({
+      protocol: 'chrome-extension',
+      slashes: true,
+      hostname: extensionId,
+      pathname: manifest.devtools_page
+    })
+
+    // Chromium requires that startPage matches '([^:]+:\/\/[^/]*)\/'
+    // We also can't use the file:// protocol here since that would make Chromium
+    // treat all extension resources as being relative to root which we don't want.
+    if (!manifest.devtools_page) extensionURL += '/'
+
     Object.assign(manifest, {
       srcDirectory: srcDirectory,
       extensionId: extensionId,
-      // We can not use 'file://' directly because all resources in the extension
-      // will be treated as relative to the root in Chrome.
-      startPage: url.format({
-        protocol: 'chrome-extension',
-        slashes: true,
-        hostname: extensionId,
-        pathname: manifest.devtools_page
-      })
+      startPage: extensionURL
     })
+
     return manifest
   } else if (manifest && manifest.name) {
     console.warn(`Attempted to load extension "${manifest.name}" that has already been loaded.`)
@@ -389,7 +396,8 @@ const loadDevToolsExtensions = function (win, manifests) {
   })
 
   extensionInfoArray.forEach((extensionInfo) => {
-    win.devToolsWebContents.executeJavaScript(`Extensions.extensionServer._addExtension(${JSON.stringify(extensionInfo)})`)
+    const info = JSON.stringify(extensionInfo)
+    win.devToolsWebContents.executeJavaScript(`Extensions.extensionServer._addExtension(${info})`)
   })
 }
 

lib/browser/guest-window-manager.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const { BrowserWindow, webContents } = require('electron')
+const electron = require('electron')
+const { BrowserWindow } = electron
 const { isSameOrigin } = process.electronBinding('v8_util')
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
@@ -74,8 +75,10 @@ const mergeBrowserWindowOptions = function (embedder, options) {
     }
   }
 
-  // Sets correct openerId here to give correct options to 'new-window' event handler
-  options.webPreferences.openerId = embedder.id
+  if (!webPreferences.nativeWindowOpen) {
+    // Sets correct openerId here to give correct options to 'new-window' event handler
+    options.webPreferences.openerId = embedder.id
+  }
 
   return options
 }
@@ -244,13 +247,11 @@ ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', (event, url, fra
   }
 
   const referrer = { url: '', policy: 'default' }
-  ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', event,
-    url, referrer, frameName, disposition, options, additionalFeatures)
+  internalWindowOpen(event, url, referrer, frameName, disposition, options, additionalFeatures)
 })
 
 // Routed window.open messages with fully parsed options
-ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', function (event, url, referrer,
-  frameName, disposition, options, additionalFeatures, postData) {
+function internalWindowOpen (event, url, referrer, frameName, disposition, options, additionalFeatures, postData) {
   options = mergeBrowserWindowOptions(event.sender, options)
   event.sender.emit('new-window', event, url, frameName, disposition, options, additionalFeatures, referrer)
   const { newGuest } = event
@@ -268,11 +269,12 @@ ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', functio
   } else {
     event.returnValue = createGuest(event.sender, url, referrer, frameName, options, postData)
   }
-})
+}
 
 const makeSafeHandler = function (handler) {
   return (event, guestId, ...args) => {
-    const guestContents = webContents.fromId(guestId)
+    // Access webContents via electron to prevent circular require.
+    const guestContents = electron.webContents.fromId(guestId)
     if (!guestContents) {
       throw new Error(`Invalid guestId: ${guestId}`)
     }
@@ -289,8 +291,8 @@ const handleMessageSync = function (channel, handler) {
   ipcMainUtils.handleSync(channel, makeSafeHandler(handler))
 }
 
-const assertCanAccessWindow = function (contents, guestContents) {
-  if (!canAccessWindow(contents, guestContents)) {
+const securityCheck = function (contents, guestContents, check) {
+  if (!check(contents, guestContents)) {
     console.error(`Blocked ${contents.getURL()} from accessing guestId: ${guestContents.id}`)
     throw new Error(`Access denied to guestId: ${guestContents.id}`)
   }
@@ -303,7 +305,7 @@ const windowMethods = new Set([
 ])
 
 handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', (event, guestContents, method, ...args) => {
-  assertCanAccessWindow(event.sender, guestContents)
+  securityCheck(event.sender, guestContents, canAccessWindow)
 
   if (!windowMethods.has(method)) {
     console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
@@ -321,6 +323,8 @@ handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', (event, guestC
   // The W3C does not seem to have word on how postMessage should work when the
   // origins do not match, so we do not do |canAccessWindow| check here since
   // postMessage across origins is useful and not harmful.
+  securityCheck(event.sender, guestContents, isRelatedWindow)
+
   if (targetOrigin === '*' || isSameOrigin(guestContents.getURL(), targetOrigin)) {
     const sourceId = event.sender.id
     guestContents._sendInternal('ELECTRON_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin)
@@ -334,7 +338,7 @@ const webContentsMethodsAsync = new Set([
 ])
 
 handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestContents, method, ...args) => {
-  assertCanAccessWindow(event.sender, guestContents)
+  securityCheck(event.sender, guestContents, canAccessWindow)
 
   if (!webContentsMethodsAsync.has(method)) {
     console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
@@ -349,7 +353,7 @@ const webContentsMethodsSync = new Set([
 ])
 
 handleMessageSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestContents, method, ...args) => {
-  assertCanAccessWindow(event.sender, guestContents)
+  securityCheck(event.sender, guestContents, canAccessWindow)
 
   if (!webContentsMethodsSync.has(method)) {
     console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
@@ -358,3 +362,5 @@ handleMessageSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, g
 
   return guestContents[method](...args)
 })
+
+exports.internalWindowOpen = internalWindowOpen

lib/browser/init.ts

@@ -154,7 +154,9 @@ require('@electron/internal/browser/devtools')
 const features = process.electronBinding('features')
 
 // Load the chrome extension support.
-if (!features.isExtensionsEnabled()) {
+if (features.isExtensionsEnabled()) {
+  require('@electron/internal/browser/chrome-extension-shim')
+} else {
   require('@electron/internal/browser/chrome-extension')
 }
 
@@ -195,13 +197,14 @@ app.on('window-all-closed', () => {
   }
 })
 
-Promise.all([
-  import('@electron/internal/browser/default-menu'),
-  app.whenReady()
-]).then(([{ setDefaultApplicationMenu }]) => {
-  // Create default menu
-  setDefaultApplicationMenu()
-})
+const { setDefaultApplicationMenu } = require('@electron/internal/browser/default-menu')
+
+// Create default menu.
+//
+// Note that the task must be added before loading any app, so we can make sure
+// the call is maded before any user window is created, otherwise the default
+// menu may show even when user explicitly hides the menu.
+app.once('ready', setDefaultApplicationMenu)
 
 if (packagePath) {
   // Finally load app's main.js and transfer control to C++.

lib/browser/navigation-controller.js

@@ -34,7 +34,7 @@ const NavigationController = (function () {
       this.currentIndex++
       this.history.push(this.webContents._getURL())
     }
-    this.webContents.on('navigation-entry-commited', (event, url, inPage, replaceEntry) => {
+    this.webContents.on('navigation-entry-committed', (event, url, inPage, replaceEntry) => {
       if (this.inPageIndex > -1 && !inPage) {
         // Navigated to a new page, clear in-page mark.
         this.inPageIndex = -1
@@ -152,7 +152,8 @@ const NavigationController = (function () {
   NavigationController.prototype.reloadIgnoringCache = function () {
     this.pendingIndex = this.currentIndex
     return this.webContents._loadURL(this.getURL(), {
-      extraHeaders: 'pragma: no-cache\n'
+      extraHeaders: 'pragma: no-cache\n',
+      reloadIgnoringCache: true
     })
   }