Bump v9.0.0-beta.3

* fix: emit will-navigate for sandboxed contents

* uncomment test

* more tests

* use ShouldFork instead of browser_handles_all_top_level_requests

* forward post data in OpenURLFromTab

* align OpenURLFromTab with chrome's version (browser_navigator.cc/LoadURLInContents)

* add tests for navigating from file: and about:blank to http:

Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>

.circleci/config.yml

@@ -67,10 +67,6 @@ machine-linux-medium: &machine-linux-medium
   <<: *docker-image
   resource_class: medium
 
-machine-linux-xlarge: &machine-linux-xlarge
-  <<: *docker-image
-  resource_class: xlarge
-
 machine-linux-2xlarge: &machine-linux-2xlarge
   <<: *docker-image
   resource_class: 2xlarge+
@@ -231,25 +227,7 @@ step-gclient-sync: &step-gclient-sync
           $GCLIENT_EXTRA_ARGS \
           "$CIRCLE_REPOSITORY_URL"
 
-        ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
-        # Re-export all the patches to check if there were changes.
-        python src/electron/script/export_all_patches.py src/electron/patches/config.json
-        cd src/electron
-        git update-index --refresh || true
-        if ! git diff-index --quiet HEAD --; then
-          # There are changes to the patches. Make a git commit with the updated patches
-          git add patches
-          GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="anonymous@electronjs.org" git commit -m "update patches" --author="Electron Bot <anonymous@electronjs.org>"
-          # Export it
-          mkdir -p ../../patches
-          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
-          echo
-          echo "======================================================================"
-          echo "There were changes to the patches when applying."
-          echo "Check the CI artifacts for a patch you can apply to fix it."
-          echo "======================================================================"
-          exit 1
-        fi
+        gclient sync --with_branch_heads --with_tags
       fi
 
 step-setup-env-for-build: &step-setup-env-for-build
@@ -321,18 +299,13 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
         sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
       fi
 
-# On macOS delete all .git directories under src/ expect for
-# third_party/angle/ because of build time generation of file
-# gen/angle/commit.h depends on third_party/angle/.git/HEAD
-# https://chromium-review.googlesource.com/c/angle/angle/+/2074924
-# TODO: maybe better to always leave out */.git/HEAD file for all targets ?
 step-delete-git-directories: &step-delete-git-directories
   run:
     name: Delete all .git directories under src on MacOS to free space
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src
-        ( find . -type d -name ".git" -not -path "./third_party/angle/*" ) | xargs rm -rf
+        ( find . -type d -name ".git" ) | xargs rm -rf
       fi
 
 # On macOS the yarn install command during gclient sync was run on a linux
@@ -369,7 +342,7 @@ step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src/electron
-        ./script/codesign/generate-identity.sh
+        ./script/codesign/import-testing-cert-ci.sh
       fi
 
 step-install-gnutar-on-mac: &step-install-gnutar-on-mac
@@ -488,7 +461,7 @@ step-electron-maybe-chromedriver-gn-gen: &step-electron-maybe-chromedriver-gn-ge
       cd src
       if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
         if [ "$USE_GOMA" == "true" ]; then
-          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"//electron/build/args/goma.gn\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
         else
           gn gen out/chromedriver --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
         fi
@@ -603,7 +576,7 @@ step-ffmpeg-gn-gen: &step-ffmpeg-gn-gen
     command: |
       cd src
       if [ "$USE_GOMA" == "true" ]; then
-        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS"
+        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
@@ -708,8 +681,6 @@ step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
       if [ "$GENERATE_SYMBOLS" == "true" ]; then
         cd src
         ninja -C out/Default electron:electron_symbols
-        cd out/Default/breakpad_symbols
-        find . -name \*.sym -print0 | xargs -0 npx @sentry/cli@1.51.1 difutil bundle-sources
       fi
 
 step-maybe-zip-symbols: &step-maybe-zip-symbols
@@ -999,8 +970,6 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
     - *step-set-git-cache-path
     # This sync call only runs if .circle-sync-done is an EMPTY file
     - *step-gclient-sync
-    - store_artifacts:
-        path: patches
     - *step-save-git-cache
     # These next few steps reset Electron to the correct commit regardless of which cache was restored
     - run:
@@ -1019,6 +988,7 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
           sudo chown -R $(id -u):$(id -g) /portal
           mv ./src /portal
     - *step-save-src-cache
+    - *step-save-brew-cache
 
 steps-electron-gn-check: &steps-electron-gn-check
   steps:
@@ -1127,6 +1097,18 @@ steps-verify-ffmpeg: &steps-verify-ffmpeg
     - *step-verify-ffmpeg
     - *step-maybe-notify-slack-failure
 
+steps-verify-mksnapshot: &steps-verify-mksnapshot
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-electron-dist-unzip
+    - *step-mksnapshot-unzip
+    - *step-setup-linux-for-headless-testing
+
+    - *step-verify-mksnapshot
+    - *step-maybe-notify-slack-failure
+
 steps-verify-chromedriver: &steps-verify-chromedriver
   steps:
     - attach_workspace:
@@ -1295,7 +1277,6 @@ commands:
                 at: .
       - *step-restore-brew-cache
       - *step-install-gnutar-on-mac
-      - *step-save-brew-cache
       - when:
           condition: << parameters.checkout-and-assume-cache >>
           steps:
@@ -1321,8 +1302,6 @@ commands:
             - *step-set-git-cache-path
             # This sync call only runs if .circle-sync-done is an EMPTY file
             - *step-gclient-sync
-            - store_artifacts:
-                path: patches
             # These next few steps reset Electron to the correct commit regardless of which cache was restored
             - when:
                 condition: << parameters.preserve-vendor-dirs >>
@@ -1635,9 +1614,9 @@ jobs:
 
   # Layer 2: Builds.
   linux-x64-testing:
-    <<: *machine-linux-xlarge
+    <<: *machine-linux-2xlarge
     environment:
-      <<: *env-global
+      <<: *env-linux-2xlarge
       <<: *env-testing-build
       <<: *env-ninja-status
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1693,7 +1672,6 @@ jobs:
     <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       <<: *env-release-build
       <<: *env-enable-sccache
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
@@ -1706,6 +1684,7 @@ jobs:
     <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       <<: *env-release-build
       <<: *env-enable-sccache
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
@@ -1715,9 +1694,9 @@ jobs:
           checkout: false
 
   linux-ia32-testing:
-    <<: *machine-linux-xlarge
+    <<: *machine-linux-2xlarge
     environment:
-      <<: *env-global
+      <<: *env-linux-2xlarge
       <<: *env-ia32
       <<: *env-testing-build
       <<: *env-ninja-status
@@ -1755,7 +1734,6 @@ jobs:
     <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       <<: *env-ia32
       <<: *env-release-build
       <<: *env-enable-sccache
@@ -1770,6 +1748,7 @@ jobs:
     <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       <<: *env-ia32
       <<: *env-release-build
       <<: *env-enable-sccache
@@ -1781,9 +1760,9 @@ jobs:
           checkout: false
 
   linux-arm-testing:
-    <<: *machine-linux-xlarge
+    <<: *machine-linux-2xlarge
     environment:
-      <<: *env-global
+      <<: *env-linux-2xlarge
       <<: *env-arm
       <<: *env-testing-build
       <<: *env-ninja-status
@@ -1826,7 +1805,6 @@ jobs:
       <<: *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-publish:  
@@ -1841,6 +1819,7 @@ jobs:
       <<: *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-publish:  
@@ -1848,9 +1827,9 @@ jobs:
           checkout: false
 
   linux-arm64-testing:
-    <<: *machine-linux-xlarge
+    <<: *machine-linux-2xlarge
     environment:
-      <<: *env-global
+      <<: *env-linux-2xlarge
       <<: *env-arm64
       <<: *env-testing-build
       <<: *env-ninja-status
@@ -1900,7 +1879,6 @@ jobs:
       <<: *env-arm64
       <<: *env-release-build
       <<: *env-enable-sccache
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - electron-publish:  
@@ -1914,6 +1892,7 @@ jobs:
       <<: *env-arm64
       <<: *env-release-build
       <<: *env-enable-sccache
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - electron-publish:  
@@ -1970,7 +1949,6 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-release-build
       <<: *env-enable-sccache
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - electron-publish:  
@@ -1983,6 +1961,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-release-build
       <<: *env-enable-sccache
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - electron-publish:  
@@ -2013,6 +1992,14 @@ jobs:
       <<: *env-testing-build
     <<: *steps-electron-gn-check
 
+  mas-chromedriver:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
   mas-release:
     <<: *machine-mac-large
     environment:
@@ -2035,7 +2022,6 @@ jobs:
       <<: *env-mas
       <<: *env-release-build
       <<: *env-enable-sccache
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - electron-publish:  
@@ -2049,6 +2035,7 @@ jobs:
       <<: *env-mas
       <<: *env-release-build
       <<: *env-enable-sccache
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - electron-publish:  
@@ -2132,6 +2119,22 @@ jobs:
       <<: *env-send-slack-notifications
     <<: *steps-verify-ffmpeg
 
+  linux-x64-verify-mksnapshot:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-mksnapshot
+
+  linux-x64-verify-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-chromedriver
+
   linux-ia32-testing-tests:
     <<: *machine-linux-medium
     environment:
@@ -2178,6 +2181,23 @@ jobs:
       <<: *env-send-slack-notifications
     <<: *steps-verify-ffmpeg
 
+  linux-ia32-verify-mksnapshot:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-mksnapshot
+
+  linux-ia32-verify-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-chromedriver
+
   osx-testing-tests:
     <<: *machine-mac-large
     environment:
@@ -2201,6 +2221,20 @@ jobs:
       <<: *env-send-slack-notifications
     <<: *steps-verify-ffmpeg
 
+  osx-verify-mksnapshot:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-mksnapshot
+
+  osx-verify-chromedriver:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-chromedriver
+
   mas-testing-tests:
     <<: *machine-mac-large
     environment:
@@ -2224,6 +2258,20 @@ jobs:
       <<: *env-send-slack-notifications
     <<: *steps-verify-ffmpeg
 
+  mas-verify-mksnapshot:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-mksnapshot
+
+  mas-verify-chromedriver:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-chromedriver
+
   # Layer 4: Summary.
   linux-x64-release-summary:
     <<: *machine-linux-medium
@@ -2442,37 +2490,67 @@ workflows:
       - linux-x64-release-tests:
           requires:
             - linux-x64-release
+      - linux-x64-chromedriver:
+          requires:
+            - linux-checkout-fast
       - linux-x64-verify-ffmpeg:
           requires:
             - linux-x64-release
+      - linux-x64-verify-mksnapshot:
+          requires:
+            - linux-x64-release
+      - linux-x64-verify-chromedriver:
+          requires:
+            - linux-x64-release
+            - linux-x64-chromedriver
       - linux-x64-release-summary:
           requires:
             - linux-x64-release
             - linux-x64-release-tests
             - linux-x64-verify-ffmpeg
+            - linux-x64-chromedriver
 
       - linux-ia32-release
       - linux-ia32-release-tests:
           requires:
             - linux-ia32-release
+      - linux-ia32-chromedriver:
+          requires:
+            - linux-checkout-fast
       - linux-ia32-verify-ffmpeg:
           requires:
             - linux-ia32-release
+      - linux-ia32-verify-mksnapshot:
+          requires:
+            - linux-ia32-release
+      - linux-x64-verify-chromedriver:
+          requires:
+            - linux-ia32-release
+            - linux-ia32-chromedriver
       - linux-ia32-release-summary:
           requires:
             - linux-ia32-release
             - linux-ia32-release-tests
             - linux-ia32-verify-ffmpeg
+            - linux-ia32-chromedriver
 
       - linux-arm-release
+      - linux-arm-chromedriver:
+          requires:
+            - linux-checkout-fast
       - linux-arm-release-summary:
           requires:
             - linux-arm-release
+            - linux-arm-chromedriver
 
       - linux-arm64-release
+      - linux-arm64-chromedriver:
+          requires:
+            - linux-checkout-fast
       - linux-arm64-release-summary:
           requires:
             - linux-arm64-release
+            - linux-arm64-chromedriver
 
   nightly-mac-release-test:
     triggers:
@@ -2493,14 +2571,25 @@ workflows:
       - osx-release-tests:
           requires:
             - osx-release
+      - osx-chromedriver:
+          requires:
+            - mac-checkout-fast
       - osx-verify-ffmpeg:
           requires:
             - osx-release
+      - osx-verify-mksnapshot:
+          requires:
+            - osx-release
+      - osx-verify-chromedriver:
+          requires:
+            - osx-release
+            - osx-chromedriver
       - osx-release-summary:
           requires:
           - osx-release
           - osx-release-tests
           - osx-verify-ffmpeg
+          - osx-chromedriver
 
       - mas-release:
           requires:
@@ -2508,14 +2597,25 @@ workflows:
       - mas-release-tests:
           requires:
             - mas-release
+      - mas-chromedriver:
+          requires:
+            - mac-checkout-fast
       - mas-verify-ffmpeg:
           requires:
             - mas-release
+      - mas-verify-mksnapshot:
+          requires:
+            - mas-release
+      - mas-verify-chromedriver:
+          requires:
+            - mas-release
+            - mas-chromedriver
       - mas-release-summary:
           requires:
           - mas-release
           - mas-release-tests
           - mas-verify-ffmpeg
+          - mas-chromedriver
 
   # Various slow and non-essential checks we run only nightly.
   # Sanitizer jobs should be added here.

.eslintrc.json

@@ -6,11 +6,9 @@
     "browser": true
   },
   "rules": {
-    "semi": ["error", "always"],
     "no-var": "error",
     "no-unused-vars": 0,
     "no-global-assign": 0,
-    "guard-for-in": 2,
     "@typescript-eslint/no-unused-vars": ["error", {
       "vars": "all",
       "args": "after-used",

.gitattributes

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

.github/CODEOWNERS

@@ -3,10 +3,20 @@
 # https://help.github.com/articles/about-codeowners
 # https://git-scm.com/docs/gitignore
 
+# Most stuff in here is owned by the Community & Safety WG...
+/.github/*                              @electron/wg-community
+
+# ...except the Admin WG maintains this file.
+/.github/CODEOWNERS                     @electron/wg-admin
+
 # Upgrades WG
 /patches/                               @electron/wg-upgrades
 DEPS                                    @electron/wg-upgrades
 
+# Docs & Tooling WG
+/default_app/ @electron/wg-docs-tools
+/docs/                                  @electron/wg-docs-tools
+
 # Releases WG
 /npm/                                   @electron/wg-releases
-/script/release                         @electron/wg-releases
+/script/release                         @electron/wg-releases

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,4 +18,4 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 
 #### Release Notes
 
-Notes: <!-- Please add a one-line description for app developers to read in the release notes, or 'none' if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->
+Notes: <!-- Please add a one-line description for app developers to read in the release notes, or `no-notes` if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->

.github/config.yml

@@ -33,7 +33,6 @@ authorizedUsers:
   - codebytere
   - deepak1556
   - jkleinsc
-  - loc
   - MarshallOfSound
   - miniak
   - nornagon

BUILD.gn

@@ -224,6 +224,7 @@ grit("resources") {
   ]
 
   # Mojo manifest overlays are generated.
+  source_is_generated = true
   grit_flags = [
     "-E",
     "target_gen_dir=" + rebase_path(target_gen_dir, root_build_dir),
@@ -493,21 +494,15 @@ source_set("electron_lib") {
     deps += [
       ":libnotify_loader",
       "//build/config/linux/gtk",
+      "//chrome/browser/ui/gtk",
       "//dbus",
       "//device/bluetooth",
       "//third_party/breakpad:client",
       "//ui/events/devices/x11",
       "//ui/events/platform/x11",
-      "//ui/gtk",
       "//ui/views/controls/webview",
       "//ui/wm",
     ]
-    if (use_x11) {
-      deps += [
-        "//ui/gfx/x",
-        "//ui/gtk:x",
-      ]
-    }
     configs += [ ":gio_unix" ]
     include_dirs += [ "//third_party/breakpad" ]
     configs += [ "//build/config/linux:x11" ]
@@ -605,10 +600,22 @@ source_set("electron_lib") {
     ]
   }
 
-  if (enable_views_api) {
+  if (enable_view_api) {
     sources += [
-      "shell/browser/api/views/electron_api_image_view.cc",
-      "shell/browser/api/views/electron_api_image_view.h",
+      "shell/browser/api/views/electron_api_box_layout.cc",
+      "shell/browser/api/views/electron_api_box_layout.h",
+      "shell/browser/api/views/electron_api_button.cc",
+      "shell/browser/api/views/electron_api_button.h",
+      "shell/browser/api/views/electron_api_label_button.cc",
+      "shell/browser/api/views/electron_api_label_button.h",
+      "shell/browser/api/views/electron_api_layout_manager.cc",
+      "shell/browser/api/views/electron_api_layout_manager.h",
+      "shell/browser/api/views/electron_api_md_text_button.cc",
+      "shell/browser/api/views/electron_api_md_text_button.h",
+      "shell/browser/api/views/electron_api_resize_area.cc",
+      "shell/browser/api/views/electron_api_resize_area.h",
+      "shell/browser/api/views/electron_api_text_field.cc",
+      "shell/browser/api/views/electron_api_text_field.h",
     ]
   }
 
@@ -729,14 +736,9 @@ if (is_mac) {
       sources = [
         "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
         "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
-        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
-        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
       ]
       outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-      public_deps = [
-        "//ui/gl:swiftshader_egl_library_copy",
-        "//ui/gl:swiftshader_vk_library_copy",
-      ]
+      public_deps = [ "//ui/gl:swiftshader_library_copy" ]
     }
   }
   group("electron_angle_library") {
@@ -789,7 +791,6 @@ if (is_mac) {
 
     include_dirs = [ "." ]
     sources = filenames.framework_sources
-    libs = []
 
     if (enable_osr) {
       libs += [ "IOSurface.framework" ]
@@ -1057,7 +1058,7 @@ if (is_mac) {
     if (is_win) {
       sources += [
         # TODO: we should be generating our .rc files more like how chrome does
-        "shell/browser/resources/win/electron.rc",
+        "shell/browser/resources/win/atom.rc",
         "shell/browser/resources/win/resource.h",
       ]
 
@@ -1084,7 +1085,7 @@ if (is_mac) {
       # See https://github.com/nodejs/node-gyp/commit/52ceec3a6d15de3a8f385f43dbe5ecf5456ad07a
       ldflags += [ "/DEF:" + rebase_path("build/electron.def", root_build_dir) ]
       inputs = [
-        "shell/browser/resources/win/electron.ico",
+        "shell/browser/resources/win/atom.ico",
         "build/electron.def",
       ]
     }

DEPS

@@ -12,11 +12,11 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    'c5cbec6b4ac8f405dc5d5e416ffaf640aa3d088a',
+    '2102ff0fb03469ca5ff317a168e6ad99ca0f23f1',
   'node_version':
-    'v12.16.2',
+    'v12.14.1',
   'nan_version':
-    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
+    '2ee313aaca52e2b478965ac50eb5082520380d1b',
 
   'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
   'pyyaml_version': '3.12',

ELECTRON_VERSION

@@ -1 +1 @@
-10.0.0-nightly.20200420
+9.0.0-beta.3

appveyor.yml

@@ -28,7 +28,7 @@
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 version: 1.0.{build}
-build_cloud: electron-16-core
+build_cloud: libcc-20
 image: vs2019bt-16.4.0
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
@@ -116,12 +116,6 @@ build_script:
         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"
         }
-        # build time generation of file gen/angle/commit.h depends on
-        # third_party/angle/.git/HEAD.
-        # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
-        if ($(7z a $zipfile src\third_party\angle\.git\HEAD;$LASTEXITCODE -ne 0)) {
-          Write-warning "Failed to add third_party\angle\.git\HEAD; continuing anyway"
-        }
       }
   - ps: >-
       if ($env:GN_CONFIG -ne 'release') {

build/args/all.gn

@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 82
+node_module_version = 80
 
 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
@@ -21,6 +21,7 @@ dawn_enable_vulkan_validation_layers = false
 
 is_cfi = false
 
-enable_osr = true
+# TODO: disabled due to crashes. re-enable.
+enable_osr = false
 
 enable_electron_extensions = true

build/args/goma.gn

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

buildflags/BUILD.gn

@@ -13,7 +13,7 @@ buildflag_header("buildflags") {
     "ENABLE_RUN_AS_NODE=$enable_run_as_node",
     "ENABLE_OSR=$enable_osr",
     "ENABLE_REMOTE_MODULE=$enable_remote_module",
-    "ENABLE_VIEWS_API=$enable_views_api",
+    "ENABLE_VIEW_API=$enable_view_api",
     "ENABLE_PEPPER_FLASH=$enable_pepper_flash",
     "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
     "ENABLE_TTS=$enable_tts",

buildflags/buildflags.gni

@@ -12,7 +12,7 @@ declare_args() {
 
   enable_remote_module = true
 
-  enable_views_api = true
+  enable_view_api = false
 
   enable_pdf_viewer = true
 

chromium_src/BUILD.gn

@@ -51,8 +51,8 @@ static_library("chrome") {
     "//chrome/browser/ssl/security_state_tab_helper.cc",
     "//chrome/browser/ssl/security_state_tab_helper.h",
     "//chrome/browser/ssl/tls_deprecation_config.cc",
-    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
-    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
+    "//chrome/browser/ui/autofill/popup_view_common.cc",
+    "//chrome/browser/ui/autofill/popup_view_common.h",
     "//chrome/browser/win/chrome_process_finder.cc",
     "//chrome/browser/win/chrome_process_finder.h",
     "//extensions/browser/app_window/size_constraints.cc",
@@ -68,8 +68,8 @@ static_library("chrome") {
   ]
   deps = [
     "//chrome/browser:resource_prefetch_predictor_proto",
+    "//chrome/browser/ssl:proto",
     "//components/feature_engagement:buildflags",
-    "//components/optimization_guide/proto:optimization_guide_proto",
   ]
 
   if (is_linux) {
@@ -110,15 +110,11 @@ static_library("chrome") {
     ]
 
     if (use_aura) {
-      sources += [ "//chrome/browser/platform_util_aura.cc" ]
-
-      if (!is_win) {
-        sources += [
-          "//chrome/browser/ui/views/color_chooser_aura.cc",
-          "//chrome/browser/ui/views/color_chooser_aura.h",
-        ]
-      }
-
+      sources += [
+        "//chrome/browser/platform_util_aura.cc",
+        "//chrome/browser/ui/views/color_chooser_aura.cc",
+        "//chrome/browser/ui/views/color_chooser_aura.h",
+      ]
       deps += [ "//components/feature_engagement" ]
     }
 
@@ -247,8 +243,6 @@ static_library("chrome") {
       "//chrome/renderer/extensions/extension_hooks_delegate.h",
       "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
       "//chrome/renderer/extensions/tabs_hooks_delegate.h",
-      "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
-      "//chrome/renderer/pepper/chrome_pdf_print_client.h",
     ]
   }
 }
@@ -268,7 +262,6 @@ source_set("plugins") {
     "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
   ]
   deps += [
-    "//components/pdf/browser",
     "//media:media_buildflags",
     "//ppapi/buildflags",
     "//ppapi/proxy:ipc",
@@ -306,6 +299,8 @@ source_set("plugins") {
     sources += [
       "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
       "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
       "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
       "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
       "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
@@ -314,14 +309,7 @@ source_set("plugins") {
       "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
     ]
   }
-  if (enable_pepper_flash || enable_pdf_viewer) {
-    sources += [
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
-    ]
-  }
   deps += [
-    "//components/pdf/renderer",
     "//components/strings",
     "//media:media_buildflags",
     "//ppapi/host",

chromium_src/chrome/browser/certificate_manager_model.cc

@@ -69,12 +69,12 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
 
 // static
 void CertificateManagerModel::Create(content::BrowserContext* browser_context,
-                                     CreationCallback callback) {
+                                     const CreationCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::PostTask(FROM_HERE, {BrowserThread::IO},
-                 base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
-                                browser_context->GetResourceContext(),
-                                std::move(callback)));
+  base::PostTask(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
+                     browser_context->GetResourceContext(), callback));
 }
 
 CertificateManagerModel::CertificateManagerModel(
@@ -129,17 +129,17 @@ bool CertificateManagerModel::Delete(CERTCertificate* cert) {
 void CertificateManagerModel::DidGetCertDBOnUIThread(
     net::NSSCertDatabase* cert_db,
     bool is_user_db_available,
-    CreationCallback callback) {
+    const CreationCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   std::unique_ptr<CertificateManagerModel> model(
       new CertificateManagerModel(cert_db, is_user_db_available));
-  std::move(callback).Run(std::move(model));
+  callback.Run(std::move(model));
 }
 
 // static
 void CertificateManagerModel::DidGetCertDBOnIOThread(
-    CreationCallback callback,
+    const CreationCallback& callback,
     net::NSSCertDatabase* cert_db) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
@@ -147,24 +147,17 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
   base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
-                     is_user_db_available, std::move(callback)));
+                     is_user_db_available, callback));
 }
 
 // static
 void CertificateManagerModel::GetCertDBOnIOThread(
     content::ResourceContext* context,
-    CreationCallback callback) {
+    const CreationCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  auto did_get_cert_db_callback = base::AdaptCallbackForRepeating(
-      base::BindOnce(&CertificateManagerModel::DidGetCertDBOnIOThread,
-                     std::move(callback)));
-
-  net::NSSCertDatabase* cert_db =
-      GetNSSCertDatabaseForResourceContext(context, did_get_cert_db_callback);
-
-  // If the NSS database was already available, |cert_db| is non-null and
-  // |did_get_cert_db_callback| has not been called. Call it explicitly.
+  net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
+      context, base::BindOnce(&CertificateManagerModel::DidGetCertDBOnIOThread,
+                              callback));
   if (cert_db)
-    did_get_cert_db_callback.Run(cert_db);
+    DidGetCertDBOnIOThread(callback, cert_db);
 }

chromium_src/chrome/browser/certificate_manager_model.h

@@ -24,14 +24,14 @@ class ResourceContext;
 // manager dialog, and processes changes from the view.
 class CertificateManagerModel {
  public:
-  using CreationCallback =
-      base::OnceCallback<void(std::unique_ptr<CertificateManagerModel>)>;
+  typedef base::Callback<void(std::unique_ptr<CertificateManagerModel>)>
+      CreationCallback;
 
   // Creates a CertificateManagerModel. The model will be passed to the callback
   // when it is ready. The caller must ensure the model does not outlive the
   // |browser_context|.
   static void Create(content::BrowserContext* browser_context,
-                     CreationCallback callback);
+                     const CreationCallback& callback);
 
   ~CertificateManagerModel();
 
@@ -100,11 +100,11 @@ class CertificateManagerModel {
   // file for details.
   static void DidGetCertDBOnUIThread(net::NSSCertDatabase* cert_db,
                                      bool is_user_db_available,
-                                     CreationCallback callback);
-  static void DidGetCertDBOnIOThread(CreationCallback callback,
+                                     const CreationCallback& callback);
+  static void DidGetCertDBOnIOThread(const CreationCallback& callback,
                                      net::NSSCertDatabase* cert_db);
   static void GetCertDBOnIOThread(content::ResourceContext* context,
-                                  CreationCallback callback);
+                                  const CreationCallback& callback);
 
   net::NSSCertDatabase* cert_db_;
   // Whether the certificate database has a public slot associated with the

default_app/default_app.ts

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

default_app/main.ts

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

default_app/preload.ts

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

default_app/styles.css

@@ -8,7 +8,7 @@ body {
 }
 
 .container {
-  margin: 15px 30px;
+  margin: 15px 30px 30px 30px;
   background-color: #2f3241;
   flex: 1;
   display: flex;

docs/README.md

@@ -18,6 +18,7 @@ an issue:
 
 ## Guides and Tutorials
 
+* [About Electron](tutorial/about.md)
 * [Setting up the Development Environment](tutorial/development-environment.md)
   * [Setting up macOS](tutorial/development-environment.md#setting-up-macos)
   * [Setting up Windows](tutorial/development-environment.md#setting-up-windows)
@@ -111,7 +112,6 @@ 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)
-* [Chrome Extensions Support](api/extensions.md)
 * [Breaking API Changes](breaking-changes.md)
 
 ### Custom DOM Elements:

docs/api/accelerator.md

@@ -54,7 +54,7 @@ The `Super` key is mapped to the `Windows` key on Windows and Linux and
 * `0` to `9`
 * `A` to `Z`
 * `F1` to `F24`
-* Punctuation like `~`, `!`, `@`, `#`, `$`, etc.
+* Punctuations like `~`, `!`, `@`, `#`, `$`, etc.
 * `Plus`
 * `Space`
 * `Tab`

docs/api/app.md

@@ -75,7 +75,7 @@ Returns:
 * `event` Event
 
 Emitted when all windows have been closed and the application will quit.
-Calling `event.preventDefault()` will prevent the default behavior, which is
+Calling `event.preventDefault()` will prevent the default behaviour, which is
 terminating the application.
 
 See the description of the `window-all-closed` event for the differences between
@@ -204,7 +204,7 @@ Returns:
   [`NSUserActivity.activityType`][activity-type].
 * `userInfo` unknown - Contains app-specific state stored by the activity.
 
-Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActivity()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.
+Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActiviy()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.
 
 ### Event: 'new-window-for-tab' _macOS_
 
@@ -554,17 +554,11 @@ Returns `Promise<void>` - fulfilled when Electron is initialized.
 May be used as a convenient alternative to checking `app.isReady()`
 and subscribing to the `ready` event if the app is not ready yet.
 
-### `app.focus([options])`
-
-* `options` Object (optional)
-  * `steal` Boolean _macOS_ - Make the receiver the active app even if another app is
-  currently active.
+### `app.focus()`
 
 On Linux, focuses on the first visible window. On macOS, makes the application
 the active app. On Windows, focuses on the application's first window.
 
-You should seek to use the `steal` option as sparingly as possible.
-
 ### `app.hide()` _macOS_
 
 Hides all application windows without minimizing them.
@@ -665,6 +659,8 @@ to the npm modules spec. You should usually also specify a `productName`
 field, which is your application's full capitalized name, and which will be
 preferred over `name` by Electron.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.setName(name)`
 
 * `name` String
@@ -673,6 +669,8 @@ Overrides the current application's name.
 
 **Note:** This function overrides the name used internally by Electron; it does not affect the name that the OS uses.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.getLocale()`
 
 Returns `String` - The current application locale. Possible return values are documented [here](locales.md).
@@ -1027,7 +1025,7 @@ This method can only be called before app is ready.
 
 By default, Chromium disables 3D APIs (e.g. WebGL) until restart on a per
 domain basis if the GPU processes crashes too frequently. This function
-disables that behavior.
+disables that behaviour.
 
 This method can only be called before app is ready.
 
@@ -1091,10 +1089,14 @@ On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher.
 **Note:** Unity launcher requires the existence of a `.desktop` file to work,
 for more information please read [Desktop Environment Integration][unity-requirement].
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.getBadgeCount()` _Linux_ _macOS_
 
 Returns `Integer` - The current value displayed in the counter badge.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.isUnityRunning()` _Linux_
 
 Returns `Boolean` - Whether the current desktop environment is Unity launcher.
@@ -1169,6 +1171,8 @@ technologies, such as screen readers, has been detected. See
 https://www.chromium.org/developers/design-documents/accessibility for more
 details.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.setAccessibilitySupportEnabled(enabled)` _macOS_ _Windows_
 
 * `enabled` Boolean - Enable or disable [accessibility tree](https://developers.google.com/web/fundamentals/accessibility/semantics-builtin/the-accessibility-tree) rendering
@@ -1180,6 +1184,8 @@ This API must be called after the `ready` event is emitted.
 
 **Note:** Rendering accessibility tree can significantly affect the performance of your app. It should not be enabled by default.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.showAboutPanel()`
 
 Show the app's about panel options. These options can be overridden with `app.setAboutPanelOptions(options)`.
@@ -1196,7 +1202,7 @@ 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.
 
@@ -1225,9 +1231,9 @@ stopAccessingSecurityScopedResource()
 
 Start accessing a security scoped resource. With this method Electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.
 
-### `app.enableSandbox()`
+### `app.enableSandbox()` _Experimental_
 
-Enables full sandbox mode on the app. This means that all renderers will be launched sandboxed, regardless of the value of the `sandbox` flag in WebPreferences.
+Enables full sandbox mode on the app.
 
 This method can only be called before app is ready.
 

docs/api/browser-window.md

@@ -177,7 +177,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `simpleFullscreen` Boolean (optional) - Use pre-Lion fullscreen on macOS. Default is `false`.
   * `skipTaskbar` Boolean (optional) - Whether to show the window in taskbar. Default is
     `false`.
-  * `kiosk` Boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
+  * `kiosk` Boolean (optional) - The kiosk mode. Default is `false`.
   * `title` String (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
   * `icon` ([NativeImage](native-image.md) | String) (optional) - The window icon. On Windows it is
     recommended to use `ICO` icons to get best visual effects, you can also
@@ -207,7 +207,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `opacity` Number (optional) - Set the initial opacity of the window, between 0.0 (fully
     transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
   * `darkTheme` Boolean (optional) - Forces using dark theme for the window, only works on
-    some GTK desktop environments. Default is [`nativeTheme.shouldUseDarkColors`](native-theme.md).
+    some GTK+3 desktop environments. Default is `false`.
   * `transparent` Boolean (optional) - Makes the window [transparent](frameless-window.md#transparent-window).
     Default is `false`. On Windows, does not work unless the window is frameless.
   * `type` String (optional) - The type of window, default is normal window. See more about
@@ -289,7 +289,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       between the web pages even when you specified different values for them,
       including but not limited to `preload`, `sandbox` and `nodeIntegration`.
       So it is suggested to use exact same `webPreferences` for web pages with
-      the same `affinity`. _Deprecated_
+      the same `affinity`. _This property is experimental_
     * `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents
       `300%`. Default is `1.0`.
     * `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`.
@@ -369,8 +369,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       consecutive dialog protection is triggered. If not defined the default
       message would be used, note that currently the default message is in
       English and not localized.
-    * `disableDialogs` Boolean (optional) - Whether to disable dialogs
-      completely. Overrides `safeDialogs`. Default is `false`.
     * `navigateOnDragDrop` Boolean (optional) - Whether dragging and dropping a
       file or link onto the page causes a navigation. Default is `false`.
     * `autoplayPolicy` String (optional) - Autoplay policy to apply to
@@ -623,12 +621,6 @@ Returns:
 
 Emitted on 3-finger swipe. Possible directions are `up`, `right`, `down`, `left`.
 
-The method underlying this event is built to handle older macOS-style trackpad swiping,
-where the content on the screen doesn't move with the swipe. Most macOS trackpads are not
-configured to allow this kind of swiping anymore, so in order for it to emit properly the
-'Swipe between pages' preference in `System Preferences > Trackpad > More Gestures` must be
-set to 'Swipe with two or three fingers'.
-
 #### Event: 'rotate-gesture' _macOS_
 
 Returns:
@@ -803,47 +795,6 @@ A `Boolean` property that determines whether the window menu bar should hide its
 If the menu bar is already visible, setting this property to `true` won't
 hide it immediately.
 
-#### `win.simpleFullScreen`
-
-A `Boolean` property that determines whether the window is in simple (pre-Lion) fullscreen mode.
-
-#### `win.visibleOnAllWorkspaces`
-
-A `Boolean` property that determines whether the window is visible on all workspaces.
-
-**Note:** Always returns false on Windows.
-
-#### `win.shadow`
-
-A `Boolean` property that determines whether the window has a shadow.
-
-#### `win.menuBarVisible` _Windows_ _Linux_
-
-A `Boolean` property that determines whether the menu bar should be visible.
-
-**Note:** If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
-
-####  `win.kiosk`
-
-A `Boolean` property that determines whether the window is in kiosk mode.
-
-#### `win.documentEdited` _macOS_
-
-A `Boolean` property that specifies whether the window’s document has been edited.
-
-The icon in title bar will become gray when set to `true`.
-
-#### `win.representedFilename` _macOS_
-
-A `String` property that determines the pathname of the file the window represents,
-and the icon of the file will show in window's title bar.
-
-#### `win.title`
-
-A `String` property that determines the title of the native window.
-
-**Note:** The title of the web page can be different from the title of the native window.
-
 #### `win.minimizable`
 
 A `Boolean` property that determines whether the window can be manually minimized by user.
@@ -999,7 +950,7 @@ Returns `Boolean` - Whether the window is in fullscreen mode.
 
 Enters or leaves simple fullscreen mode.
 
-Simple fullscreen mode emulates the native fullscreen behavior found in versions of macOS prior to Lion (10.7).
+Simple fullscreen mode emulates the native fullscreen behavior found in versions of Mac OS X prior to Lion (10.7).
 
 #### `win.isSimpleFullScreen()` _macOS_
 
@@ -1162,11 +1113,15 @@ Returns `Integer[]` - Contains the window's maximum width and height.
 
 * `resizable` Boolean
 
-Sets whether the window can be manually resized by the user.
+Sets whether the window can be manually resized by user.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isResizable()`
 
-Returns `Boolean` - Whether the window can be manually resized by the user.
+Returns `Boolean` - Whether the window can be manually resized by user.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.setMovable(movable)` _macOS_ _Windows_
 
@@ -1174,29 +1129,41 @@ Returns `Boolean` - Whether the window can be manually resized by the user.
 
 Sets whether the window can be moved by user. On Linux does nothing.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.isMovable()` _macOS_ _Windows_
 
 Returns `Boolean` - Whether the window can be moved by user.
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMinimizable(minimizable)` _macOS_ _Windows_
 
 * `minimizable` Boolean
 
-Sets whether the window can be manually minimized by user. On Linux does nothing.
+Sets whether the window can be manually minimized by user. On Linux does
+nothing.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isMinimizable()` _macOS_ _Windows_
 
-Returns `Boolean` - Whether the window can be manually minimized by the user.
+Returns `Boolean` - Whether the window can be manually minimized by user
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMaximizable(maximizable)` _macOS_ _Windows_
 
 * `maximizable` Boolean
 
-Sets whether the window can be manually maximized by user. On Linux does nothing.
+Sets whether the window can be manually maximized by user. On Linux does
+nothing.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isMaximizable()` _macOS_ _Windows_
 
@@ -1204,15 +1171,23 @@ Returns `Boolean` - Whether the window can be manually maximized by user.
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setFullScreenable(fullscreenable)`
 
 * `fullscreenable` Boolean
 
-Sets whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+Sets whether the maximize/zoom window button toggles fullscreen mode or
+maximizes the window.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isFullScreenable()`
 
-Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen mode or
+maximizes the window.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.setClosable(closable)` _macOS_ _Windows_
 
@@ -1220,12 +1195,16 @@ Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen m
 
 Sets whether the window can be manually closed by user. On Linux does nothing.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.isClosable()` _macOS_ _Windows_
 
 Returns `Boolean` - Whether the window can be manually closed by user.
 
 On Linux always returns `true`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setAlwaysOnTop(flag[, level][, relativeLevel])`
 
 * `flag` Boolean
@@ -1323,7 +1302,7 @@ Makes the window not show in the taskbar.
 
 * `flag` Boolean
 
-Enters or leaves kiosk mode.
+Enters or leaves the kiosk mode.
 
 #### `win.isKiosk()`
 
@@ -1637,17 +1616,23 @@ This cannot be called when `titleBarStyle` is set to `customButtonsOnHover`.
 Sets whether the window menu bar should hide itself automatically. Once set the
 menu bar will only show when users press the single `Alt` key.
 
-If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't hide it immediately.
+If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't
+hide it immediately.
+
+**[Deprecated](modernization/property-updates.md)**
 
 #### `win.isMenuBarAutoHide()`
 
 Returns `Boolean` - Whether menu bar automatically hides itself.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMenuBarVisibility(visible)` _Windows_ _Linux_
 
 * `visible` Boolean
 
-Sets whether the menu bar should be visible. If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
+Sets whether the menu bar should be visible. If the menu bar is auto-hide, users
+can still bring up the menu bar by pressing the single `Alt` key.
 
 #### `win.isMenuBarVisible()`
 
@@ -1763,18 +1748,7 @@ will remove the vibrancy effect on the window.
 Note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` have been
 deprecated and will be removed in an upcoming version of macOS.
 
-#### `win.setTrafficLightPosition(position)` _macOS_
-
-* `position` [Point](structures/point.md)
-
-Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`.
-
-#### `win.getTrafficLightPosition()` _macOS_
-
-Returns `Point` - The current position for the traffic light buttons. Can only be used with `titleBarStyle`
-set to `hidden`.
-
-#### `win.setTouchBar(touchBar)` _macOS_
+#### `win.setTouchBar(touchBar)` _macOS_ _Experimental_
 
 * `touchBar` TouchBar | null
 

docs/api/client-request.md

@@ -22,9 +22,6 @@ which the request is associated.
   with which the request is associated. Defaults to the empty string. The
 `session` option prevails on `partition`. Thus if a `session` is explicitly
 specified, `partition` is ignored.
-  * `useSessionCookies` Boolean (optional) - Whether to send cookies with this
-    request from the provided session.  This will make the `net` request's
-    cookie behavior match a `fetch` request. Default is `false`.
   * `protocol` String (optional) - The protocol scheme in the form 'scheme:'.
 Currently supported values are 'http:' or 'https:'. Defaults to 'http:'.
   * `host` String (optional) - The server host provided as a concatenation of

docs/api/command-line-switches.md

@@ -16,66 +16,80 @@ app.whenReady().then(() => {
 })
 ```
 
-## Electron CLI Flags
+## --ignore-connections-limit=`domains`
 
-### --auth-server-whitelist=`url`
+Ignore the connections limit for `domains` list separated by `,`.
 
-A comma-separated list of servers for which integrated authentication is enabled.
-
-For example:
-
-```sh
---auth-server-whitelist='*example.com, *foobar.com, *baz'
-```
-
-then any `url` ending with `example.com`, `foobar.com`, `baz` will be considered
-for integrated authentication. Without `*` prefix the URL has to match exactly.
-
-### --auth-negotiate-delegate-whitelist=`url`
-
-A comma-separated list of servers for which delegation of user credentials is required.
-Without `*` prefix the URL has to match exactly.
-
-### --disable-http-cache
+## --disable-http-cache
 
 Disables the disk cache for HTTP requests.
 
-### --disable-http2
+## --disable-http2
 
 Disable HTTP/2 and SPDY/3.1 protocols.
 
-### --disable-renderer-backgrounding
+## --lang
 
-Prevents Chromium from lowering the priority of invisible pages' renderer
-processes.
+Set a custom locale.
 
-This flag is global to all renderer processes, if you only want to disable
-throttling in one window, you can take the hack of
-[playing silent audio][play-silent-audio].
+## --inspect=`port` and --inspect-brk=`port`
 
-### --disk-cache-size=`size`
+Debug-related flags, see the [Debugging the Main Process][debugging-main-process] guide for details.
+
+## --remote-debugging-port=`port`
+
+Enables remote debugging over HTTP on the specified `port`.
+
+## --disk-cache-size=`size`
 
 Forces the maximum disk space to be used by the disk cache, in bytes.
 
-### --enable-api-filtering-logging
+## --js-flags=`flags`
 
-Enables caller stack logging for the following APIs (filtering events):
-- `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
-- `remote.require()` / `remote-require`
-- `remote.getGlobal()` / `remote-get-builtin`
-- `remote.getBuiltin()` / `remote-get-global`
-- `remote.getCurrentWindow()` / `remote-get-current-window`
-- `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
+Specifies the flags passed to the Node.js engine. It has to be passed when starting
+Electron if you want to enable the `flags` in the main process.
 
-### --enable-logging
+```sh
+$ electron --js-flags="--harmony_proxies --harmony_collections" your-app
+```
 
-Prints Chromium's logging into console.
+See the [Node.js documentation][node-cli] or run `node --help` in your terminal for a list of available flags. Additionally, run `node --v8-options` to see a list of flags that specifically refer to Node.js's V8 JavaScript engine.
 
-This switch can not be used in `app.commandLine.appendSwitch` since it is parsed
-earlier than user's app is loaded, but you can set the `ELECTRON_ENABLE_LOGGING`
-environment variable to achieve the same effect.
+## --proxy-server=`address:port`
 
-### --host-rules=`rules`
+Use a specified proxy server, which overrides the system setting. This switch
+only affects requests with HTTP protocol, including HTTPS and WebSocket
+requests. It is also noteworthy that not all proxy servers support HTTPS and
+WebSocket requests. The proxy URL does not support username and password
+authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/detail?id=615947).
+
+## --proxy-bypass-list=`hosts`
+
+Instructs Electron to bypass the proxy server for the given semi-colon-separated
+list of hosts. This flag has an effect only if used in tandem with
+`--proxy-server`.
+
+For example:
+
+```javascript
+const { app } = require('electron')
+app.commandLine.appendSwitch('proxy-bypass-list', '<local>;*.google.com;*foo.com;1.2.3.4:5678')
+```
+
+Will use the proxy server for all hosts except for local addresses (`localhost`,
+`127.0.0.1` etc.), `google.com` subdomains, hosts that contain the suffix
+`foo.com` and anything at `1.2.3.4:5678`.
+
+## --proxy-pac-url=`url`
+
+Uses the PAC script at the specified `url`.
+
+## --no-proxy-server
+
+Don't use a proxy server and always make direct connections. Overrides any other
+proxy server flags that are passed.
+
+## --host-rules=`rules`
 
 A comma-separated list of `rules` that control how hostnames are mapped.
 
@@ -93,96 +107,69 @@ These mappings apply to the endpoint host in a net request (the TCP connect
 and host resolver in a direct connection, and the `CONNECT` in an HTTP proxy
 connection, and the endpoint host in a `SOCKS` proxy connection).
 
-### --host-resolver-rules=`rules`
+## --host-resolver-rules=`rules`
 
 Like `--host-rules` but these `rules` only apply to the host resolver.
 
-### --ignore-certificate-errors
+## --auth-server-whitelist=`url`
 
-Ignores certificate related errors.
-
-### --ignore-connections-limit=`domains`
-
-Ignore the connections limit for `domains` list separated by `,`.
-
-### --js-flags=`flags`
-
-Specifies the flags passed to the Node.js engine. It has to be passed when starting
-Electron if you want to enable the `flags` in the main process.
-
-```sh
-$ electron --js-flags="--harmony_proxies --harmony_collections" your-app
-```
-
-See the [Node.js documentation][node-cli] or run `node --help` in your terminal for a list of available flags. Additionally, run `node --v8-options` to see a list of flags that specifically refer to Node.js's V8 JavaScript engine.
-
-### --lang
-
-Set a custom locale.
-
-### --log-net-log=`path`
-
-Enables net log events to be saved and writes them to `path`.
-
-### --no-proxy-server
-
-Don't use a proxy server and always make direct connections. Overrides any other
-proxy server flags that are passed.
-
-### --no-sandbox
-
-Disables Chromium sandbox, which is now enabled by default.
-Should only be used for testing.
-
-### --proxy-bypass-list=`hosts`
-
-Instructs Electron to bypass the proxy server for the given semi-colon-separated
-list of hosts. This flag has an effect only if used in tandem with
-`--proxy-server`.
+A comma-separated list of servers for which integrated authentication is enabled.
 
 For example:
 
-```javascript
-const { app } = require('electron')
-app.commandLine.appendSwitch('proxy-bypass-list', '<local>;*.google.com;*foo.com;1.2.3.4:5678')
+```sh
+--auth-server-whitelist='*example.com, *foobar.com, *baz'
 ```
 
-Will use the proxy server for all hosts except for local addresses (`localhost`,
-`127.0.0.1` etc.), `google.com` subdomains, hosts that contain the suffix
-`foo.com` and anything at `1.2.3.4:5678`.
+then any `url` ending with `example.com`, `foobar.com`, `baz` will be considered
+for integrated authentication. Without `*` prefix the URL has to match exactly.
 
-### --proxy-pac-url=`url`
+## --auth-negotiate-delegate-whitelist=`url`
 
-Uses the PAC script at the specified `url`.
+A comma-separated list of servers for which delegation of user credentials is required.
+Without `*` prefix the URL has to match exactly.
 
-### --proxy-server=`address:port`
+## --ignore-certificate-errors
 
-Use a specified proxy server, which overrides the system setting. This switch
-only affects requests with HTTP protocol, including HTTPS and WebSocket
-requests. It is also noteworthy that not all proxy servers support HTTPS and
-WebSocket requests. The proxy URL does not support username and password
-authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/detail?id=615947).
+Ignores certificate related errors.
 
-### --remote-debugging-port=`port`
-
-Enables remote debugging over HTTP on the specified `port`.
-
-### --ppapi-flash-path=`path`
+## --ppapi-flash-path=`path`
 
 Sets the `path` of the pepper flash plugin.
 
-### --ppapi-flash-version=`version`
+## --ppapi-flash-version=`version`
 
 Sets the `version` of the pepper flash plugin.
 
-### --v=`log_level`
+## --log-net-log=`path`
+
+Enables net log events to be saved and writes them to `path`.
+
+## --disable-renderer-backgrounding
+
+Prevents Chromium from lowering the priority of invisible pages' renderer
+processes.
+
+This flag is global to all renderer processes, if you only want to disable
+throttling in one window, you can take the hack of
+[playing silent audio][play-silent-audio].
+
+## --enable-logging
+
+Prints Chromium's logging into console.
+
+This switch can not be used in `app.commandLine.appendSwitch` since it is parsed
+earlier than user's app is loaded, but you can set the `ELECTRON_ENABLE_LOGGING`
+environment variable to achieve the same effect.
+
+## --v=`log_level`
 
 Gives the default maximal active V-logging level; 0 is the default. Normally
 positive values are used for V-logging levels.
 
 This switch only works when `--enable-logging` is also passed.
 
-### --vmodule=`pattern`
+## --vmodule=`pattern`
 
 Gives the per-module maximal V-logging levels to override the value given by
 `--v`. E.g. `my_module=2,foo*=3` would change the logging level for all code in
@@ -194,38 +181,20 @@ logging level for all code in the source files under a `foo/bar` directory.
 
 This switch only works when `--enable-logging` is also passed.
 
-## Node.js Flags
+## --enable-api-filtering-logging
 
-Electron supports some of the [CLI flags][node-cli] supported by Node.js.
+Enables caller stack logging for the following APIs (filtering events):
+- `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
+- `remote.require()` / `remote-require`
+- `remote.getGlobal()` / `remote-get-builtin`
+- `remote.getBuiltin()` / `remote-get-global`
+- `remote.getCurrentWindow()` / `remote-get-current-window`
+- `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
 
-**Note:** Passing unsupported command line switches to Electron when it is not running in `ELECTRON_RUN_AS_NODE` will have no effect.
+## --no-sandbox
 
-### --inspect-brk[=[host:]port]
-
-Activate inspector on host:port and break at start of user script. Default host:port is 127.0.0.1:9229.
-
-Aliased to `--debug-brk=[host:]port`.
-
-### --inspect-port=[host:]port
-
-Set the `host:port` to be used when the inspector is activated. Useful when activating the inspector by sending the SIGUSR1 signal. Default host is `127.0.0.1`.
-
-Aliased to `--debug-port=[host:]port`.
-
-### --inspect[=[host:]port]
-
-Activate inspector on `host:port`. Default is `127.0.0.1:9229`.
-
-V8 inspector integration allows tools such as Chrome DevTools and IDEs to debug and profile Electron instances. The tools attach to Electron instances via a TCP port and communicate using the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/).
-
-See the [Debugging the Main Process][debugging-main-process] guide for more details.
-
-Aliased to `--debug[=[host:]port`.
-
-### --inspect-publish-uid=stderr,http
-Specify ways of the inspector web socket url exposure.
-
-By default inspector websocket url is available in stderr and under /json/list endpoint on http://host:port/json/list.
+Disables Chromium sandbox, which is now enabled by default.
+Should only be used for testing.
 
 [app]: app.md
 [append-switch]: app.md#appcommandlineappendswitchswitch-value

docs/api/cookies.md

@@ -96,7 +96,6 @@ the response.
   * `expirationDate` Double (optional) - The expiration date of the cookie as the number of
     seconds since the UNIX epoch. If omitted then the cookie becomes a session
     cookie and will not be retained between sessions.
-  * `sameSite` String (optional) - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy to apply to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.  Default is `no_restriction`.
 
 Returns `Promise<void>` - A promise which resolves when the cookie has been set
 

docs/api/crash-reporter.md

@@ -48,11 +48,6 @@ The `crashReporter` module has the following methods:
   * `productName` String (optional) - Defaults to `app.name`.
   * `uploadToServer` Boolean (optional) - Whether crash reports should be sent to the server. Default is `true`.
   * `ignoreSystemCrashHandler` Boolean (optional) - Default is `false`.
-  * `rateLimit` Boolean (optional) _macOS_ _Windows_ - If true, limit the
-    number of crashes uploaded to 1/hour. Default is `false`.
-  * `compress` Boolean (optional) _macOS_ _Windows_ - If true, crash reports
-    will be compressed and uploaded with `Content-Encoding: gzip`. Not all
-    collection servers support compressed payloads. Default is `false`.
   * `extra` Record<String, String> (optional) - An object you can define that will be sent along with the
     report. Only string properties are sent correctly. Nested objects are not
     supported. When using Windows, the property names and values must be fewer than 64 characters.

docs/api/dialog.md

@@ -269,7 +269,6 @@ Shows a message box, it will block the process until the message box is closed.
 It returns the index of the clicked button.
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
-If `browserWindow` is not shown dialog will not be attached to it. In such case It will be displayed as independed window.
 
 ### `dialog.showMessageBox([browserWindow, ]options)`
 

docs/api/download-item.md

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

docs/api/environment-variables.md

@@ -80,18 +80,6 @@ and spawned child processes that set `ELECTRON_RUN_AS_NODE`.
 
 Starts the process as a normal Node.js process.
 
-In this mode, you will be able to pass [cli options](https://nodejs.org/api/cli.html) to Node.js as
-you would when running the normal Node.js executable, with the exception of the following flags:
-
-* "--openssl-config"
-* "--use-bundled-ca"
-* "--use-openssl-ca",
-* "--force-fips"
-* "--enable-fips"
-
-These flags are disabled owing to the fact that Electron uses BoringSSL instead of OpenSSL when building Node.js'
-`crypto` module, and so will not work as designed.
-
 ### `ELECTRON_NO_ATTACH_CONSOLE` _Windows_
 
 Don't attach to the current console session.

docs/api/extensions.md

@@ -1,104 +0,0 @@
-# Chrome Extension Support
-
-Electron supports a subset of the [Chrome Extensions
-API][chrome-extensions-api-index], primarily to support DevTools extensions and
-Chromium-internal extensions, but it also happens to support some other
-extension capabilities.
-
-[chrome-extensions-api-index]: https://developer.chrome.com/extensions/api_index
-
-> **Note:** Electron does not support arbitrary Chrome extensions from the
-> store, and it is a **non-goal** of the Electron project to be perfectly
-> compatible with Chrome's implementation of Extensions.
-
-## Loading extensions
-
-Electron only supports loading unpacked extensions (i.e., `.crx` files do not
-work). Extensions are installed per-`session`. To load an extension, call
-[`ses.loadExtension`](session.md#sesloadextensionpath):
-
-```js
-const { session } = require('electron')
-
-session.loadExtension('path/to/unpacked/extension').then(({ id }) => {
-  // ...
-})
-```
-
-Loaded extensions will not be automatically remembered across exits; if you do
-not call `loadExtension` when the app runs, the extension will not be loaded.
-
-Note that loading extensions is only supported in persistent sessions.
-Attempting to load an extension into an in-memory session will throw an error.
-
-See the [`session`](session.md) documentation for more information about
-loading, unloading, and querying active extensions.
-
-## Supported Extensions APIs
-
-We support the following extensions APIs, with some caveats. Other APIs may
-additionally be supported, but support for any APIs not listed here is
-provisional and may be removed.
-
-### `chrome.devtools.inspectedWindow`
-
-All features of this API are supported.
-
-### `chrome.devtools.network`
-
-All features of this API are supported.
-
-### `chrome.devtools.panels`
-
-All features of this API are supported.
-
-### `chrome.extension`
-
-The following properties of `chrome.extension` are supported:
-
-- `chrome.extension.lastError`
-
-The following methods of `chrome.extension` are supported:
-
-- `chrome.extension.getURL`
-- `chrome.extension.getBackgroundPage`
-
-### `chrome.runtime`
-
-The following properties of `chrome.runtime` are supported:
-
-- `chrome.runtime.lastError`
-- `chrome.runtime.id`
-
-The following methods of `chrome.runtime` are supported:
-
-- `chrome.runtime.getBackgroundPage`
-- `chrome.runtime.getManifest`
-- `chrome.runtime.getURL`
-- `chrome.runtime.connect`
-- `chrome.runtime.sendMessage`
-
-The following events of `chrome.runtime` are supported:
-
-- `chrome.runtime.onStartup`
-- `chrome.runtime.onInstalled`
-- `chrome.runtime.onSuspend`
-- `chrome.runtime.onSuspendCanceled`
-- `chrome.runtime.onConnect`
-- `chrome.runtime.onMessage`
-
-### `chrome.storage`
-
-Only `chrome.storage.local` is supported; `chrome.storage.sync` and
-`chrome.storage.managed` are not.
-
-### `chrome.tabs`
-
-The following methods of `chrome.tabs` are supported:
-
-- `chrome.tabs.sendMessage`
-- `chrome.tabs.executeScript`
-
-> **Note:** In Chrome, passing `-1` as a tab ID signifies the "currently active
-> tab". Since Electron has no such concept, passing `-1` as a tab ID is not
-> supported and will raise an error.

docs/api/frameless-window.md

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

docs/api/incoming-message.md

@@ -51,17 +51,12 @@ A `String` representing the HTTP status message.
 
 #### `response.headers`
 
-A `Record<string, string | string[]>` representing the HTTP response headers. The `headers` object is
+An `Record<string, string[]>` representing the response HTTP headers. The `headers` object is
 formatted as follows:
 
 * All header names are lowercased.
-* Duplicates of `age`, `authorization`, `content-length`, `content-type`,
-`etag`, `expires`, `from`, `host`, `if-modified-since`, `if-unmodified-since`,
-`last-modified`, `location`, `max-forwards`, `proxy-authorization`, `referer`,
-`retry-after`, `server`, or `user-agent` are discarded.
-* `set-cookie` is always an array. Duplicates are added to the array.
-* For duplicate `cookie` headers, the values are joined together with '; '.
-* For all other headers, the values are joined together with ', '.
+* Each header name produces an array-valued property on the headers object.
+* Each header value is pushed into the array associated with its header name.
 
 #### `response.httpVersion`
 

docs/api/ipc-renderer.md

@@ -57,7 +57,7 @@ Removes all listeners, or those of the specified `channel`.
 
 Send an asynchronous message to the main process via `channel`, along with
 arguments. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
@@ -68,10 +68,6 @@ throw an exception.
 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.
 
-If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
-
-If you want to receive a single response from the main process, like the result of a method call, consider using [`ipcRenderer.invoke`](#ipcrendererinvokechannel-args).
-
 ### `ipcRenderer.invoke(channel, ...args)`
 
 * `channel` String
@@ -81,7 +77,7 @@ Returns `Promise<any>` - Resolves with the response from the main process.
 
 Send a message to the main process via `channel` and expect a result
 asynchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
@@ -106,10 +102,6 @@ ipcMain.handle('some-name', async (event, someArgument) => {
 })
 ```
 
-If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
-
-If you do not need a respons to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).
-
 ### `ipcRenderer.sendSync(channel, ...args)`
 
 * `channel` String
@@ -119,7 +111,7 @@ Returns `any` - The value sent back by the [`ipcMain`](ipc-main.md) handler.
 
 Send a message to the main process via `channel` and expect a result
 synchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
@@ -135,35 +127,6 @@ and replies by setting `event.returnValue`.
 > last resort. It's much better to use the asynchronous version,
 > [`invoke()`](ipc-renderer.md#ipcrendererinvokechannel-args).
 
-### `ipcRenderer.postMessage(channel, message, [transfer])`
-
-* `channel` String
-* `message` any
-* `transfer` MessagePort[] (optional)
-
-Send a message to the main process, optionally transferring ownership of zero
-or more [`MessagePort`][] objects.
-
-The transferred `MessagePort` objects will be available in the main process as
-[`MessagePortMain`](message-port-main.md) objects by accessing the `ports`
-property of the emitted event.
-
-For example:
-```js
-// Renderer process
-const { port1, port2 } = new MessageChannel()
-ipcRenderer.postMessage('port', { message: 'hello' }, [port1])
-
-// Main process
-ipcMain.on('port', (e, msg) => {
-  const [port] = e.ports
-  // ...
-})
-```
-
-For more information on using `MessagePort` and `MessageChannel`, see the [MDN
-documentation](https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel).
-
 ### `ipcRenderer.sendTo(webContentsId, channel, ...args)`
 
 * `webContentsId` Number
@@ -187,5 +150,4 @@ in the [`ipc-renderer-event`](structures/ipc-renderer-event.md) structure docs.
 
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-[`window.postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
-[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
+[`postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage

docs/api/menu-item.md

@@ -117,7 +117,7 @@ When specifying a `role` on macOS, `label` and `accelerator` are the only
 options that will affect the menu item. All other options will be ignored.
 Lowercase `role`, e.g. `toggledevtools`, is still supported.
 
-**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on macOS.
+**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on MacOS.
 
 ### Instance Properties
 

docs/api/message-channel-main.md

@@ -1,32 +0,0 @@
-# MessageChannelMain
-
-`MessageChannelMain` is the main-process-side equivalent of the DOM
-[`MessageChannel`][] object. Its singular function is to create a pair of
-connected [`MessagePortMain`](message-port-main.md) objects.
-
-See the [Channel Messaging API][] documentation for more information on using
-channel messaging.
-
-## Class: MessageChannelMain
-
-Process: [Main](../glossary.md#main-process)
-
-Example:
-```js
-const { port1, port2 } = new MessageChannelMain()
-w.webContents.postMessage('port', null, [port2])
-port1.postMessage({ some: 'message' })
-```
-
-### Instance Properties
-
-#### `channel.port1`
-
-A [`MessagePortMain`](message-port-main.md) property.
-
-#### `channel.port2`
-
-A [`MessagePortMain`](message-port-main.md) property.
-
-[`MessageChannel`]: https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel
-[Channel Messaging API]: https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API

docs/api/message-port-main.md

@@ -1,55 +0,0 @@
-# MessagePortMain
-
-`MessagePortMain` is the main-process-side equivalent of the DOM
-[`MessagePort`][] object. It behaves similarly to the DOM version, with the
-exception that it uses the Node.js `EventEmitter` event system, instead of the
-DOM `EventTarget` system. This means you should use `port.on('message', ...)`
-to listen for events, instead of `port.onmessage = ...` or
-`port.addEventListener('message', ...)`
-
-See the [Channel Messaging API][] documentation for more information on using
-channel messaging.
-
-`MessagePortMain` is an [EventEmitter][event-emitter].
-
-## Class: MessagePortMain
-
-Process: [Main](../glossary.md#main-process)
-
-### Instance Methods
-
-#### `port.postMessage(message, [transfer])`
-
-* `message` any
-* `transfer` MessagePortMain[] (optional)
-
-Sends a message from the port, and optionally, transfers ownership of objects
-to other browsing contexts.
-
-#### `port.start()`
-
-Starts the sending of messages queued on the port. Messages will be queued
-until this method is called.
-
-#### `port.close()`
-
-Disconnects the port, so it is no longer active.
-
-### Instance Events
-
-#### Event: 'message'
-
-Returns:
-
-* `messageEvent` Object
-  * `data` any
-  * `ports` MessagePortMain[]
-
-Emitted when a MessagePortMain object receives a message.
-
-#### Event: 'close'
-
-Emitted when the remote end of a MessagePortMain object becomes disconnected.
-
-[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
-[Channel Messaging API]: https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API

docs/api/modernization/property-updates.md

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

docs/api/native-image.md

@@ -276,10 +276,14 @@ Returns [`Size`](structures/size.md)
 
 Marks the image as a template image.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `image.isTemplateImage()`
 
 Returns `Boolean` - Whether the image is a template image.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `image.crop(rect)`
 
 * `rect` [Rectangle](structures/rectangle.md) - The area of the image to crop.

docs/api/net-log.md

@@ -40,7 +40,7 @@ Starts recording network events to `path`.
 
 ### `netLog.stopLogging()`
 
-Returns `Promise<void>` - resolves when the net log has been flushed to disk.
+Returns `Promise<String>` - resolves with a file path to which network logs were recorded.
 
 Stops recording network events. If not called, net logging will automatically end when app quits.
 
@@ -48,4 +48,8 @@ Stops recording network events. If not called, net logging will automatically en
 
 ### `netLog.currentlyLogging` _Readonly_
 
-A `Boolean` property that indicates whether network logs are currently being recorded.
+A `Boolean` property that indicates whether network logs are recorded.
+
+### `netLog.currentlyLoggingPath` _Readonly_ _Deprecated_
+
+A `String` property that returns the path to the current log file.

docs/api/notification.md

@@ -26,7 +26,7 @@ The `Notification` class has the following static methods:
 
 Returns `Boolean` - Whether or not desktop notifications are supported on the current system
 
-### `new Notification([options])`
+### `new Notification([options])` _Experimental_
 
 * `options` Object (optional)
   * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown.

docs/api/power-monitor.md

@@ -4,6 +4,22 @@
 
 Process: [Main](../glossary.md#main-process)
 
+
+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
+For example:
+
+```javascript
+const { app, powerMonitor } = require('electron')
+
+app.whenReady().then(() => {
+  powerMonitor.on('suspend', () => {
+    console.log('The system is going to sleep')
+  })
+})
+```
+
 ## Events
 
 The `powerMonitor` module emits the following events:

docs/api/process.md

@@ -111,11 +111,7 @@ A `Boolean` that controls whether or not process warnings printed to `stderr` in
 
 ### `process.type` _Readonly_
 
-A `String` representing the current process's type, can be:
-
-* `browser` - The main process
-* `renderer` - A renderer process
-* `worker` - In a web worker
+A `String` representing the current process's type, can be `"browser"` (i.e. main process), `"renderer"`, or `"worker"` (i.e. web worker).
 
 ### `process.versions.chrome` _Readonly_
 

docs/api/sandbox-option.md

@@ -51,10 +51,10 @@ app.whenReady().then(() => {
 
 In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
 only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
-within this new window `window.open` follows the native behavior (by default Electron creates a [`BrowserWindow`](browser-window.md)
+within this new window `window.open` follows the native behaviour (by default Electron creates a [`BrowserWindow`](browser-window.md)
 and returns a proxy to this via `window.open`).
 
-[`app.enableSandbox`](app.md#appenablesandbox) can be used to force `sandbox: true` for all `BrowserWindow` instances.
+[`app.enableSandbox`](app.md#appenablesandbox-experimental) can be used to force `sandbox: true` for all `BrowserWindow` instances.
 
 ```js
 let win

docs/api/service-workers.md

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

docs/api/session.md

@@ -105,45 +105,6 @@ Returns:
 Emitted when a render process requests preconnection to a URL, generally due to
 a [resource hint](https://w3c.github.io/resource-hints/).
 
-#### Event: 'spellcheck-dictionary-initialized'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file has been successfully initialized. This
-occurs after the file has been downloaded.
-
-#### Event: 'spellcheck-dictionary-download-begin'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file starts downloading
-
-#### Event: 'spellcheck-dictionary-download-success'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file has been successfully downloaded
-
-#### Event: 'spellcheck-dictionary-download-failure'
-
-Returns:
-
-* `event` Event
-* `languageCode` String - The language code of the dictionary file
-
-Emitted when a hunspell dictionary file download fails.  For details
-on the failure you should collect a netlog and inspect the download
-request.
-
 ### Instance Methods
 
 The following methods are available on instances of `Session`:
@@ -439,13 +400,6 @@ example `"en-US,fr,de,ko,zh-CN,ja"`.
 This doesn't affect existing `WebContents`, and each `WebContents` can use
 `webContents.setUserAgent` to override the session-wide user agent.
 
-#### `ses.isPersistent()`
-
-Returns `Boolean` - Whether or not this session is a persistent one. The default
-`webContents` session of a `BrowserWindow` is persistent. When creating a session
-from a partition, session prefixed with `persist:` will be persistent, while others
-will be temporary.
-
 #### `ses.getUserAgent()`
 
 Returns `String` - The user agent for this session.
@@ -486,7 +440,9 @@ event. The [DownloadItem](download-item.md) will not have any `WebContents` asso
 the initial state will be `interrupted`. The download will start only when the
 `resume` API is called on the [DownloadItem](download-item.md).
 
-#### `ses.clearAuthCache()`
+#### `ses.clearAuthCache(options)`
+
+* `options` ([RemovePassword](structures/remove-password.md) | [RemoveClientCertificate](structures/remove-client-certificate.md))
 
 Returns `Promise<void>` - resolves when the session’s HTTP authentication cache has been cleared.
 
@@ -527,12 +483,7 @@ setting with the current OS locale.  This setting is persisted across restarts.
 By default Electron will download hunspell dictionaries from the Chromium CDN.  If you want to override this
 behavior you can use this API to point the dictionary downloader at your own hosted version of the hunspell
 dictionaries.  We publish a `hunspell_dictionaries.zip` file with each release which contains the files you need
-to host here, the file server must be **case insensitive** you must upload each file twice, once with the case it
-has in the ZIP file and once with the filename as all lower case.
-
-If the files present in `hunspell_dictionaries.zip` are available at `https://example.com/dictionaries/language-code.bdic`
-then you should call this api with `ses.setSpellCheckerDictionaryDownloadURL('https://example.com/dictionaries/')`.  Please
-note the trailing slash.  The URL to the dictionaries is formed as `${url}${filename}`.
+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.
 
@@ -545,20 +496,10 @@ Resolves when the full dictionary is loaded from disk.
 
 * `word` String - The word you want to add to the dictionary
 
-Returns `Boolean` - Whether the word was successfully written to the custom dictionary. This API
-will not work on non-persistent (in-memory) sessions.
+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
 
-#### `ses.removeWordFromSpellCheckerDictionary(word)`
-
-* `word` String - The word you want to remove from the dictionary
-
-Returns `Boolean` - Whether the word was successfully removed from the custom dictionary. This API
-will not work on non-persistent (in-memory) sessions.
-
-**Note:** On macOS and Windows 10 this word will be removed from the OS custom dictionary as well
-
 #### `ses.loadExtension(path)`
 
 * `path` String - Path to a directory containing an unpacked Chrome extension
@@ -571,8 +512,6 @@ requests an API that Electron does not support) then they will be logged to the
 console.
 
 Note that Electron does not support the full range of Chrome extensions APIs.
-See [Supported Extensions APIs](extensions.md#supported-extensions-apis) for
-more details on what is supported.
 
 Note that in previous versions of Electron, extensions that were loaded would
 be remembered for future runs of the application. This is no longer the case:
@@ -595,9 +534,6 @@ This API does not support loading packed (.crx) extensions.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Note:** Loading extensions into in-memory (non-persistent) sessions is not
-supported and will throw an error.
-
 #### `ses.removeExtension(extensionId)`
 
 * `extensionId` String - ID of extension to remove
@@ -636,10 +572,6 @@ code to the `setSpellCheckerLanaguages` API that isn't in this array will result
 
 A [`Cookies`](cookies.md) object for this session.
 
-#### `ses.serviceWorkers` _Readonly_
-
-A [`ServiceWorkers`](service-workers.md) object for this session.
-
 #### `ses.webRequest` _Readonly_
 
 A [`WebRequest`](web-request.md) object for this session.

docs/api/shell.md

@@ -2,7 +2,7 @@
 
 > Manage files and URLs using their default applications.
 
-Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process) (non-sandboxed only)
+Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process)
 
 The `shell` module provides functions related to desktop integration.
 
@@ -14,8 +14,6 @@ const { shell } = require('electron')
 shell.openExternal('https://github.com')
 ```
 
-**Note:** While the `shell` module can be used in the renderer process, it will not function in a sandboxed renderer.
-
 ## Methods
 
 The `shell` module has the following methods:

docs/api/structures/cookie.md

@@ -12,4 +12,3 @@
 * `expirationDate` Double (optional) - The expiration date of the cookie as
   the number of seconds since the UNIX epoch. Not provided for session
   cookies.
-* `sameSite` String - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy applied to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.

docs/api/structures/extension.md

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

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

@@ -3,7 +3,6 @@
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `returnValue` any - Set this to the value to be returned in a synchronous message
 * `sender` WebContents - Returns the `webContents` that sent the message
-* `ports` MessagePortMain[] - A list of MessagePorts that were transferred with this message
 * `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
   * `channel` String
   * `...args` any[]

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

@@ -2,6 +2,5 @@
 
 * `sender` IpcRenderer - The `IpcRenderer` instance that emitted the event originally
 * `senderId` Integer - The `webContents.id` that sent the message, you can call `event.sender.sendTo(event.senderId, ...)` to reply to the message, see [ipcRenderer.sendTo][ipc-renderer-sendto] for more information. This only applies to messages sent from a different renderer. Messages sent directly from the main process set `event.senderId` to `0`.
-* `ports` MessagePort[] - A list of MessagePorts that were transferred with this message
 
 [ipc-renderer-sendto]: #ipcrenderersendtowindowid-channel--arg1-arg2-

docs/api/structures/post-body.md

@@ -1,23 +0,0 @@
-# PostBody Object
-
-* `data` Array<[PostData](./post-data.md)> - The post data to be sent to the
-  new window.
-* `contentType` String - The `content-type` header used for the data. One of
-  `application/x-www-form-urlencoded` or `multipart/form-data`. Corresponds to
-  the `enctype` attribute of the submitted HTML form.
-* `boundary` String (optional) - The boundary used to separate multiple parts of
-  the message. Only valid when `contentType` is `multipart/form-data`.
-
-Note that keys starting with `--` are not currently supported. For example, this will errantly submit as `multipart/form-data` when `nativeWindowOpen` is set to `false` in webPreferences:
-
-```html
-<form
-  target="_blank"
-  method="POST"
-  enctype="application/x-www-form-urlencoded"
-  action="https://postman-echo.com/post"
->
-  <input type="text" name="--theKey">
-  <input type="submit">
-</form>
-```

docs/api/structures/post-data.md

@@ -1,21 +0,0 @@
-# PostData Object
-
-* `type` String - One of the following:
-  * `rawData` - The data is available as a `Buffer`, in the `rawData` field.
-  * `file` - The object represents a file. The `filePath`, `offset`, `length`
-    and `modificationTime` fields will be used to describe the file.
-  * `blob` - The object represents a `Blob`. The `blobUUID` field will be used
-    to describe the `Blob`.
-* `bytes` String (optional) - The raw bytes of the post data in a `Buffer`.
-  Required for the `rawData` type.
-* `filePath` String (optional) - The path of the file being uploaded. Required
-  for the `file` type.
-* `blobUUID` String (optional) - The `UUID` of the `Blob` being uploaded.
-  Required for the `blob` type.
-* `offset` Integer (optional) - The offset from the beginning of the file being
-  uploaded, in bytes. Only valid for `file` types.
-* `length` Integer (optional) - The length of the file being uploaded, in bytes.
-  If set to `-1`, the whole file will be uploaded. Only valid for `file` types.
-* `modificationTime` Double (optional) - The modification time of the file
-  represented by a double, which is the number of seconds since the `UNIX Epoch`
-  (Jan 1, 1970). Only valid for `file` types.

docs/api/structures/remove-client-certificate.md

@@ -0,0 +1,5 @@
+# RemoveClientCertificate Object
+
+* `type` String - `clientCertificate`.
+* `origin` String - Origin of the server whose associated client certificate
+  must be removed from the cache.

docs/api/structures/remove-password.md

@@ -0,0 +1,15 @@
+# RemovePassword Object
+
+* `type` String - `password`.
+* `origin` String (optional) - When provided, the authentication info
+  related to the origin will only be removed otherwise the entire cache
+  will be cleared.
+* `scheme` String (optional) - Scheme of the authentication.
+  Can be `basic`, `digest`, `ntlm`, `negotiate`. Must be provided if
+  removing by `origin`.
+* `realm` String (optional) - Realm of the authentication. Must be provided if
+  removing by `origin`.
+* `username` String (optional) - Credentials of the authentication. Must be
+  provided if removing by `origin`.
+* `password` String (optional) - Credentials of the authentication. Must be
+  provided if removing by `origin`.

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

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

docs/api/system-preferences.md

@@ -180,7 +180,7 @@ Some popular `key` and `type`s are:
 ### `systemPreferences.setUserDefault(key, type, value)` _macOS_
 
 * `key` String
-* `type` String - Can be `string`, `boolean`, `integer`, `float`, `double`, `url`, `array` or `dictionary`.
+* `type` String - See [`getUserDefault`](#systempreferencesgetuserdefaultkey-type-macos).
 * `value` String
 
 Set the value of `key` in `NSUserDefaults`.
@@ -326,7 +326,7 @@ This API is only available on macOS 10.14 Mojave or newer.
     * `window-frame-text` - The text in the window's titlebar area.
 
 Returns `String` - The system color setting in RGB hexadecimal form (`#ABCDEF`).
-See the [Windows docs][windows-colors] and the [macOS docs][macos-colors] for more details.
+See the [Windows docs][windows-colors] and the [MacOS docs][macos-colors] for more details.
 
 The following colors are only available on macOS 10.14: `find-highlight`, `selected-content-background`, `separator`, `unemphasized-selected-content-background`, `unemphasized-selected-text-background`, and `unemphasized-selected-text`.
 
@@ -360,7 +360,7 @@ Returns `Boolean` - `true` if an inverted color scheme (a high contrast color sc
 
 Returns `Boolean` - `true` if a high contrast theme is active, `false` otherwise.
 
-**Deprecated:** Should use the new [`nativeTheme.shouldUseHighContrastColors`](native-theme.md#nativethemeshouldusehighcontrastcolors-macos-windows-readonly) API.
+**Depreacted:** Should use the new [`nativeTheme.shouldUseHighContrastColors`](native-theme.md#nativethemeshouldusehighcontrastcolors-macos-windows-readonly) API.
 
 ### `systemPreferences.getEffectiveAppearance()` _macOS_
 
@@ -369,6 +369,16 @@ Returns `String` - Can be `dark`, `light` or `unknown`.
 Gets the macOS appearance setting that is currently applied to your application,
 maps to [NSApplication.effectiveAppearance](https://developer.apple.com/documentation/appkit/nsapplication/2967171-effectiveappearance?language=objc)
 
+Please note that until Electron is built targeting the 10.14 SDK, your application's
+`effectiveAppearance` will default to 'light' and won't inherit the OS preference. In
+the interim in order for your application to inherit the OS preference you must set the
+`NSRequiresAquaSystemAppearance` key in your apps `Info.plist` to `false`.  If you are
+using `electron-packager` or `electron-forge` just set the `enableDarwinDarkMode`
+packager option to `true`.  See the [Electron Packager API](https://github.com/electron/electron-packager/blob/master/docs/api.md#darwindarkmodesupport)
+for more details.
+
+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.getAppLevelAppearance()` _macOS_ _Deprecated_
 
 Returns `String` | `null` - Can be `dark`, `light` or `unknown`.
@@ -377,6 +387,8 @@ Gets the macOS appearance setting that you have declared you want for
 your application, maps to [NSApplication.appearance](https://developer.apple.com/documentation/appkit/nsapplication/2967170-appearance?language=objc).
 You can use the `setAppLevelAppearance` API to set this value.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.setAppLevelAppearance(appearance)` _macOS_ _Deprecated_
 
 * `appearance` String | null - Can be `dark` or `light`
@@ -384,6 +396,8 @@ You can use the `setAppLevelAppearance` API to set this value.
 Sets the appearance setting for your application, this should override the
 system default and override the value of `getEffectiveAppearance`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.canPromptTouchID()` _macOS_
 
 Returns `Boolean` - whether or not this device has the ability to use Touch ID.
@@ -464,3 +478,11 @@ A `String` property that can be `dark`, `light` or `unknown`.
 
 Returns the macOS appearance setting that is currently applied to your application,
 maps to [NSApplication.effectiveAppearance](https://developer.apple.com/documentation/appkit/nsapplication/2967171-effectiveappearance?language=objc)
+
+Please note that until Electron is built targeting the 10.14 SDK, your application's
+`effectiveAppearance` will default to 'light' and won't inherit the OS preference. In
+the interim in order for your application to inherit the OS preference you must set the
+`NSRequiresAquaSystemAppearance` key in your apps `Info.plist` to `false`.  If you are
+using `electron-packager` or `electron-forge` just set the `enableDarwinDarkMode`
+packager option to `true`.  See the [Electron Packager API](https://github.com/electron/electron-packager/blob/master/docs/api.md#darwindarkmodesupport)
+for more details.

docs/api/touch-bar-button.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarButton(options)`
+### `new TouchBarButton(options)` _Experimental_
 
 * `options` Object
   * `label` String (optional) - Button text.

docs/api/touch-bar-color-picker.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarColorPicker(options)`
+### `new TouchBarColorPicker(options)` _Experimental_
 
 * `options` Object
   * `availableColors` String[] (optional) - Array of hex color strings to

docs/api/touch-bar-group.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarGroup(options)`
+### `new TouchBarGroup(options)` _Experimental_
 
 * `options` Object
   * `items` [TouchBar](touch-bar.md) - Items to display as a group.

docs/api/touch-bar-label.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarLabel(options)`
+### `new TouchBarLabel(options)` _Experimental_
 
 * `options` Object
   * `label` String (optional) - Text to display.

docs/api/touch-bar-other-items-proxy.md

@@ -1,12 +0,0 @@
-## Class: TouchBarOtherItemsProxy
-
-> Instantiates a special "other items proxy", which nests TouchBar elements inherited
-> from Chromium at the space indicated by the proxy. By default, this proxy is added
-> to each TouchBar at the end of the input. For more information, see the AppKit docs on
-> [NSTouchBarItemIdentifierOtherItemsProxy](https://developer.apple.com/documentation/appkit/nstouchbaritemidentifierotheritemsproxy)
->
-> Note: Only one instance of this class can be added per TouchBar.
-
-Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
-
-### `new TouchBarOtherItemsProxy()`

docs/api/touch-bar-popover.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarPopover(options)`
+### `new TouchBarPopover(options)` _Experimental_
 
 * `options` Object
   * `label` String (optional) - Popover button text.

docs/api/touch-bar-scrubber.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarScrubber(options)`
+### `new TouchBarScrubber(options)` _Experimental_
 
 * `options` Object
   * `items` [ScrubberItem[]](structures/scrubber-item.md) - An array of items to place in this scrubber.

docs/api/touch-bar-segmented-control.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarSegmentedControl(options)`
+### `new TouchBarSegmentedControl(options)` _Experimental_
 
 * `options` Object
   * `segmentStyle` String (optional) - Style of the segments:

docs/api/touch-bar-slider.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarSlider(options)`
+### `new TouchBarSlider(options)` _Experimental_
 
 * `options` Object
   * `label` String (optional) - Label text.

docs/api/touch-bar-spacer.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBarSpacer(options)`
+### `new TouchBarSpacer(options)` _Experimental_
 
 * `options` Object
   * `size` String (optional) - Size of spacer, possible values are:

docs/api/touch-bar.md

@@ -4,7 +4,7 @@
 
 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
 
-### `new TouchBar(options)`
+### `new TouchBar(options)` _Experimental_
 
 * `options` Object
   * `items` ([TouchBarButton](touch-bar-button.md) | [TouchBarColorPicker](touch-bar-color-picker.md) | [TouchBarGroup](touch-bar-group.md) | [TouchBarLabel](touch-bar-label.md) | [TouchBarPopover](touch-bar-popover.md) | [TouchBarScrubber](touch-bar-scrubber.md) | [TouchBarSegmentedControl](touch-bar-segmented-control.md) | [TouchBarSlider](touch-bar-slider.md) | [TouchBarSpacer](touch-bar-spacer.md))[] (optional)
@@ -58,10 +58,6 @@ A [`typeof TouchBarSlider`](./touch-bar-slider.md) reference to the `TouchBarSli
 
 A [`typeof TouchBarSpacer`](./touch-bar-spacer.md) reference to the `TouchBarSpacer` class.
 
-#### `TouchBarOtherItemsProxy`
-
-A [`typeof TouchBarOtherItemsProxy`](./touch-bar-other-items-proxy.md) reference to the `TouchBarOtherItemsProxy` class.
-
 ### Instance Properties
 
 The following properties are available on instances of `TouchBar`:

docs/api/web-contents.md

@@ -150,10 +150,6 @@ Returns:
 * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
   passed to the new window. May or may not result in the `Referer` header being
   sent, depending on the referrer policy.
-* `postBody` [PostBody](structures/post-body.md) (optional) - The post data that
-  will be sent to the new window, along with the appropriate headers that will
-  be set. If no post data is to be sent, the value will be `null`. Only defined
-  when the window is being created by a form that set `target=_blank`.
 
 Emitted when the page requests to open a new window for a `url`. It could be
 requested by `window.open` or an external link like `<a target='_blank'>`.
@@ -166,7 +162,7 @@ new [`BrowserWindow`](browser-window.md). If you call `event.preventDefault()` a
 instance, failing to do so may result in unexpected behavior. For example:
 
 ```javascript
-myBrowserWindow.webContents.on('new-window', (event, url, frameName, disposition, options, additionalFeatures, referrer, postBody) => {
+myBrowserWindow.webContents.on('new-window', (event, url, frameName, disposition, options) => {
   event.preventDefault()
   const win = new BrowserWindow({
     webContents: options.webContents, // use existing webContents if provided
@@ -174,16 +170,7 @@ myBrowserWindow.webContents.on('new-window', (event, url, frameName, disposition
   })
   win.once('ready-to-show', () => win.show())
   if (!options.webContents) {
-    const loadOptions = {
-      httpReferrer: referrer
-    }
-    if (postBody != null) {
-      const { data, contentType, boundary } = postBody
-      loadOptions.postData = postBody.data
-      loadOptions.extraHeaders = `content-type: ${contentType}; boundary=${boundary}`
-    }
-
-    win.loadURL(url, loadOptions) // existing webContents will be navigated automatically
+    win.loadURL(url) // existing webContents will be navigated automatically
   }
   event.newGuest = win
 })
@@ -323,7 +310,7 @@ and allow the page to be unloaded.
 const { BrowserWindow, dialog } = require('electron')
 const win = new BrowserWindow({ width: 800, height: 600 })
 win.webContents.on('will-prevent-unload', (event) => {
-  const choice = dialog.showMessageBoxSync(win, {
+  const choice = dialog.showMessageBox(win, {
     type: 'question',
     buttons: ['Leave', 'Stay'],
     title: 'Do you want to leave this site?',
@@ -389,7 +376,7 @@ Calling `event.preventDefault` will prevent the page `keydown`/`keyup` events
 and the menu shortcuts.
 
 To only prevent the menu shortcuts, use
-[`setIgnoreMenuShortcuts`](#contentssetignoremenushortcutsignore):
+[`setIgnoreMenuShortcuts`](#contentssetignoremenushortcutsignore-experimental):
 
 ```javascript
 const { BrowserWindow } = require('electron')
@@ -980,10 +967,14 @@ Returns `Boolean` - Whether the renderer process has crashed.
 
 Overrides the user agent for this web page.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.getUserAgent()`
 
 Returns `String` - The user agent for this web page.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.insertCSS(css[, options])`
 
 * `css` String
@@ -1051,7 +1042,7 @@ 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)`
+#### `contents.setIgnoreMenuShortcuts(ignore)` _Experimental_
 
 * `ignore` Boolean
 
@@ -1063,27 +1054,33 @@ Ignore application menu shortcuts while this web contents is focused.
 
 Mute the audio on the current web page.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.isAudioMuted()`
 
 Returns `Boolean` - Whether this page has been muted.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.isCurrentlyAudible()`
 
 Returns `Boolean` - Whether audio is currently playing.
 
 #### `contents.setZoomFactor(factor)`
 
-* `factor` Double - Zoom factor; default is 1.0.
+* `factor` Number - Zoom factor.
 
 Changes the zoom factor to the specified factor. Zoom factor is
 zoom percent divided by 100, so 300% = 3.0.
 
-The factor must be greater than 0.0.
+**[Deprecated](modernization/property-updates.md)**
 
 #### `contents.getZoomFactor()`
 
 Returns `Number` - the current zoom factor.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.setZoomLevel(level)`
 
 * `level` Number - Zoom level.
@@ -1093,10 +1090,14 @@ increment above or below represents zooming 20% larger or smaller to default
 limits of 300% and 50% of original size, respectively. The formula for this is
 `scale := 1.2 ^ level`.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.getZoomLevel()`
 
 Returns `Number` - the current zoom level.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.setVisualZoomLevelLimits(minimumLevel, maximumLevel)`
 
 * `minimumLevel` Number
@@ -1285,7 +1286,7 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
   `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
 * `callback` Function (optional)
   * `success` Boolean - Indicates success of the print call.
-  * `failureReason` String - Error description called back if the print fails.
+  * `failureReason` String - Called back if the print fails; can be `cancelled` or `failed`.
 
 Prints window's web page. When `silent` is set to `true`, Electron will pick
 the system's default printer if `deviceName` is empty and the default settings for printing.
@@ -1592,32 +1593,6 @@ ipcMain.on('ping', (event) => {
 })
 ```
 
-#### `contents.postMessage(channel, message, [transfer])`
-
-* `channel` String
-* `message` any
-* `transfer` MessagePortMain[] (optional)
-
-Send a message to the renderer process, optionally transferring ownership of
-zero or more [`MessagePortMain`][] objects.
-
-The transferred `MessagePortMain` objects will be available in the renderer
-process by accessing the `ports` property of the emitted event. When they
-arrive in the renderer, they will be native DOM `MessagePort` objects.
-
-For example:
-```js
-// Main process
-const { port1, port2 } = new MessageChannelMain()
-webContents.postMessage('port', { message: 'hello' }, [port1])
-
-// Renderer process
-ipcRenderer.on('port', (e, msg) => {
-  const [port] = e.ports
-  // ...
-})
-```
-
 #### `contents.enableDeviceEmulation(parameters)`
 
 * `parameters` Object
@@ -1734,10 +1709,14 @@ Returns `Boolean` - If *offscreen rendering* is enabled returns whether it is cu
 If *offscreen rendering* is enabled sets the frame rate to the specified number.
 Only values between 1 and 60 are accepted.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.getFrameRate()`
 
 Returns `Integer` - If *offscreen rendering* is enabled returns the current frame rate.
 
+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.invalidate()`
 
 Schedules a full repaint of the window this web contents is in.
@@ -1843,7 +1822,7 @@ A [`WebContents`](web-contents.md) instance that might own this `WebContents`.
 
 #### `contents.devToolsWebContents` _Readonly_
 
-A `WebContents | null` property that represents the of DevTools `WebContents` associated with a given `WebContents`.
+A `WebContents` of DevTools for this `WebContents`.
 
 **Note:** Users should never store this object because it may become `null`
 when the DevTools has been closed.

docs/api/web-frame.md

@@ -22,13 +22,11 @@ The `WebFrame` class has the following instance methods:
 
 ### `webFrame.setZoomFactor(factor)`
 
-* `factor` Double - Zoom factor; default is 1.0.
+* `factor` Number - Zoom factor.
 
 Changes the zoom factor to the specified factor. Zoom factor is
 zoom percent divided by 100, so 300% = 3.0.
 
-The factor must be greater than 0.0.
-
 ### `webFrame.getZoomFactor()`
 
 Returns `Number` - The current zoom factor.
@@ -124,20 +122,13 @@ by its key, which is returned from `webFrame.insertCSS(css)`.
 
 Inserts `text` to the focused element.
 
-### `webFrame.executeJavaScript(code[, userGesture, callback])`
+### `webFrame.executeJavaScript(code[, userGesture])`
 
 * `code` String
 * `userGesture` Boolean (optional) - Default is `false`.
-* `callback` Function (optional) - Called after script has been executed. Unless
-  the frame is suspended (e.g. showing a modal alert), execution will be
-  synchronous and the callback will be invoked before the method returns. For
-  compatibility with an older version of this method, the error parameter is
-  second.
-  * `result` Any
-  * `error` Error
 
-Returns `Promise<any>` - A promise that resolves with the result of the executed
-code or is rejected if execution throws or results in a rejected promise.
+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.
 
 Evaluates `code` in page.
 
@@ -145,24 +136,14 @@ In the browser window some HTML APIs like `requestFullScreen` can only be
 invoked by a gesture from the user. Setting `userGesture` to `true` will remove
 this limitation.
 
-### `webFrame.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture, callback])`
+### `webFrame.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture])`
 
-* `worldId` Integer - The ID of the world to run the javascript
-            in, `0` is the default main world (where content runs), `999` is the
-            world used by Electron's `contextIsolation` feature. Accepts values
-            in the range 1..536870911.
+* `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electrons `contextIsolation` feature.  You can provide any integer here.
 * `scripts` [WebSource[]](structures/web-source.md)
 * `userGesture` Boolean (optional) - Default is `false`.
-* `callback` Function (optional) - Called after script has been executed. Unless
-  the frame is suspended (e.g. showing a modal alert), execution will be
-  synchronous and the callback will be invoked before the method returns.  For
-  compatibility with an older version of this method, the error parameter is
-  second.
-  * `result` Any
-  * `error` Error
 
-Returns `Promise<any>` - A promise that resolves with the result of the executed
-code or is rejected if execution throws or results in a rejected promise.
+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.
 

docs/breaking-changes.md

@@ -2,59 +2,13 @@
 
 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.
 
-### Types of Breaking Changes
+## `FIXME` comments
 
-This document uses the following convention to categorize breaking changes:
-
-- **API Changed:** An API was changed in such a way that code that has not been updated is guaranteed to throw an exception.
-- **Behavior Changed:** The behavior of Electron has changed, but not in such a way that an exception will necessarily be thrown.
-- **Default Changed:** Code depending on the old default may break, not necessarily throwing an exception. The old behavior can be restored by explicitly specifying the value.
-- **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
-- **Removed:** An API or feature was removed, and is no longer supported by Electron.
-
-## Planned Breaking API Changes (10.0)
-
-### Removed: Browser Window Affinity
-
-The `affinity` option when constructing a new `BrowserWindow` will be removed
-as part of our plan to more closely align with Chromium's process model for security,
-performance and maintainability.
-
-For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).
-
-### Default Changed: `enableRemoteModule` defaults to `false`
-
-In Electron 9, using the remote module without explicitly enabling it via the
-`enableRemoteModule` WebPreferences option began emitting a warning. In
-Electron 10, the remote module is now disabled by default. To use the remote
-module, `enableRemoteModule: true` must be specified in WebPreferences:
-
-```js
-const w = new BrowserWindow({
-  webPreferences: {
-    enableRemoteModule: true
-  }
-})
-```
-
-We [recommend moving away from the remote
-module](https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31).
+The `FIXME` string is used in code comments to denote things that should be fixed for future releases. See https://github.com/electron/electron/search?q=fixme
 
 ## Planned Breaking API Changes (9.0)
 
-### Default Changed: Loading non-context-aware native modules in the renderer process is disabled by default
-
-As of Electron 9 we do not allow loading of non-context-aware native modules in
-the renderer process.  This is to improve security, performance and maintainability
-of Electron as a project.
-
-If this impacts you, you can temporarily set `app.allowRendererProcessReuse` to `false`
-to revert to the old behavior.  This flag will only be an option until Electron 11 so
-you should plan to update your native modules to be context aware.
-
-For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).
-
-### Removed: `<webview>.getWebContents()`
+### `<webview>.getWebContents()`
 
 This API, which was deprecated in Electron 8.0, is now removed.
 
@@ -66,7 +20,7 @@ const { remote } = require('electron')
 remote.webContents.fromId(webview.getWebContentsId())
 ```
 
-### Removed: `webFrame.setLayoutZoomLevelLimits()`
+### `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
@@ -74,7 +28,7 @@ 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).
 
-### Behavior Changed: Sending non-JS objects over IPC now throws an exception
+### 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
@@ -90,14 +44,9 @@ 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.
 
-### API Changed: `shell.openItem` is now `shell.openPath`
-
-The `shell.openItem` API has been replaced with an asynchronous `shell.openPath` API.
-You can see the original API proposal and reasoning [here](https://github.com/electron/governance/blob/master/wg-api/spec-documents/shell-openitem.md).
-
 ## Planned Breaking API Changes (8.0)
 
-### Behavior Changed: Values sent over IPC are now serialized with Structured Clone Algorithm
+### Values sent over IPC are now serialized with Structured Clone Algorithm
 
 The algorithm used to serialize objects sent over IPC (through
 `ipcRenderer.send`, `ipcRenderer.sendSync`, `WebContents.send` and related
@@ -148,7 +97,7 @@ these kinds of objects will throw a 'could not be cloned' error.
 
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
 
-### Deprecated: `<webview>.getWebContents()`
+### `<webview>.getWebContents()`
 
 This API is implemented using the `remote` module, which has both performance
 and security implications. Therefore its usage should be explicit.
@@ -189,7 +138,7 @@ const { ipcRenderer } = require('electron')
 ipcRenderer.invoke('openDevTools', webview.getWebContentsId())
 ```
 
-### Deprecated: `webFrame.setLayoutZoomLevelLimits()`
+### `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
@@ -199,7 +148,7 @@ limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
 
 ## Planned Breaking API Changes (7.0)
 
-### Deprecated: Atom.io Node Headers URL
+### Node Headers URL
 
 This is the URL specified as `disturl` in a `.npmrc` file or as the `--dist-url`
 command line flag when building native Node modules.  Both will be supported for
@@ -209,7 +158,7 @@ Deprecated: https://atom.io/download/electron
 
 Replace with: https://electronjs.org/headers
 
-### API Changed: `session.clearAuthCache()` no longer accepts options
+### `session.clearAuthCache(options)`
 
 The `session.clearAuthCache` API no longer accepts options for what to clear, and instead unconditionally clears the whole cache.
 
@@ -220,25 +169,25 @@ session.clearAuthCache({ type: 'password' })
 session.clearAuthCache()
 ```
 
-### API Changed: `powerMonitor.querySystemIdleState` is now `powerMonitor.getSystemIdleState`
+### `powerMonitor.querySystemIdleState`
 
 ```js
 // Removed in Electron 7.0
 powerMonitor.querySystemIdleState(threshold, callback)
 // Replace with synchronous API
-const idleState = powerMonitor.getSystemIdleState(threshold)
+const idleState = getSystemIdleState(threshold)
 ```
 
-### API Changed: `powerMonitor.querySystemIdleTime` is now `powerMonitor.getSystemIdleState`
+### `powerMonitor.querySystemIdleTime`
 
 ```js
 // Removed in Electron 7.0
 powerMonitor.querySystemIdleTime(callback)
 // Replace with synchronous API
-const idleTime = powerMonitor.getSystemIdleTime()
+const idleTime = getSystemIdleTime()
 ```
 
-### API Changed: `webFrame.setIsolatedWorldInfo` replaces separate methods
+### webFrame Isolated World APIs
 
 ```js
 // Removed in Electron 7.0
@@ -255,11 +204,11 @@ webFrame.setIsolatedWorldInfo(
   })
 ```
 
-### Removed: `marked` property on `getBlinkMemoryInfo`
+### Removal of deprecated `marked` property on getBlinkMemoryInfo
 
 This property was removed in Chromium 77, and as such is no longer available.
 
-### Behavior Changed: `webkitdirectory` attribute for `<input type="file"/>` now lists directory contents
+### `webkitdirectory` attribute for `<input type="file"/>`
 
 The `webkitdirectory` property on HTML file inputs allows them to select folders.
 Previous versions of Electron had an incorrect implementation where the `event.target.files`
@@ -292,10 +241,9 @@ In Electron 7, this now returns a `FileList` with a `File` object for:
 Note that `webkitdirectory` no longer exposes the path to the selected folder.
 If you require the path to the selected folder rather than the folder contents,
 see the `dialog.showOpenDialog` API ([link](https://github.com/electron/electron/blob/master/docs/api/dialog.md#dialogshowopendialogbrowserwindow-options)).
-
 ## Planned Breaking API Changes (6.0)
 
-### API Changed: `win.setMenu(null)` is now `win.removeMenu()`
+### `win.setMenu(null)`
 
 ```js
 // Deprecated
@@ -304,7 +252,7 @@ win.setMenu(null)
 win.removeMenu()
 ```
 
-### API Changed: `contentTracing.getTraceBufferUsage()` is now a promise
+### `contentTracing.getTraceBufferUsage()`
 
 ```js
 // Deprecated
@@ -317,7 +265,7 @@ contentTracing.getTraceBufferUsage().then(infoObject => {
 })
 ```
 
-### API Changed: `electron.screen` in the renderer process should be accessed via `remote`
+### `electron.screen` in renderer process
 
 ```js
 // Deprecated
@@ -326,7 +274,7 @@ require('electron').screen
 require('electron').remote.screen
 ```
 
-### API Changed: `require()`ing node builtins in sandboxed renderers no longer implicitly loads the `remote` version
+### `require` in sandboxed renderers
 
 ```js
 // Deprecated
@@ -350,25 +298,25 @@ require('path')
 require('electron').remote.require('path')
 ```
 
-### Deprecated: `powerMonitor.querySystemIdleState` replaced with `powerMonitor.getSystemIdleState`
+### `powerMonitor.querySystemIdleState`
 
 ```js
 // Deprecated
 powerMonitor.querySystemIdleState(threshold, callback)
 // Replace with synchronous API
-const idleState = powerMonitor.getSystemIdleState(threshold)
+const idleState = getSystemIdleState(threshold)
 ```
 
-### Deprecated: `powerMonitor.querySystemIdleTime` replaced with `powerMonitor.getSystemIdleTime`
+### `powerMonitor.querySystemIdleTime`
 
 ```js
 // Deprecated
 powerMonitor.querySystemIdleTime(callback)
 // Replace with synchronous API
-const idleTime = powerMonitor.getSystemIdleTime()
+const idleTime = getSystemIdleTime()
 ```
 
-### Deprecated: `app.enableMixedSandbox()` is no longer needed
+### `app.enableMixedSandbox`
 
 ```js
 // Deprecated
@@ -377,7 +325,7 @@ app.enableMixedSandbox()
 
 Mixed-sandbox mode is now enabled by default.
 
-### Deprecated: `Tray.setHighlightMode`
+### `Tray`
 
 Under macOS Catalina our former Tray implementation breaks.
 Apple's native substitute doesn't support changing the highlighting behavior.
@@ -390,7 +338,7 @@ tray.setHighlightMode(mode)
 
 ## Planned Breaking API Changes (5.0)
 
-### Default Changed: `nodeIntegration` and `webviewTag` default to false, `contextIsolation` defaults to true
+### `new BrowserWindow({ webPreferences })`
 
 The following `webPreferences` option default values are deprecated in favor of the new defaults listed below.
 
@@ -410,16 +358,16 @@ const w = new BrowserWindow({
 })
 ```
 
-### Behavior Changed: `nodeIntegration` in child windows opened via `nativeWindowOpen`
+### `nativeWindowOpen`
 
-Child windows opened with the `nativeWindowOpen` option will always have Node.js integration disabled, unless `nodeIntegrationInSubFrames` is `true`.
+Child windows opened with the `nativeWindowOpen` option will always have Node.js integration disabled, unless `nodeIntegrationInSubFrames` is `true.
 
-### API Changed: Registering privileged schemes must now be done before app ready
+### Privileged Schemes Registration
 
-Renderer process APIs `webFrame.registerURLSchemeAsPrivileged` and `webFrame.registerURLSchemeAsBypassingCSP` as well as browser process API `protocol.registerStandardSchemes` have been removed.
+Renderer process APIs `webFrame.setRegisterURLSchemeAsPrivileged` and `webFrame.registerURLSchemeAsBypassingCSP` as well as browser process API `protocol.registerStandardSchemes` have been removed.
 A new API, `protocol.registerSchemesAsPrivileged` has been added and should be used for registering custom schemes with the required privileges. Custom schemes are required to be registered before app ready.
 
-### Deprecated: `webFrame.setIsolatedWorld*` replaced with `webFrame.setIsolatedWorldInfo`
+### webFrame Isolated World APIs
 
 ```js
 // Deprecated
@@ -436,7 +384,7 @@ webFrame.setIsolatedWorldInfo(
   })
 ```
 
-### API Changed: `webFrame.setSpellCheckProvider` now takes an asynchronous callback
+## `webFrame.setSpellCheckProvider`
 The `spellCheck` callback is now asynchronous, and `autoCorrectWord` parameter has been removed.
 ```js
 // Deprecated

docs/development/atom-shell-vs-node-webkit.md

@@ -0,0 +1,52 @@
+# Technical Differences Between Electron and NW.js (formerly node-webkit)
+
+__Note: Electron was previously named Atom Shell.__
+
+Like NW.js, Electron provides a platform to write desktop applications
+with JavaScript and HTML and has Node integration to grant access to the low
+level system from web pages.
+
+But there are also fundamental differences between the two projects that make
+Electron a completely separate product from NW.js:
+
+__1. Entry of Application__
+
+In NW.js the main entry point of an application is a web page or a JS script. You specify a
+html or js file in the `package.json` and it is opened in a browser window as
+the application's main window (in case of an html entrypoint) or the script is executed.
+
+In Electron, the entry point is a JavaScript script. Instead of
+providing a URL directly, you manually create a browser window and load
+an HTML file using the API. You also need to listen to window events
+to decide when to quit the application.
+
+Electron works more like the Node.js runtime. Electron's APIs are lower level
+so you can use it for browser testing in place of [PhantomJS](http://phantomjs.org/).
+
+__2. Build System__
+
+In order to avoid the complexity of building all of Chromium, Electron uses [`libchromiumcontent`](https://github.com/electron/libchromiumcontent) to access
+Chromium's Content API. `libchromiumcontent` is a single shared library that
+includes the Chromium Content module and all of its dependencies. Users don't
+need a powerful machine to build Electron.
+
+__3. Node Integration__
+
+In NW.js, the Node integration in web pages requires patching Chromium to
+work, while in Electron we chose a different way to integrate the libuv loop
+with each platform's message loop to avoid hacking Chromium. See the
+[`node_bindings`][node-bindings] code for how that was done.
+
+__4. Multi-context__
+
+If you are an experienced NW.js user, you should be familiar with the
+concept of Node context and web context. These concepts were invented because
+of how NW.js was implemented.
+
+By using the [multi-context](https://github.com/nodejs/node-v0.x-archive/commit/756b622)
+feature of Node, Electron doesn't introduce a new JavaScript context in web
+pages.
+
+Note: NW.js has optionally supported multi-context since 0.13.
+
+[node-bindings]: https://github.com/electron/electron/tree/master/atom/common

docs/development/build-instructions-linux.md

@@ -25,7 +25,7 @@ Follow the guidelines below for building Electron on Linux.
   Doing so permits installing Node on your own home directory as a standard user.
   Or try repositories such as [NodeSource](https://nodesource.com/blog/nodejs-v012-iojs-and-the-nodesource-linux-repositories).
 * [clang](https://clang.llvm.org/get_started.html) 3.4 or later.
-* Development headers of GTK 3 and libnotify.
+* Development headers of GTK+ and libnotify.
 
 On Ubuntu, install the following libraries:
 

docs/development/build-instructions-macos.md

@@ -42,7 +42,7 @@ $ pip install pyobjc
 If you're developing Electron and don't plan to redistribute your
 custom Electron build, you may skip this section.
 
-Official Electron builds are built with [Xcode 9.4.1](http://adcdownload.apple.com/Developer_Tools/Xcode_9.4.1/Xcode_9.4.1.xip), and the macOS 10.13 SDK.  Building with a newer SDK works too, but the releases currently use the 10.13 SDK.
+Official Electron builds are built with [Xcode 9.4.1](http://adcdownload.apple.com/Developer_Tools/Xcode_9.4.1/Xcode_9.4.1.xip), and the MacOS 10.13 SDK.  Building with a newer SDK works too, but the releases currently use the 10.13 SDK.
 
 ## Building Electron
 

docs/development/debug-instructions-windows.md

@@ -48,7 +48,7 @@ still set breakpoints - Visual Studio will automatically figure out that the
 source code matches the code running in the attached process and break
 accordingly.
 
-Relevant code files can be found in `./shell/`.
+Relevant code files can be found in `./atom/`.
 
 ### Attaching
 

docs/development/debugging-instructions-macos.md

@@ -20,7 +20,7 @@ you prefer a graphical interface.
   tail calls, and other compiler optimizations.
 
 * **Xcode**: In addition to Xcode, also install the Xcode command line tools.
-  They include LLDB, the default debugger in Xcode on macOS. It supports
+  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.
@@ -46,7 +46,7 @@ this basic introduction, let's assume that you're calling a command from JavaScr
 that isn't behaving correctly - so you'd like to break on that command's C++
 counterpart inside the Electron source.
 
-Relevant code files can be found in `./shell/`.
+Relevant code files can be found in `./atom/`.
 
 Let's assume that you want to debug `app.setName()`, which is defined in `browser.cc`
 as `Browser::SetName()`. Set the breakpoint using the `breakpoint` command, specifying

docs/development/electron-vs-nwjs.md

@@ -1,75 +0,0 @@
-# Technical Differences Between Electron and NW.js
-
-Like [NW.js][nwjs], Electron provides a platform to write desktop applications with web
-technologies. Both platforms enable developers to utilize HTML, JavaScript, and
-Node.js. On the surface, they seem very similar.
-
-There are however fundamental differences between the two projects that make
-Electron a completely separate product from NW.js.
-
-## 1) Entry of Application
-
-In NW.js, the main entry point of an application can be an HTML web page. In
-that case, NW.js will open the given entry point in a browser window.
-
-In Electron, the entry point is always a JavaScript script. Instead of providing a
-URL directly, you manually create a browser window and load an HTML file using
-the API. You also need to listen to window events to decide when to quit the
-application.
-
-Electron works more like the Node.js runtime. Electron's APIs are lower level so
-you can use it for browser testing in place of
-[PhantomJS](http://phantomjs.org/).
-
-## 2) Node Integration
-
-In NW.js, the Node integration in web pages requires patching Chromium to work,
-while in Electron we chose a different way to integrate the `libuv` loop with
-each platform's message loop to avoid hacking Chromium. See the
-[`node_bindings`][node-bindings] code for how that was done.
-
-## 3) JavaScript Contexts
-
-If you are an experienced NW.js user, you should be familiar with the concept of
-Node context and web context. These concepts were invented because of how NW.js
-was implemented.
-
-By using the
-[multi-context](https://github.com/nodejs/node-v0.x-archive/commit/756b622)
-feature of Node, Electron doesn't introduce a new JavaScript context in web
-pages.
-
-Note: NW.js has optionally supported multi-context since 0.13.
-
-## 4) Legacy Support
-
-NW.js still offers a "legacy release" that supports Windows XP. It doesn't
-receive security updates.
-
-Given that hardware manufacturers, Microsoft, Chromium, and Node.js haven't
-released even critical security updates for that system, we have to warn you
-that using Windows XP is wildly insecure and outright irresponsible.
-
-However, we understand that requirements outside our wildest imagination may
-exist, so if you're looking for something like Electron that runs on Windows XP,
-the NW.js legacy release might be the right fit for you.
-
-## 5) Features
-
-There are numerous differences in the amount of supported features. Electron has
-a bigger community, more production apps using it, and [a large amount of
-userland modules available on npm][electron-modules].
-
-As an example, Electron has built-in support for automatic updates and countless
-tools that make the creation of installers easier. As an example in favor of
-NW.js, NW.js supports more `Chrome.*` APIs for the development of Chrome Apps.
-
-Naturally, we believe that Electron is the better platform for polished
-production applications built with web technologies (like Visual Studio Code,
-Slack, or Facebook Messenger); however, we want to be fair to our web technology
-friends. If you have feature needs that Electron does not meet, you might want
-to try NW.js.
-
-[nwjs]: https://nwjs.io/
-[electron-modules]: https://www.npmjs.com/search?q=electron
-[node-bindings]: https://github.com/electron/electron/tree/master/lib/common

docs/development/goma.md

@@ -5,37 +5,50 @@
 
 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.  There is also a `cache-only` Goma endpoint that will be
-used by default if you do not have credentials.  Requests to the cache-only
-Goma will not hit our cluster, but will read from our cache and should result
-in significantly faster build times.
+on authentication.
 
 ## Enabling Goma
 
-Currently the only supported way to use Goma is to use our [Build Tools](https://github.com/electron/build-tools).
-Goma configuration is automatically included when you set up `build-tools`.
+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`.
 
-If you are a maintainer and have access to our cluster, please ensure that you run
-`e init` with `--goma=cluster` in order to configure `build-tools` to use
-the Goma cluster.  If you have an existing config, you can just set `"goma": "cluster"`
-in your config file.
+```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 **200** on Windows or Linux and
-**50** on macOS. We monitor Goma system usage, and users found to be abusing
+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
 ```
 
-If you're using `build-tools`, appropriate `-j` values will automatically
-be used for you.
-
 ## Monitoring Goma
 
 If you access [http://localhost:8088](http://localhost:8088) on your local
@@ -43,16 +56,8 @@ machine you can monitor compile jobs as they flow through the goma system.
 
 ## Access
 
-For security and cost reasons, access to Electron's Goma cluster is currently restricted
+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.
-
-## Uptime / Support
-
-We have automated monitoring of our Goma cluster and cache at https://status.notgoma.com
-
-We do not provide support for usage of Goma and any issues raised asking for help / having
-issues will _probably_ be closed without much reason, we do not have the capacity to handle
-that kind of support.

docs/development/pull-requests.md

@@ -35,7 +35,7 @@ $ git fetch upstream
 
 Build steps and dependencies differ slightly depending on your operating system.
 See these detailed guides on building Electron locally:
-* [Building on macOS](https://electronjs.org/docs/development/build-instructions-macos)
+* [Building on MacOS](https://electronjs.org/docs/development/build-instructions-macos)
 * [Building on Linux](https://electronjs.org/docs/development/build-instructions-linux)
 * [Building on Windows](https://electronjs.org/docs/development/build-instructions-windows)
 
@@ -55,7 +55,7 @@ $ git checkout -b my-branch -t upstream/master
 ### Step 4: Code
 
 Most pull requests opened against the `electron/electron` repository include
-changes to either the C/C++ code in the `shell/` folder,
+changes to either the C/C++ code in the `atom/` folder,
 the JavaScript code in the `lib/` folder, the documentation in `docs/api/`
 or tests in the `spec/` folder.
 

docs/development/testing.md

@@ -32,12 +32,6 @@ by coding style rules. `npm run lint-py` will check all Python, using
 
 ## Unit Tests
 
-If you are not using [build-tools](https://github.com/electron/build-tools),
-ensure that that name you have configured for your
-local build of Electron is one of `Testing`, `Release`, `Default`, `Debug`, or
-you have set `process.env.ELECTRON_OUT_DIR`. Without these set, Electron will fail
-to perform some pre-testing steps.
-
 To run all unit tests, run `npm run test`. The unit tests are an Electron
 app (surprise!) that can be found in the `spec` folder. Note that it has
 its own `package.json` and that its dependencies are therefore not defined

docs/experimental.md

@@ -1,23 +0,0 @@
-# Experimental APIs
-
-Some of Electrons APIs are tagged with `_Experimental_` in the documentation.
-This tag indicates that the API may not be considered stable and the API may
-be removed or modified more frequently than other APIs with less warning.
-
-## Conditions for an API to be tagged as Experimental
-
-Anyone can request an API be tagged as experimental in a feature PR, disagreements
-on the experimental nature of a feature can be discussed in the API WG if they
-can't be resolved in the PR.
-
-## Process for removing the Experimental tag
-
-Once an API has been stable and in at least two major stable release lines it
-can be nominated to have its experimental tag removed.  This discussion should
-happen at an API WG meeting.  Things to consider when discussing / nominating:
-
-* The above "two major stables release lines" condition must have been met
-* During that time no major bugs / issues should have been caused by the adoption of this feature
-* The API is stable enough and hasn't been heavily impacted by Chromium upgrades
-* Is anyone using the API?
-* Is the API fulfilling the original proposed usecases, does it have any gaps?

docs/faq.md

@@ -139,7 +139,32 @@ When using Electron's built-in module you might encounter an error like this:
 Uncaught TypeError: Cannot read property 'setZoomLevel' of undefined
 ```
 
-It is very likely you are using the module in the wrong process. For example
+This is because you have the [npm `electron` module][electron-module] installed
+either locally or globally, which overrides Electron's built-in module.
+
+To verify whether you are using the correct built-in module, you can print the
+path of the `electron` module:
+
+```javascript
+console.log(require.resolve('electron'))
+```
+
+and then check if it is in the following form:
+
+```sh
+"/path/to/Electron.app/Contents/Resources/atom.asar/renderer/api/lib/exports/electron.js"
+```
+
+If it is something like `node_modules/electron/index.js`, then you have to
+either remove the npm `electron` module, or rename it.
+
+```sh
+npm uninstall electron
+npm uninstall -g electron
+```
+
+However if you are using the built-in module but still getting this error, it
+is very likely you are using the module in the wrong process. For example
 `electron.app` can only be used in the main process, while `electron.webFrame`
 is only available in renderer processes.
 

docs/fiddles/menus/customize-menus/index.html

@@ -21,7 +21,7 @@
 
       <p>
         Open the
-        <a href="https://electronjs.org/docs/api/menu"
+        <a href="http://electron.atom.io/docs/api/menu"
           >full API documentation<span
             >(opens in new window)</span
           ></a
@@ -111,7 +111,7 @@
           <p>
             See the full
             <a
-              href="https://electronjs.org/docs/api/web-contents/#event-context-menu"
+              href="http://electron.atom.io/docs/api/web-contents/#event-context-menu"
               >context-menu event documentation</a
             >
             for all the available properties.

docs/fiddles/menus/customize-menus/main.js

@@ -159,7 +159,7 @@ const template = [
       {
         label: 'Learn More',
         click: () => {
-          shell.openExternal('https://electronjs.org')
+          shell.openExternal('http://electron.atom.io')
         }
       }
     ]
@@ -324,7 +324,7 @@ app.whenReady().then(() => {
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
+  // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
   const reopenMenuItem = findReopenMenuItem()
   if (reopenMenuItem) reopenMenuItem.enabled = true
@@ -335,7 +335,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-  // On macOS it is common to re-create a window in the app when the
+  // 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()

docs/fiddles/menus/shortcuts/index.html

@@ -21,10 +21,10 @@
 
 		<p>
 			Open the full documentation for the
-			<a href="https://electronjs.org/docs/api/menu">Menu</a>,
-			<a href="https://electronjs.org/docs/api/accelerator">Accelerator</a>,
+			<a href="http://electron.atom.io/docs/api/menu">Menu</a>,
+			<a href="http://electron.atom.io/docs/api/accelerator">Accelerator</a>,
 			and
-			<a href="https://electronjs.org/docs/api/global-shortcut">globalShortcut</a>
+			<a href="http://electron.atom.io/docs/api/global-shortcut">globalShortcut</a>
 			APIs in your browser.
 		</p>
 

docs/fiddles/menus/shortcuts/main.js

@@ -46,7 +46,7 @@ app.whenReady().then(createWindow)
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
+  // 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()
@@ -54,7 +54,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-  // On macOS it is common to re-create a window in the app when the
+  // 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()

docs/fiddles/native-ui/dialogs/error-dialog/index.html

@@ -23,7 +23,7 @@
 
       <p>
         Open the
-        <a href="https://electronjs.org/docs/api/dialog/">
+        <a href="http://electron.atom.io/docs/api/dialog/">
           full API documentation (opens in new window)
           </a>
         in your browser.

docs/fiddles/native-ui/dialogs/error-dialog/main.js

@@ -37,7 +37,7 @@ app.whenReady().then(createWindow)
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
+  // 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()
@@ -45,7 +45,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-  // On macOS it is common to re-create a window in the app when the
+  // 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()

docs/fiddles/native-ui/dialogs/information-dialog/index.html

@@ -23,7 +23,7 @@
 
       <p>
         Open the
-        <a href="https://electronjs.org/docs/api/dialog/">
+        <a href="http://electron.atom.io/docs/api/dialog/">
           full API documentation (opens in new window)
         </a>
         in your browser.

docs/fiddles/native-ui/dialogs/information-dialog/main.js

@@ -37,7 +37,7 @@ app.whenReady().then(createWindow)
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
+  // 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()
@@ -45,7 +45,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-  // On macOS it is common to re-create a window in the app when the
+  // 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()

docs/fiddles/native-ui/dialogs/open-file-or-directory/index.html

@@ -23,7 +23,7 @@
 
       <p>
         Open the
-        <a href="https://electronjs.org/docs/api/dialog/">
+        <a href="http://electron.atom.io/docs/api/dialog/">
           full API documentation (opens in new window)
         </a>
         in your browser.

docs/fiddles/native-ui/dialogs/open-file-or-directory/main.js

@@ -37,7 +37,7 @@ app.whenReady().then(createWindow)
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
+  // 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()
@@ -45,7 +45,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-  // On macOS it is common to re-create a window in the app when the
+  // 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()

docs/fiddles/native-ui/dialogs/save-dialog/index.html

@@ -23,7 +23,7 @@
 
       <p>
         Open the
-        <a href="https://electronjs.org/docs/api/dialog/">
+        <a href="http://electron.atom.io/docs/api/dialog/">
           full API documentation (opens in new window)
         </a>
         in your browser.

docs/fiddles/native-ui/dialogs/save-dialog/main.js

@@ -37,7 +37,7 @@ app.whenReady().then(createWindow)
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
+  // 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()
@@ -45,7 +45,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-  // On macOS it is common to re-create a window in the app when the
+  // 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()

docs/fiddles/native-ui/drag-and-drop/main.js

@@ -36,7 +36,7 @@ app.whenReady().then(createWindow)
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
+  // 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()
@@ -44,7 +44,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-  // On macOS it is common to re-create a window in the app when the
+  // 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()

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

@@ -27,7 +27,7 @@
                 const { shell } = require('electron')
                 const exLinksBtn = document.getElementById('open-ex-links')
                 exLinksBtn.addEventListener('click', (event) => {
-                shell.openExternal('https://electronjs.org')
+                shell.openExternal('http://electron.atom.io')
                 }) 
             </code></pre>
 

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

@@ -3,7 +3,7 @@ const { shell } = require('electron')
 const exLinksBtn = document.getElementById('open-ex-links')
 
 exLinksBtn.addEventListener('click', (event) => {
-  shell.openExternal('https://electronjs.org')
+  shell.openExternal('http://electron.atom.io')
 })
 
 const OpenAllOutboundLinks = () => {

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

@@ -17,7 +17,7 @@
       <p>This module works in both the main and renderer process.</p>
       <p>
         Open the
-        <a href="https://electronjs.org/docs/api/shell">
+        <a href="http://electron.atom.io/docs/api/shell">
           full API documentation (opens in new window)
         </a>
         in your browser.