Bump v8.0.0-nightly.20191028

* build: fix doc only change when there isn't a PR

Fixes issue where CI was mistakenly marking a PR as a doc only change because the CI was kicked off before the PR was created.

.circleci/config.yml

@@ -65,22 +65,18 @@ machine-linux-2xlarge: &machine-linux-2xlarge
 
 machine-mac: &machine-mac
   macos:
-    xcode: "11.1.0"
+    xcode: "9.4.1"
 
 machine-mac-large: &machine-mac-large
   resource_class: large
   macos:
-    xcode: "11.1.0"
+    xcode: "9.4.1"
 
 # Build configurations options.
 env-debug-build: &env-debug-build
   GN_CONFIG: //electron/build/args/debug.gn
   SKIP_DIST_ZIP: '1'
 
-env-mac-debug-build: &env-mac-debug-build
-  # Set symbol level to 1 so that debug builds do not run out of disk space
-  GN_BUILDFLAG_ARGS: 'symbol_level = 1'  
-
 env-testing-build: &env-testing-build
   GN_CONFIG: //electron/build/args/testing.gn
   CHECK_DIST_MANIFEST: '1'
@@ -89,7 +85,6 @@ env-release-build: &env-release-build
   GN_CONFIG: //electron/build/args/release.gn
   STRIP_BINARIES: true
   GENERATE_SYMBOLS: true
-  CHECK_DIST_MANIFEST: '1'
 
 env-headless-testing: &env-headless-testing
   DISPLAY: ':99.0'
@@ -136,31 +131,22 @@ env-enable-sccache: &env-enable-sccache
 env-send-slack-notifications: &env-send-slack-notifications
   NOTIFY_SLACK: true
 
-env-global: &env-global
-  ELECTRON_OUT_DIR: Default
-
 env-linux-medium: &env-linux-medium
-  <<: *env-global
   NUMBER_OF_NINJA_PROCESSES: 3
 
 env-linux-2xlarge: &env-linux-2xlarge
-  <<: *env-global
   NUMBER_OF_NINJA_PROCESSES: 34
 
 env-linux-2xlarge-release: &env-linux-2xlarge-release
-  <<: *env-global
   NUMBER_OF_NINJA_PROCESSES: 16
 
 env-machine-mac: &env-machine-mac
-  <<: *env-global
   NUMBER_OF_NINJA_PROCESSES: 6
 
 env-mac-large: &env-mac-large
-  <<: *env-global
   NUMBER_OF_NINJA_PROCESSES: 18
 
 env-mac-large-release: &env-mac-large-release
-  <<: *env-global
   NUMBER_OF_NINJA_PROCESSES: 8
 
 env-ninja-status: &env-ninja-status
@@ -169,10 +155,6 @@ env-ninja-status: &env-ninja-status
 env-disable-run-as-node: &env-disable-run-as-node
   GN_BUILDFLAG_ARGS: 'enable_run_as_node = false'
 
-env-32bit-release: &env-32bit-release
-  # Set symbol level to 1 for 32 bit releases because of https://crbug.com/648948
-  GN_BUILDFLAG_ARGS: 'symbol_level = 1'
-
 # Individual (shared) steps.
 step-maybe-notify-slack-failure: &step-maybe-notify-slack-failure
   run:
@@ -264,21 +246,14 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
     command: |
       if [ "`uname`" == "Darwin" ]; then
         sudo rm -rf /Library/Developer/CoreSimulator
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
       fi
 
 step-delete-git-directories: &step-delete-git-directories
   run:
-    name: Delete all .git directories under src on MacOS to free space
+    name: Delete src/.git directory on MacOS to free space
     command: |
       if [ "`uname`" == "Darwin" ]; then
-        cd src
-        ( find . -type d -name ".git" ) | xargs rm -rf
+        sudo rm -rf src/.git
       fi
 
 # On macOS the yarn install command during gclient sync was run on a linux
@@ -344,8 +319,6 @@ step-gn-check: &step-gn-check
       gn check out/Default //electron:electron_app
       gn check out/Default //electron:manifests
       gn check out/Default //electron/shell/common/api:mojo
-      # Check the hunspell filenames
-      node electron/script/gen-hunspell-filenames.js --check
 
 step-electron-build: &step-electron-build
   run:
@@ -367,18 +340,9 @@ step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
   run:
     name: Strip electron binaries
     command: |
-      if [ "$STRIP_BINARIES" == "true" ] && [ "`uname`" == "Linux" ]; then
-        if [ x"$TARGET_ARCH" == x ]; then
-          target_cpu=x64
-        elif [ "$TARGET_ARCH" == "ia32" ]; then
-          target_cpu=x86
-        else
-          target_cpu="$TARGET_ARCH"
-        fi
+      if [ "$STRIP_BINARIES" == "true" ] && [ "`uname`" != "Darwin" ]; then
         cd src
-        electron/script/copy-debug-symbols.py --target-cpu="$target_cpu" --out-dir=out/Default/debug --compress
-        electron/script/strip-binaries.py --target-cpu="$target_cpu"
-        electron/script/add-debug-link.py --target-cpu="$target_cpu" --debug-dir=out/Default/debug
+        electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH"
       fi
 
 step-electron-dist-build: &step-electron-dist-build
@@ -423,9 +387,7 @@ step-electron-chromedriver-build: &step-electron-chromedriver-build
     command: |
       cd src
       ninja -C out/Default chrome/test/chromedriver -j $NUMBER_OF_NINJA_PROCESSES
-      if [ "`uname`" == "Linux" ]; then
-        electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH" --file $PWD/out/Default/chromedriver
-      fi
+      electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH" --file $PWD/out/Default/chromedriver
       ninja -C out/Default electron:electron_chromedriver_zip
 
 step-electron-chromedriver-store: &step-electron-chromedriver-store
@@ -454,9 +416,6 @@ step-electron-publish: &step-electron-publish
   run:
     name: Publish Electron Dist
     command: |
-      if [ "`uname`" == "Darwin" ]; then
-        rm -rf src/out/Default/obj
-      fi
       cd src/electron
       if [ "$UPLOAD_TO_S3" == "1" ]; then
         echo 'Uploading Electron release distribution to S3'
@@ -557,7 +516,6 @@ step-mksnapshot-build: &step-mksnapshot-build
     name: mksnapshot build
     command: |
       cd src
-      ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
       if [ "`uname`" != "Darwin" ]; then
         if [ "$TARGET_ARCH" == "arm" ]; then
           electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
@@ -565,7 +523,6 @@ step-mksnapshot-build: &step-mksnapshot-build
           electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/mksnapshot
         else
           electron/script/strip-binaries.py --file $PWD/out/Default/mksnapshot
-          electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
         fi
       fi
       if [ "$SKIP_DIST_ZIP" != "1" ]; then
@@ -577,20 +534,6 @@ step-mksnapshot-store: &step-mksnapshot-store
     path: src/out/Default/mksnapshot.zip
     destination: mksnapshot.zip
 
-step-hunspell-build: &step-hunspell-build
-  run:
-    name: hunspell build
-    command: |
-      cd src
-      if [ "$SKIP_DIST_ZIP" != "1" ]; then
-        ninja -C out/Default electron:hunspell_dictionaries_zip -j $NUMBER_OF_NINJA_PROCESSES
-      fi
-
-step-hunspell-store: &step-hunspell-store
-  store_artifacts:
-    path: src/out/Default/hunspell_dictionaries.zip
-    destination: hunspell_dictionaries.zip
-
 step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
   run:
     name: Generate breakpad symbols
@@ -750,6 +693,7 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
       rm -rf src/ios
       rm -rf src/third_party/blink/web_tests
       rm -rf src/third_party/blink/perf_tests
+      rm -rf src/third_party/hunspell_dictionaries
       rm -rf src/third_party/WebKit/LayoutTests
 
 # Save the src cache based on the deps hash
@@ -767,7 +711,7 @@ step-check-for-doc-only-change: &step-check-for-doc-only-change
     command: |
       cd src/electron
       node script/yarn install --frozen-lockfile
-      if node script/doc-only-change.js --prNumber=$CIRCLE_PR_NUMBER --prURL=$CIRCLE_PULL_REQUEST --prBranch=$CIRCLE_BRANCH; then
+      if node script/doc-only-change.js --prNumber=$CIRCLE_PR_NUMBER --prURL=$CIRCLE_PULL_REQUEST; then
         #PR is doc only change; save file with value true to indicate doc only change
         echo "true" > .skip-ci-build
       else
@@ -803,7 +747,7 @@ step-ts-compile: &step-ts-compile
     command: |
       cd src
       ninja -C out/Default electron:default_app_js -j $NUMBER_OF_NINJA_PROCESSES
-      ninja -C out/Default electron:electron_js2c -j $NUMBER_OF_NINJA_PROCESSES
+      ninja -C out/Default electron:atom_js2c -j $NUMBER_OF_NINJA_PROCESSES
 
 # Lists of steps.
 steps-lint: &steps-lint
@@ -937,8 +881,8 @@ steps-electron-build: &steps-electron-build
     - *step-get-more-space-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync-on-mac
-    - *step-delete-git-directories
     - *step-gn-gen-default
+    - *step-delete-git-directories
 
     # Electron app
     - *step-electron-build
@@ -968,10 +912,6 @@ steps-electron-build: &steps-electron-build
     - *step-ffmpeg-build
     - *step-ffmpeg-store
 
-    # hunspell
-    - *step-hunspell-build
-    - *step-hunspell-store
-
     # Save all data needed for a further tests run.
     - *step-persist-data-for-tests
 
@@ -1019,8 +959,8 @@ steps-electron-build-with-inline-checkout-for-tests: &steps-electron-build-with-
     - *step-get-more-space-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync-on-mac
-    - *step-delete-git-directories
     - *step-gn-gen-default
+    - *step-delete-git-directories
 
     # Electron app
     - *step-electron-build
@@ -1050,10 +990,6 @@ steps-electron-build-with-inline-checkout-for-tests: &steps-electron-build-with-
     - *step-ffmpeg-build
     - *step-ffmpeg-store
 
-    # hunspell
-    - *step-hunspell-build
-    - *step-hunspell-store
-
     # Save all data needed for a further tests run.
     - *step-persist-data-for-tests
 
@@ -1114,9 +1050,8 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-get-more-space-on-mac
     - *step-gclient-sync
     - *step-setup-env-for-build
-    - *step-delete-git-directories
-    - *step-minimize-workspace-size-from-checkout
     - *step-gn-gen-default
+    - *step-delete-git-directories
 
     # Electron app
     - *step-electron-build
@@ -1144,10 +1079,6 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-ffmpeg-build
     - *step-ffmpeg-store
 
-    # hunspell
-    - *step-hunspell-build
-    - *step-hunspell-store
-
     # typescript defs
     - *step-maybe-generate-typescript-defs
 
@@ -1246,6 +1177,7 @@ steps-tests: &steps-tests
           ELECTRON_DISABLE_SECURITY_WARNINGS: 1
         command: |
           cd src
+          export ELECTRON_OUT_DIR=Default
           (cd electron && node script/yarn test -- --ci --enable-logging)
     - run:
         name: Check test results existence
@@ -1279,6 +1211,7 @@ steps-test-nan: &steps-test-nan
         name: Run Nan Tests
         command: |
           cd src
+          export ELECTRON_OUT_DIR=Default
           node electron/script/nan-spec-runner.js
 
 steps-test-node: &steps-test-node
@@ -1294,7 +1227,8 @@ steps-test-node: &steps-test-node
         name: Run Node Tests
         command: |
           cd src
-          node electron/script/node-spec-runner.js --default --jUnitDir=junit
+          export ELECTRON_OUT_DIR=Default
+          node electron/script/node-spec-runner.js junit
     - store_test_results:
         path: src/junit
 
@@ -1486,7 +1420,6 @@ jobs:
       <<: *env-ia32
       <<: *env-release-build
       <<: *env-enable-sccache
-      <<: *env-32bit-release
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
 
@@ -1541,7 +1474,6 @@ jobs:
       <<: *env-arm
       <<: *env-release-build
       <<: *env-enable-sccache
-      <<: *env-32bit-release
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
@@ -1631,7 +1563,6 @@ jobs:
     environment:
       <<: *env-mac-large
       <<: *env-debug-build
-      <<: *env-mac-debug-build
       <<: *env-enable-sccache
       <<: *env-ninja-status
     <<: *steps-electron-build
@@ -1694,7 +1625,6 @@ jobs:
       <<: *env-mac-large
       <<: *env-mas
       <<: *env-debug-build
-      <<: *env-mac-debug-build
       <<: *env-enable-sccache
       <<: *env-ninja-status
     <<: *steps-electron-build
@@ -2104,6 +2034,14 @@ workflows:
           requires:
             - mac-checkout-fast
 
+      - osx-debug:
+          requires:
+            - mac-checkout-fast
+
+      - osx-debug-gn-check:
+          requires:
+            - mac-checkout-fast
+
       - osx-testing-gn-check:
           requires:
             - mac-checkout-fast
@@ -2116,6 +2054,14 @@ workflows:
           requires:
             - mac-checkout-fast
 
+      - mas-debug:
+          requires:
+            - mac-checkout-fast
+
+      - mas-debug-gn-check:
+          requires:
+            - mac-checkout-fast
+
       - mas-testing-gn-check:
           requires:
             - mac-checkout-fast

BUILD.gn

@@ -1,7 +1,6 @@
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
-import("//components/spellcheck/spellcheck_build_features.gni")
 import("//content/public/app/mac_helpers.gni")
 import("//pdf/features.gni")
 import("//printing/buildflags/buildflags.gni")
@@ -22,7 +21,6 @@ import("buildflags/buildflags.gni")
 import("electron_paks.gni")
 import("filenames.auto.gni")
 import("filenames.gni")
-import("filenames.hunspell.gni")
 
 if (is_mac) {
   import("//build/config/mac/rules.gni")
@@ -149,7 +147,7 @@ webpack_build("electron_content_script_bundle") {
   out_file = "$target_gen_dir/js2c/content_script_bundle.js"
 }
 
-copy("electron_js2c_copy") {
+copy("atom_js2c_copy") {
   sources = [
     "lib/common/asar.js",
     "lib/common/asar_init.js",
@@ -159,12 +157,12 @@ copy("electron_js2c_copy") {
   ]
 }
 
-action("electron_js2c") {
+action("atom_js2c") {
   deps = [
+    ":atom_js2c_copy",
     ":electron_browser_bundle",
     ":electron_content_script_bundle",
     ":electron_isolated_renderer_bundle",
-    ":electron_js2c_copy",
     ":electron_renderer_bundle",
     ":electron_sandboxed_renderer_bundle",
     ":electron_worker_bundle",
@@ -186,7 +184,7 @@ action("electron_js2c") {
 
   inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
   outputs = [
-    "$root_gen_dir/electron_natives.cc",
+    "$root_gen_dir/atom_natives.cc",
   ]
 
   script = "tools/js2c.py"
@@ -347,13 +345,12 @@ source_set("electron_lib") {
   ]
 
   deps = [
-    ":electron_js2c",
+    ":atom_js2c",
     ":electron_version_header",
     ":manifests",
     ":resources",
     "buildflags",
     "chromium_src:chrome",
-    "chromium_src:chrome_spellchecker",
     "native_mate",
     "shell/common/api:mojo",
     "//base:base_static",
@@ -361,13 +358,12 @@ source_set("electron_lib") {
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/services/printing/public/mojom",
     "//components/certificate_transparency",
-    "//components/language/core/browser",
     "//components/net_log",
-    "//components/network_hints/browser",
-    "//components/network_hints/common:mojo_bindings",
+    "//components/network_hints/common",
     "//components/network_hints/renderer",
     "//components/network_session_configurator/common",
     "//components/prefs",
+    "//components/spellcheck/renderer",
     "//components/viz/host",
     "//components/viz/service",
     "//content/public/browser",
@@ -383,10 +379,12 @@ source_set("electron_lib") {
     "//media/mojo/mojom",
     "//net:extras",
     "//net:net_resources",
+    "//net:net_with_v8",
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/shared_impl",
     "//printing/buildflags",
+    "//services/audio/public/mojom:constants",
     "//services/device/public/cpp/geolocation",
     "//services/device/public/mojom",
     "//services/proxy_resolver:lib",
@@ -398,7 +396,7 @@ source_set("electron_lib") {
     "//third_party/electron_node:node_lib",
     "//third_party/leveldatabase",
     "//third_party/libyuv",
-    "//third_party/webrtc_overrides:webrtc_component",
+    "//third_party/webrtc_overrides:init_webrtc",
     "//third_party/widevine/cdm:headers",
     "//ui/base/idle",
     "//ui/events:dom_keycode_converter",
@@ -504,7 +502,7 @@ source_set("electron_lib") {
       "shell/browser/ui/views/autofill_popup_view.h",
     ]
     if (is_mas_build) {
-      sources += [ "shell/browser/api/electron_api_app_mas.mm" ]
+      sources += [ "shell/browser/api/atom_api_app_mas.mm" ]
       sources -= [
         "shell/browser/auto_updater_mac.mm",
         "shell/common/crash_reporter/crash_reporter_mac.h",
@@ -548,10 +546,6 @@ source_set("electron_lib") {
     ]
 
     sources += filenames.lib_sources_nss
-    sources += [
-      "shell/browser/ui/gtk_util.cc",
-      "shell/browser/ui/gtk_util.h",
-    ]
   }
   if (is_win) {
     libs += [ "dwmapi.lib" ]
@@ -627,27 +621,27 @@ source_set("electron_lib") {
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
     sources += [
-      "shell/browser/api/electron_api_desktop_capturer.cc",
-      "shell/browser/api/electron_api_desktop_capturer.h",
+      "shell/browser/api/atom_api_desktop_capturer.cc",
+      "shell/browser/api/atom_api_desktop_capturer.h",
     ]
   }
 
   if (enable_view_api) {
     sources += [
-      "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",
+      "shell/browser/api/views/atom_api_box_layout.cc",
+      "shell/browser/api/views/atom_api_box_layout.h",
+      "shell/browser/api/views/atom_api_button.cc",
+      "shell/browser/api/views/atom_api_button.h",
+      "shell/browser/api/views/atom_api_label_button.cc",
+      "shell/browser/api/views/atom_api_label_button.h",
+      "shell/browser/api/views/atom_api_layout_manager.cc",
+      "shell/browser/api/views/atom_api_layout_manager.h",
+      "shell/browser/api/views/atom_api_md_text_button.cc",
+      "shell/browser/api/views/atom_api_md_text_button.h",
+      "shell/browser/api/views/atom_api_resize_area.cc",
+      "shell/browser/api/views/atom_api_resize_area.h",
+      "shell/browser/api/views/atom_api_text_field.cc",
+      "shell/browser/api/views/atom_api_text_field.h",
     ]
   }
 
@@ -711,6 +705,7 @@ if (is_mac) {
       public_deps += [ "//third_party/icu:icudata" ]
     }
     if (v8_use_external_startup_data) {
+      sources += [ "$root_out_dir/natives_blob.bin" ]
       public_deps += [ "//v8" ]
       if (use_v8_context_snapshot) {
         sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
@@ -862,7 +857,7 @@ if (is_mac) {
       }
       defines = [ "HELPER_EXECUTABLE" ]
       sources = filenames.app_sources
-      sources += [ "shell/common/electron_constants.cc" ]
+      sources += [ "shell/common/atom_constants.cc" ]
       include_dirs = [ "." ]
       info_plist = "shell/renderer/resources/mac/Info.plist"
       extra_substitutions =
@@ -983,7 +978,7 @@ if (is_mac) {
   mac_app_bundle("electron_app") {
     output_name = electron_product_name
     sources = filenames.app_sources
-    sources += [ "shell/common/electron_constants.cc" ]
+    sources += [ "shell/common/atom_constants.cc" ]
     include_dirs = [ "." ]
     deps = [
       ":electron_app_framework_bundle_data",
@@ -1270,14 +1265,9 @@ template("dist_zip") {
                              "outputs",
                              "testonly",
                            ])
-    flatten = false
-    if (defined(invoker.flatten)) {
-      flatten = invoker.flatten
-    }
     args = rebase_path(outputs + [ _runtime_deps_file ], root_build_dir) + [
              target_cpu,
              target_os,
-             "$flatten",
            ]
   }
 }
@@ -1352,41 +1342,17 @@ dist_zip("electron_chromedriver_zip") {
   ]
 }
 
-mksnapshot_deps = [
-  ":licenses",
-  "//tools/v8_context_snapshot:v8_context_snapshot_generator",
-  "//v8:mksnapshot($v8_snapshot_toolchain)",
-]
-
-group("electron_mksnapshot") {
-  public_deps = mksnapshot_deps
-}
-
 dist_zip("electron_mksnapshot_zip") {
-  data_deps = mksnapshot_deps
+  data_deps = [
+    "//v8:mksnapshot($v8_snapshot_toolchain)",
+    "//tools/v8_context_snapshot:v8_context_snapshot_generator",
+    ":licenses",
+  ]
   outputs = [
     "$root_build_dir/mksnapshot.zip",
   ]
 }
 
-copy("hunspell_dictionaries") {
-  sources = hunspell_dictionaries + hunspell_licenses
-  outputs = [
-    "$target_gen_dir/electron_hunspell/{{source_file_part}}",
-  ]
-}
-
-dist_zip("hunspell_dictionaries_zip") {
-  data_deps = [
-    ":hunspell_dictionaries",
-  ]
-  flatten = true
-
-  outputs = [
-    "$root_build_dir/hunspell_dictionaries.zip",
-  ]
-}
-
 group("electron") {
   public_deps = [
     ":electron_app",

DEPS

@@ -11,7 +11,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '80.0.3987.137',
+    'c3a0220e7bde049d599a8332b9b2785b0178be74',
   'node_version':
     'v12.13.0',
   'nan_version':
@@ -114,7 +114,7 @@ hooks = [
     'pattern': 'src/electron/script/update-external-binaries.py',
     'condition': 'download_external_binaries',
     'action': [
-      'python3',
+      'python',
       'src/electron/script/update-external-binaries.py',
     ],
   },

ELECTRON_VERSION

@@ -1 +1 @@
-8.1.0
+8.0.0-nightly.20191028

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: libcc-20
-image: vs2019-16.3-10.0.18362
+image: vs2017-15.9-10.0.18362
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -76,10 +76,10 @@ build_script:
       --unmanaged
       %GCLIENT_EXTRA_ARGS%
       "https://github.com/electron/electron"
-  - gclient sync --with_branch_heads --with_tags --ignore_locks --break_repo_locks
+  - gclient sync --with_branch_heads --with_tags --reset
   - cd src
   - ps: $env:BUILD_CONFIG_PATH="//electron/build/args/%GN_CONFIG%.gn"
-  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS% cc_wrapper=\"%SCCACHE_PATH%\""
+  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS%"
   - gn check out/Default //electron:electron_lib
   - gn check out/Default //electron:electron_app
   - gn check out/Default //electron:manifests
@@ -91,10 +91,8 @@ build_script:
   - ninja -C out/Default electron:electron_dist_zip
   - ninja -C out/Default shell_browser_ui_unittests
   - ninja -C out/Default electron:electron_mksnapshot_zip
-  - ninja -C out/Default electron:hunspell_dictionaries_zip
   - ninja -C out/Default electron:electron_chromedriver_zip
   - ninja -C out/Default third_party/electron_node:headers
-  - cmd /C %SCCACHE_PATH% --show-stats
   - appveyor PushArtifact out/Default/dist.zip
   - appveyor PushArtifact out/Default/shell_browser_ui_unittests.exe
   - appveyor PushArtifact out/Default/chromedriver.zip
@@ -102,7 +100,6 @@ build_script:
   - 7z a node_headers.zip out\Default\gen\node_headers
   - appveyor PushArtifact node_headers.zip
   - appveyor PushArtifact out/Default/mksnapshot.zip
-  - appveyor PushArtifact out/Default/hunspell_dictionaries.zip
   - appveyor PushArtifact out/Default/electron.lib
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {

build/args/all.gn

@@ -1,4 +1,5 @@
 is_electron_build = true
+use_jumbo_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
@@ -8,12 +9,6 @@ v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
 v8_embedder_string = "-electron.0"
 
-# TODO: this breaks native modules. See e.g. https://www.github.com/nodejs/node/pull/30463
-# We can probably enable this as long as we make sure node native modules
-# also build with the relevant #defines (V8_COMPRESS_POINTERS etc.)
-v8_enable_pointer_compression = false
-v8_enable_31bit_smis_on_64bit_arch = false
-
 # TODO: this breaks mksnapshot
 v8_enable_snapshot_native_code_counters = false
 
@@ -23,9 +18,12 @@ ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
-dawn_enable_vulkan_validation_layers = false
 
 is_cfi = false
 
+# TODO: Remove this and update CI to contain 10.14 SDK once
+# crbug.com/986701 is fixed.
+mac_sdk_min = "10.13"
+
 # TODO: disabled due to crashes. re-enable.
 enable_osr = false

build/args/native_tests.gn

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

build/rules.gni

@@ -1,50 +1,9 @@
 import("//build/config/mac/mac_sdk.gni")
 
-# Template to compile .xib and .storyboard files.
-# (copied from src/build/config/ios/rules.gni)
-#
-# Arguments
-#
-#     sources:
-#         list of string, sources to compile
-#
-#     ibtool_flags:
-#         (optional) list of string, additional flags to pass to the ibtool
-template("compile_ib_files") {
-  action_foreach(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "testonly",
-                             "visibility",
-                           ])
-    assert(defined(invoker.sources),
-           "sources must be specified for $target_name")
-    assert(defined(invoker.output_extension),
-           "output_extension must be specified for $target_name")
-
-    ibtool_flags = []
-    if (defined(invoker.ibtool_flags)) {
-      ibtool_flags = invoker.ibtool_flags
-    }
-
-    _output_extension = invoker.output_extension
-
-    script = "//build/config/ios/compile_ib_files.py"
-    sources = invoker.sources
-    outputs = [
-      "$target_gen_dir/$target_name/{{source_name_part}}.$_output_extension",
-    ]
-    args = [
-      "--input",
-      "{{source}}",
-      "--output",
-      rebase_path(
-          "$target_gen_dir/$target_name/{{source_name_part}}.$_output_extension",
-          root_build_dir),
-    ]
-    args += ibtool_flags
-  }
-}
+# This is imported from /ios becuase this functionality was moved
+# after Chromium stopped using xib files for macOS menu functionality
+# See https://chromium-review.googlesource.com/c/chromium/src/+/1648695
+import("//build/config/ios/rules.gni")
 
 # Template is copied here from Chromium but was removed in
 # https://chromium-review.googlesource.com/c/chromium/src/+/1637981

build/webpack/webpack.config.base.js

@@ -74,10 +74,7 @@ module.exports = ({
           global: ['@electron/internal/renderer/webpack-provider', '_global'],
           Buffer: ['@electron/internal/renderer/webpack-provider', 'Buffer'],
         })
-      ] : []),
-      new webpack.ProvidePlugin({
-        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise'],
-      }),
+      ] : [])
     ]
   })
-}
+}

build/zip.py

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

buildflags/BUILD.gn

@@ -19,7 +19,6 @@ buildflag_header("buildflags") {
     "ENABLE_TTS=$enable_tts",
     "ENABLE_COLOR_CHOOSER=$enable_color_chooser",
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
-    "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
     "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]

buildflags/buildflags.gni

@@ -33,7 +33,4 @@ declare_args() {
 
   # Enable Chrome extensions support.
   enable_electron_extensions = false
-
-  # Enable Spellchecker support
-  enable_builtin_spellchecker = true
 }

chromium_src/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//components/spellcheck/spellcheck_build_features.gni")
 import("//electron/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//third_party/widevine/cdm/widevine.gni")
@@ -32,8 +31,6 @@ static_library("chrome") {
     "//chrome/browser/icon_loader_win.cc",
     "//chrome/browser/icon_manager.cc",
     "//chrome/browser/icon_manager.h",
-    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
     "//chrome/browser/net/proxy_config_monitor.cc",
@@ -42,8 +39,6 @@ static_library("chrome") {
     "//chrome/browser/net/proxy_service_factory.h",
     "//chrome/browser/predictors/preconnect_manager.cc",
     "//chrome/browser/predictors/preconnect_manager.h",
-    "//chrome/browser/predictors/predictors_features.cc",
-    "//chrome/browser/predictors/predictors_features.h",
     "//chrome/browser/predictors/proxy_lookup_client_impl.cc",
     "//chrome/browser/predictors/proxy_lookup_client_impl.h",
     "//chrome/browser/predictors/resolve_host_client_impl.cc",
@@ -230,58 +225,3 @@ static_library("chrome") {
     ]
   }
 }
-
-# This source set is just so we don't have to depend on all of //chrome/browser
-# You may have to add new files here during the upgrade if //chrome/browser/spellchecker
-# gets more files
-source_set("chrome_spellchecker") {
-  sources = []
-  deps = []
-  libs = []
-
-  if (enable_builtin_spellchecker) {
-    sources += [
-      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
-      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
-      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
-      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_factory.cc",
-      "//chrome/browser/spellchecker/spellcheck_factory.h",
-      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
-      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
-      "//chrome/browser/spellchecker/spellcheck_service.cc",
-      "//chrome/browser/spellchecker/spellcheck_service.h",
-    ]
-
-    if (has_spellcheck_panel) {
-      sources += [
-        "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
-        "//chrome/browser/spellchecker/spell_check_panel_host_impl.h",
-      ]
-    }
-
-    if (use_browser_spellchecker) {
-      sources += [
-        "//chrome/browser/spellchecker/spelling_request.cc",
-        "//chrome/browser/spellchecker/spelling_request.h",
-      ]
-    }
-
-    deps += [
-      "//base:base_static",
-      "//components/language/core/browser",
-      "//components/spellcheck:buildflags",
-      "//components/sync",
-    ]
-  }
-
-  public_deps = [
-    "//components/spellcheck/browser",
-    "//components/spellcheck/common",
-    "//components/spellcheck/renderer",
-  ]
-}

chromium_src/chrome/browser/certificate_manager_model.cc

@@ -37,8 +37,10 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
     // public and private slot.
     // Redirect any slot usage to this persistent slot on Linux.
     g_nss_cert_database = new net::NSSCertDatabase(
-        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* public slot */,
-        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* private slot */);
+        crypto::ScopedPK11Slot(
+            crypto::GetPersistentNSSKeySlot()) /* public slot */,
+        crypto::ScopedPK11Slot(
+            crypto::GetPersistentNSSKeySlot()) /* private slot */);
   }
   return g_nss_cert_database;
 }

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -56,7 +56,7 @@
 #include <stddef.h>
 
 #include "shell/browser/browser.h"
-#include "shell/common/electron_command_line.h"
+#include "shell/common/atom_command_line.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ -826,7 +826,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
     return PROCESS_NONE;
   to_send.append(current_dir.value());
 
-  const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
+  const std::vector<std::string>& argv = electron::AtomCommandLine::argv();
   for (std::vector<std::string>::const_iterator it = argv.begin();
        it != argv.end(); ++it) {
     to_send.push_back(kTokenDelimiter);

default_app/default_app.ts

@@ -3,8 +3,6 @@ import * as path from 'path'
 
 let mainWindow: BrowserWindow | null = null
 
-app.allowRendererProcessReuse = true
-
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   app.quit()

docs/README.md

@@ -39,6 +39,7 @@ an issue:
   * [Using Electron's APIs](tutorial/application-architecture.md#using-electron-apis)
   * [Using Node.js APIs](tutorial/application-architecture.md#using-nodejs-apis)
   * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
+  * [Performance Strategies](tutorial/performance.md)
 * Adding Features to Your App
   * [Notifications](tutorial/notifications.md)
   * [Recent Documents](tutorial/recent-documents.md)

docs/api/app.md

@@ -314,8 +314,10 @@ Returns:
 
 * `event` Event
 * `webContents` [WebContents](web-contents.md)
-* `authenticationResponseDetails` Object
+* `request` Object
+  * `method` String
   * `url` URL
+  * `referrer` URL
 * `authInfo` Object
   * `isProxy` Boolean
   * `scheme` String
@@ -323,8 +325,8 @@ Returns:
   * `port` Integer
   * `realm` String
 * `callback` Function
-  * `username` String (optional)
-  * `password` String (optional)
+  * `username` String
+  * `password` String
 
 Emitted when `webContents` wants to do basic auth.
 
@@ -335,16 +337,12 @@ should prevent the default behavior with `event.preventDefault()` and call
 ```javascript
 const { app } = require('electron')
 
-app.on('login', (event, webContents, details, authInfo, callback) => {
+app.on('login', (event, webContents, request, authInfo, callback) => {
   event.preventDefault()
   callback('username', 'secret')
 })
 ```
 
-If `callback` is called without a username or password, the authentication
-request will be cancelled and the authentication error will be returned to the
-page.
-
 ### Event: 'gpu-info-update'
 
 Emitted whenever there is a GPU info update.
@@ -713,34 +711,34 @@ Clears the recent documents list.
 
 ### `app.setAsDefaultProtocolClient(protocol[, path, args])`
 
-* `protocol` String - The name of your protocol, without `://`. For example,
-  if you want your app to handle `electron://` links, call this method with
-  `electron` as the parameter.
-* `path` String (optional) _Windows_ - The path to the Electron executable.
-  Defaults to `process.execPath`
-* `args` String[] (optional) _Windows_ - Arguments passed to the executable.
-  Defaults to an empty array
+* `protocol` String - The name of your protocol, without `://`. If you want your
+  app to handle `electron://` links, call this method with `electron` as the
+  parameter.
+* `path` String (optional) _Windows_ - Defaults to `process.execPath`
+* `args` String[] (optional) _Windows_ - Defaults to an empty array
 
 Returns `Boolean` - Whether the call succeeded.
 
-Sets the current executable as the default handler for a protocol (aka URI
-scheme). It allows you to integrate your app deeper into the operating system.
-Once registered, all links with `your-protocol://` will be opened with the
-current executable. The whole link, including protocol, will be passed to your
-application as a parameter.
+This method sets the current executable as the default handler for a protocol
+(aka URI scheme). It allows you to integrate your app deeper into the operating
+system. Once registered, all links with `your-protocol://` will be opened with
+the current executable. The whole link, including protocol, will be passed to
+your application as a parameter.
+
+On Windows, you can provide optional parameters path, the path to your executable,
+and args, an array of arguments to be passed to your executable when it launches.
 
 **Note:** On macOS, you can only register protocols that have been added to
-your app's `info.plist`, which cannot be modified at runtime. However, you can
-change the file during build time via [Electron Forge][electron-forge],
-[Electron Packager][electron-packager], or by editing `info.plist` with a text
-editor. Please refer to [Apple's documentation][CFBundleURLTypes] for details.
+your app's `info.plist`, which can not be modified at runtime. You can however
+change the file with a simple text editor or script during build time.
+Please refer to [Apple's documentation][CFBundleURLTypes] for details.
 
 **Note:** In a Windows Store environment (when packaged as an `appx`) this API
 will return `true` for all calls but the registry key it sets won't be accessible
 by other applications.  In order to register your Windows Store application
 as a default protocol handler you must [declare the protocol in your manifest](https://docs.microsoft.com/en-us/uwp/schemas/appxpackage/uapmanifestschema/element-uap-protocol).
 
-The API uses the Windows Registry and `LSSetDefaultHandlerForURLScheme` internally.
+The API uses the Windows Registry and LSSetDefaultHandlerForURLScheme internally.
 
 ### `app.removeAsDefaultProtocolClient(protocol[, path, args])` _macOS_ _Windows_
 
@@ -759,8 +757,10 @@ protocol (aka URI scheme). If so, it will remove the app as the default handler.
 * `path` String (optional) _Windows_ - Defaults to `process.execPath`
 * `args` String[] (optional) _Windows_ - Defaults to an empty array
 
-Returns `Boolean` - Whether the current executable is the default handler for a
-protocol (aka URI scheme).
+Returns `Boolean`
+
+This method checks if the current executable is the default handler for a protocol
+(aka URI scheme). If so, it will return true. Otherwise, it will return false.
 
 **Note:** On macOS, you can use this method to check if the app has been
 registered as the default protocol handler for a protocol. You can also verify
@@ -768,22 +768,7 @@ this by checking `~/Library/Preferences/com.apple.LaunchServices.plist` on the
 macOS machine. Please refer to
 [Apple's documentation][LSCopyDefaultHandlerForURLScheme] for details.
 
-The API uses the Windows Registry and `LSCopyDefaultHandlerForURLScheme` internally.
-
-### `app.getApplicationNameForProtocol(url)`
-
-* `url` String - a URL with the protocol name to check. Unlike the other
-  methods in this family, this accepts an entire URL, including `://` at a
-  minimum (e.g. `https://`).
-
-Returns `String` - Name of the application handling the protocol, or an empty
-  string if there is no handler. For instance, if Electron is the default
-  handler of the URL, this could be `Electron` on Windows and Mac. However,
-  don't rely on the precise format which is not guaranteed to remain unchanged.
-  Expect a different format on Linux, possibly with a `.desktop` suffix.
-
-This method returns the application name of the default handler for the protocol
-(aka URI scheme) of a URL.
+The API uses the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.
 
 ### `app.setUserTasks(tasks)` _Windows_
 
@@ -1201,9 +1186,8 @@ 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.
-
-If you do not set `credits` but still wish to surface them in your app, AppKit will look for a file named "Credits.html", "Credits.rtf", and "Credits.rtfd", in that order, in the bundle returned by the NSBundle class method main. The first file found is used, and if none is found, the info area is left blank. See Apple [documentation](https://developer.apple.com/documentation/appkit/nsaboutpaneloptioncredits?language=objc) for more information.
+Set the about panel options. This will override the values defined in the app's
+`.plist` file on MacOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
 
 ### `app.isEmojiPanelSupported()`
 
@@ -1324,8 +1308,6 @@ A `Boolean` property that returns  `true` if the app is packaged, `false` otherw
 [dock-menu]:https://developer.apple.com/macos/human-interface-guidelines/menus/dock-menus/
 [tasks]:https://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#tasks
 [app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
-[electron-forge]: https://www.electronforge.io/
-[electron-packager]: https://github.com/electron/electron-packager
 [CFBundleURLTypes]: https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/TP40009249-102207-TPXREF115
 [LSCopyDefaultHandlerForURLScheme]: https://developer.apple.com/library/mac/documentation/Carbon/Reference/LaunchServicesReference/#//apple_ref/c/func/LSCopyDefaultHandlerForURLScheme
 [handoff]: https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/Handoff/HandoffFundamentals/HandoffFundamentals.html

docs/api/breaking-changes.md

@@ -59,55 +59,6 @@ these kinds of objects will throw a 'could not be cloned' error.
 
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
 
-### `<webview>.getWebContents()`
-
-This API is implemented using the `remote` module, which has both performance
-and security implications. Therefore its usage should be explicit.
-
-```js
-// Deprecated
-webview.getWebContents()
-// Replace with
-const { remote } = require('electron')
-remote.webContents.fromId(webview.getWebContentsId())
-```
-
-However, it is recommended to avoid using the `remote` module altogether.
-
-```js
-// main
-const { ipcMain, webContents } = require('electron')
-
-const getGuestForWebContents = function (webContentsId, contents) {
-  const guest = webContents.fromId(webContentsId)
-  if (!guest) {
-    throw new Error(`Invalid webContentsId: ${webContentsId}`)
-  }
-  if (guest.hostWebContents !== contents) {
-    throw new Error(`Access denied to webContents`)
-  }
-  return guest
-}
-
-ipcMain.handle('openDevTools', (event, webContentsId) => {
-  const guest = getGuestForWebContents(webContentsId, event.sender)
-  guest.openDevTools()
-})
-
-// renderer
-const { ipcRenderer } = require('electron')
-
-ipcRenderer.invoke('openDevTools', webview.getWebContentsId())
-```
-
-### `webFrame.setLayoutZoomLevelLimits()`
-
-Chromium has removed support for changing the layout zoom level limits, and it
-is beyond Electron's capacity to maintain it. The function will emit a warning
-in Electron 8.x, and cease to exist in Electron 9.x. The layout zoom level
-limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
-[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
-
 ## Planned Breaking API Changes (7.0)
 
 ### Node Headers URL
@@ -152,7 +103,7 @@ const idleTime = getSystemIdleTime()
 ### webFrame Isolated World APIs
 
 ```js
-// Removed in Electron 7.0
+// Removed in Elecron 7.0
 webFrame.setIsolatedWorldContentSecurityPolicy(worldId, csp)
 webFrame.setIsolatedWorldHumanReadableName(worldId, name)
 webFrame.setIsolatedWorldSecurityOrigin(worldId, securityOrigin)
@@ -170,40 +121,6 @@ webFrame.setIsolatedWorldInfo(
 
 This property was removed in Chromium 77, and as such is no longer available.
 
-### `webkitdirectory` attribute for `<input type="file"/>`
-
-The `webkitdirectory` property on HTML file inputs allows them to select folders.
-Previous versions of Electron had an incorrect implementation where the `event.target.files`
-of the input returned a `FileList` that returned one `File` corresponding to the selected folder.
-
-As of Electron 7, that `FileList` is now list of all files contained within
-the folder, similarly to Chrome, Firefox, and Edge
-([link to MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/webkitdirectory)).
-
-As an illustration, take a folder with this structure:
-```console
-folder
-├── file1
-├── file2
-└── file3
-```
-
-In Electron <=6, this would return a `FileList` with a `File` object for:
-```console
-path/to/folder
-```
-
-In Electron 7, this now returns a `FileList` with a `File` object for:
-```console
-/path/to/folder/file3
-/path/to/folder/file2
-/path/to/folder/file1
-```
-
-Note that `webkitdirectory` no longer exposes the path to the selected folder.
-If you require the path to the selected folder rather than the folder contents,
-see the `dialog.showOpenDialog` API ([link](https://github.com/electron/electron/blob/master/docs/api/dialog.md#dialogshowopendialogbrowserwindow-options)).
-
 ## Planned Breaking API Changes (6.0)
 
 ### `win.setMenu(null)`

docs/api/browser-window.md

@@ -229,7 +229,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       unless hovered over in the top left of the window. These custom buttons prevent
       issues with mouse events that occur with the standard window toolbar buttons.
       **Note:** This option is currently experimental.
-  * `trafficLightPosition` [Point](structures/point.md) (optional) - Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`
   * `fullscreenWindowTitle` Boolean (optional) - Shows the title in the
     title bar in full screen mode on macOS for all `titleBarStyle` options.
     Default is `false`.
@@ -273,6 +272,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       OS-level sandbox and disabling the Node.js engine. This is not the same as
       the `nodeIntegration` option and the APIs available to the preload script
       are more limited. Read more about the option [here](sandbox-option.md).
+      **Note:** This option is currently experimental and may change or be
+      removed in future Electron releases.
     * `enableRemoteModule` Boolean (optional) - Whether to enable the [`remote`](remote.md) module.
       Default is `true`.
     * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
@@ -384,8 +385,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     * `accessibleTitle` String (optional) - An alternative title string provided only
       to accessibility tools such as screen readers. This string is not directly
       visible to users.
-    * `spellcheck` Boolean (optional) - Whether to enable the builtin spellchecker.
-      Default is `false`.
 
 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -516,7 +515,7 @@ Emitted when the window is restored from a minimized state.
 Returns:
 
 * `event` Event
-* `newBounds` [Rectangle](structures/rectangle.md) - Size the window is being resized to.
+* `newBounds` [`Rectangle`](structures/rectangle.md) - Size the window is being resized to.
 
 Emitted before the window is resized. Calling `event.preventDefault()` will prevent the window from being resized.
 
@@ -531,7 +530,7 @@ Emitted after the window has been resized.
 Returns:
 
 * `event` Event
-* `newBounds` [Rectangle](structures/rectangle.md) - Location the window is being moved to.
+* `newBounds` [`Rectangle`](structures/rectangle.md) - Location the window is being moved to.
 
 Emitted before the window is moved. On Windows, calling `event.preventDefault()` will prevent the window from being moved.
 
@@ -1580,7 +1579,7 @@ Same as `webContents.showDefinitionForSelection()`.
 
 #### `win.setIcon(icon)` _Windows_ _Linux_
 
-* `icon` [NativeImage](native-image.md) | String
+* `icon` [NativeImage](native-image.md)
 
 Changes window icon.
 
@@ -1626,7 +1625,7 @@ Returns `Boolean` - Whether the menu bar is visible.
 * `visible` Boolean
 * `options` Object (optional)
   * `visibleOnFullScreen` Boolean (optional) _macOS_ - Sets whether
-    the window should be visible above fullscreen windows _deprecated_
+    the window should be visible above fullscreen windows
 
 Sets whether the window should be visible on all workspaces.
 
@@ -1734,17 +1733,6 @@ will remove the vibrancy effect on the window.
 Note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` have been
 deprecated and will be removed in an upcoming version of macOS.
 
-#### `win.setTrafficLightPosition(position)` _macOS_
-
-* `position` [Point](structures/point.md)
-
-Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`.
-
-#### `win.getTrafficLightPosition()` _macOS_
-
-Returns `Point` - The current position for the traffic light buttons. Can only be used with `titleBarStyle`
-set to `hidden`.
-
 #### `win.setTouchBar(touchBar)` _macOS_ _Experimental_
 
 * `touchBar` TouchBar | null

docs/api/client-request.md

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

docs/api/context-bridge.md

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

docs/api/desktop-capturer.md

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

docs/api/dialog.md

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

docs/api/environment-variables.md

@@ -44,12 +44,7 @@ Unsupported options are:
 --use-openssl-ca
 ```
 
-`NODE_OPTIONS` are explicitly disallowed in packaged apps, except for the following:
-
-```sh
---max-http-header-size
---http-parser
-```
+`NODE_OPTIONS` are explicitly disallowed in packaged apps.
 
 ### `GOOGLE_API_KEY`
 

docs/api/ipc-main.md

@@ -77,7 +77,6 @@ only the next time a message is sent to `channel`, after which it is removed.
 
 * `channel` String
 * `listener` Function
-  * `...args` any[]
 
 Removes the specified `listener` from the listener array for the specified
 `channel`.

docs/api/native-image.md

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

docs/api/protocol.md

@@ -389,7 +389,9 @@ which sends a `Buffer` as a response.
       * `url` String
       * `method` String (optional)
       * `session` Session | null (optional)
-      * `uploadData` [ProtocolResponseUploadData](structures/protocol-response-upload-data.md) (optional)
+      * `uploadData` Object (optional)
+        * `contentType` String - MIME type of the content.
+        * `data` String - Content to be sent.
 * `completion` Function (optional)
   * `error` Error
 

docs/api/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`:
@@ -495,57 +456,10 @@ this session just before normal `preload` scripts run.
 Returns `String[]` an array of paths to preload scripts that have been
 registered.
 
-#### `ses.setSpellCheckerLanguages(languages)`
-
-* `languages` String[] - An array of language codes to enable the spellchecker for.
-
-The built in spellchecker does not automatically detect what language a user is typing in.  In order for the
-spell checker to correctly check their words you must call this API with an array of language codes.  You can
-get the list of supported language codes with the `ses.availableSpellCheckerLanguages` property.
-
-**Note:** On macOS the OS spellchecker is used and will detect your language automatically.  This API is a no-op on macOS.
-
-#### `ses.getSpellCheckerLanguages()`
-
-Returns `String[]` - An array of language codes the spellchecker is enabled for.  If this list is empty the spellchecker
-will fallback to using `en-US`.  By default on launch if this setting is an empty list Electron will try to populate this
-setting with the current OS locale.  This setting is persisted across restarts.
-
-**Note:** On macOS the OS spellchecker is used and has it's own list of languages.  This API is a no-op on macOS.
-
-#### `ses.setSpellCheckerDictionaryDownloadURL(url)`
-
-* `url` String - A base URL for Electron to download hunspell dictionaries from.
-
-By default Electron will download hunspell dictionaries from the Chromium CDN.  If you want to override this
-behavior you can use this API to point the dictionary downloader at your own hosted version of the hunspell
-dictionaries.  We publish a `hunspell_dictionaries.zip` file with each release which contains the files you need
-to host here, the file server must be **case insensitive** you must upload each file twice, once with the case it
-has in the ZIP file and once with the filename as all lower case.
-
-If the files present in `hunspell_dictionaries.zip` are available at `https://example.com/dictionaries/language-code.bdic`
-then you should call this api with `ses.setSpellCheckerDictionaryDownloadURL('https://example.com/dictionaries/')`.  Please
-note the trailing slash.  The URL to the dictionaries is formed as `${url}${filename}`.
-
-**Note:** On macOS the OS spellchecker is used and therefore we do not download any dictionary files.  This API is a no-op on macOS.
-
-#### `ses.addWordToSpellCheckerDictionary(word)`
-
-* `word` String - The word you want to add to the dictionary
-
-Returns `Boolean` - Whether the word was successfully written to the custom dictionary.
-
-**Note:** On macOS and Windows 10 this word will be written to the OS custom dictionary as well
-
 ### Instance Properties
 
 The following properties are available on instances of `Session`:
 
-#### `ses.availableSpellCheckerLanguages` _Readonly_
-
-A `String[]` array which consists of all the known available spell checker languages.  Providing a language
-code to the `setSpellCheckerLanaguages` API that isn't in this array will result in an error.
-
 #### `ses.cookies` _Readonly_
 
 A [`Cookies`](cookies.md) object for this session.

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

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

docs/api/system-preferences.md

@@ -369,6 +369,14 @@ 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_
@@ -396,6 +404,8 @@ Returns `Boolean` - whether or not this device has the ability to use Touch ID.
 
 **NOTE:** This API will return `false` on macOS systems older than Sierra 10.12.2.
 
+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.promptTouchID(reason)` _macOS_
 
 * `reason` String - The reason you are asking for Touch ID authentication
@@ -424,13 +434,11 @@ Returns `Boolean` - `true` if the current process is a trusted accessibility cli
 
 ### `systemPreferences.getMediaAccessStatus(mediaType)` _macOS_
 
-* `mediaType` String - Can be `microphone`, `camera` or `screen`.
+* `mediaType` String - `microphone` or `camera`.
 
 Returns `String` - Can be `not-determined`, `granted`, `denied`, `restricted` or `unknown`.
 
-This user consent was not required on macOS 10.13 High Sierra or lower so this method will always return `granted`.
-macOS 10.14 Mojave or higher requires consent for `microphone` and `camera` access.
-macOS 10.15 Catalina or higher requires consent for `screen` access.
+This user consent was not required until macOS 10.14 Mojave, so this method will always return `granted` if your system is running 10.13 High Sierra or lower.
 
 ### `systemPreferences.askForMediaAccess(mediaType)` _macOS_
 
@@ -470,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/web-contents.md

@@ -454,8 +454,10 @@ The usage is the same with [the `select-client-certificate` event of
 Returns:
 
 * `event` Event
-* `authenticationResponseDetails` Object
+* `request` Object
+  * `method` String
   * `url` URL
+  * `referrer` URL
 * `authInfo` Object
   * `isProxy` Boolean
   * `scheme` String
@@ -463,8 +465,8 @@ Returns:
   * `port` Integer
   * `realm` String
 * `callback` Function
-  * `username` String (optional)
-  * `password` String (optional)
+  * `username` String
+  * `password` String
 
 Emitted when `webContents` wants to do basic auth.
 
@@ -568,9 +570,6 @@ Returns:
   * `titleText` String - Title or alt text of the selection that the context
     was invoked on.
   * `misspelledWord` String - The misspelled word under the cursor, if any.
-  * `dictionarySuggestions` String[] - An array of suggested words to show the
-    user to replace the `misspelledWord`.  Only available if there is a misspelled
-    word and spellchecker is enabled.
   * `frameCharset` String - The character encoding of the frame on which the
     menu was invoked.
   * `inputFieldType` String - If the context menu was invoked on an input
@@ -1042,17 +1041,6 @@ contents.executeJavaScript('fetch("https://jsonplaceholder.typicode.com/users/1"
   })
 ```
 
-#### `contents.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture])`
-
-* `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electron's `contextIsolation` feature.  You can provide any integer here.
-* `scripts` [WebSource[]](structures/web-source.md)
-* `userGesture` Boolean (optional) - Default is `false`.
-
-Returns `Promise<any>` - A promise that resolves with the result of the executed code
-or is rejected if the result of the code is a rejected promise.
-
-Works like `executeJavaScript` but evaluates `scripts` in an isolated context.
-
 #### `contents.setIgnoreMenuShortcuts(ignore)` _Experimental_
 
 * `ignore` Boolean
@@ -1124,7 +1112,7 @@ Sets the maximum and minimum pinch-to-zoom level.
 > contents.setVisualZoomLevelLimits(1, 3)
 > ```
 
-#### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)` _Deprecated_
+#### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
 
 * `minimumLevel` Number
 * `maximumLevel` Number
@@ -1133,8 +1121,6 @@ Returns `Promise<void>`
 
 Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
 
-**Deprecated:** This API is no longer supported by Chromium.
-
 #### `contents.undo()`
 
 Executes the editing command `undo` in web page.
@@ -1247,34 +1233,11 @@ Returns `Promise<NativeImage>` - Resolves with a [NativeImage](native-image.md)
 
 Captures a snapshot of the page within `rect`. Omitting `rect` will capture the whole visible page.
 
-#### `contents.isBeingCaptured()`
-
-Returns `Boolean` - Whether this page is being captured. It returns true when the capturer count
-is large then 0.
-
-#### `contents.incrementCapturerCount([size, stayHidden])`
-
-* `size` [Size](structures/size.md) (optional) - The perferred size for the capturer.
-* `stayHidden` Boolean (optional) -  Keep the page hidden instead of visible.
-
-Increase the capturer count by one. The page is considered visible when its browser window is
-hidden and the capturer count is non-zero. If you would like the page to stay hidden, you should ensure that `stayHidden` is set to true.
-
-This also affects the Page Visibility API.
-
-#### `contents.decrementCapturerCount([stayHidden])`
-
-* `stayHidden` Boolean (optional) -  Keep the page in hidden state instead of visible.
-
-Decrease the capturer count by one. The page will be set to hidden or occluded state when its
-browser window is hidden or occluded and the capturer count reaches zero. If you want to
-decrease the hidden capturer count instead you should set `stayHidden` to true.
-
 #### `contents.getPrinters()`
 
 Get the system printer list.
 
-Returns [`PrinterInfo[]`](structures/printer-info.md)
+Returns [`PrinterInfo[]`](structures/printer-info.md).
 
 #### `contents.print([options], [callback])`
 
@@ -1282,7 +1245,7 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
   * `silent` Boolean (optional) - Don't ask user for print settings. Default is `false`.
   * `printBackground` Boolean (optional) - Prints the background color and image of
     the web page. Default is `false`.
-  * `deviceName` String (optional) - Set the printer device name to use. Must be the system-defined name and not the 'friendly' name, e.g 'Brother_QL_820NWB' and not 'Brother QL-820NWB'.
+  * `deviceName` String (optional) - Set the printer device name to use. Default is `''`.
   * `color` Boolean (optional) - Set whether the printed web page will be in color or grayscale. Default is `true`.
   * `margins` Object (optional)
     * `marginType` String (optional) - Can be `default`, `none`, `printableArea`, or `custom`. If `custom` is chosen, you will also need to specify `top`, `bottom`, `left`, and `right`.
@@ -1304,7 +1267,7 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
   * `footer` String (optional) - String to be printed as page footer.
 * `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.
@@ -1363,13 +1326,12 @@ win.loadURL('http://github.com')
 
 win.webContents.on('did-finish-load', () => {
   // Use default printing options
-  win.webContents.printToPDF({}).then(data => {
+  win.webContents.printToPDF({}, (error, data) => {
+    if (error) throw error
     fs.writeFile('/tmp/print.pdf', data, (error) => {
       if (error) throw error
       console.log('Write PDF successfully.')
     })
-  }).catch(error => {
-    console.log(error)
   })
 })
 ```

docs/api/web-frame.md

@@ -56,15 +56,13 @@ Sets the maximum and minimum pinch-to-zoom level.
 > webFrame.setVisualZoomLevelLimits(1, 3)
 > ```
 
-### `webFrame.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)` _Deprecated_
+### `webFrame.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
 
 * `minimumLevel` Number
 * `maximumLevel` Number
 
 Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
 
-**Deprecated:** This API is no longer supported by Chromium.
-
 ### `webFrame.setSpellCheckProvider(language, provider)`
 
 * `language` String
@@ -76,17 +74,6 @@ Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
 
 Sets a provider for spell checking in input fields and text areas.
 
-If you want to use this method you must disable the builtin spellchecker when you
-construct the window.
-
-```js
-const mainWindow = new BrowserWindow({
-  webPreferences: {
-    spellcheck: false
-  }
-})
-```
-
 The `provider` must be an object that has a `spellCheck` method that accepts
 an array of individual words for spellchecking.
 The `spellCheck` function runs asynchronously and calls the `callback` function

docs/api/web-request.md

@@ -146,8 +146,7 @@ response are visible by the time this listener is fired.
     * `timestamp` Double
     * `statusLine` String
     * `statusCode` Integer
-    * `requestHeaders` Record<string, string>
-    * `responseHeaders` Record<string, string[]> (optional)
+    * `responseHeaders` Record<string, string> (optional)
   * `callback` Function
     * `headersReceivedResponse` Object
       * `cancel` Boolean (optional)
@@ -176,7 +175,7 @@ The `callback` has to be called with a `response` object.
     * `resourceType` String
     * `referrer` String
     * `timestamp` Double
-    * `responseHeaders` Record<string, string[]> (optional)
+    * `responseHeaders` Record<string, string> (optional)
     * `fromCache` Boolean - Indicates whether the response was fetched from disk
       cache.
     * `statusCode` Integer
@@ -206,7 +205,7 @@ and response headers are available.
     * `ip` String (optional) - The server IP address that the request was
       actually sent to.
     * `fromCache` Boolean
-    * `responseHeaders` Record<string, string[]> (optional)
+    * `responseHeaders` Record<string, string> (optional)
 
 The `listener` will be called with `listener(details)` when a server initiated
 redirect is about to occur.
@@ -225,11 +224,10 @@ redirect is about to occur.
     * `resourceType` String
     * `referrer` String
     * `timestamp` Double
-    * `responseHeaders` Record<string, string[]> (optional)
+    * `responseHeaders` Record<string, string> (optional)
     * `fromCache` Boolean
     * `statusCode` Integer
     * `statusLine` String
-    * `error` String
 
 The `listener` will be called with `listener(details)` when a request is
 completed.

docs/api/webview-tag.md

@@ -635,7 +635,7 @@ Returns `Promise<void>`
 
 Sets the maximum and minimum pinch-to-zoom level.
 
-### `<webview>.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)` _Deprecated_
+### `<webview>.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
 
 * `minimumLevel` Number
 * `maximumLevel` Number
@@ -644,13 +644,11 @@ Returns `Promise<void>`
 
 Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
 
-**Deprecated:** This API is no longer supported by Chromium.
-
 ### `<webview>.showDefinitionForSelection()` _macOS_
 
 Shows pop-up dictionary that searches the selected word on the page.
 
-### `<webview>.getWebContents()` _Deprecated_
+### `<webview>.getWebContents()`
 
 Returns [`WebContents`](web-contents.md) - The web contents associated with
 this `webview`.

docs/tutorial/installation.md

@@ -38,15 +38,11 @@ npm install --platform=win32 electron
 
 ## Proxies
 
-If you need to use an HTTP proxy, you need to set the `ELECTRON_GET_USE_PROXY` variable to any
-value, plus additional environment variables depending on your host system's Node version:
-
-* [Node 10 and above][proxy-env-10]
-* [Before Node 10][proxy-env]
+If you need to use an HTTP proxy you can [set these environment variables][proxy-env].
 
 ## Custom Mirrors and Caches
 During installation, the `electron` module will call out to
-[`@electron/get`][electron-get] to download prebuilt binaries of
+[`electron-download`][electron-download] to download prebuilt binaries of
 Electron for your platform. It will do so by contacting GitHub's
 release download page (`https://github.com/electron/electron/releases/tag/v$VERSION`,
 where `$VERSION` is the exact version of Electron).
@@ -56,7 +52,7 @@ can do so by either providing a mirror or an existing cache directory.
 
 #### Mirror
 You can use environment variables to override the base URL, the path at which to
-look for Electron binaries, and the binary filename. The url used by `@electron/get`
+look for Electron binaries, and the binary filename. The url used by `electron-download`
 is composed as follows:
 
 ```plaintext
@@ -66,11 +62,11 @@ url = ELECTRON_MIRROR + ELECTRON_CUSTOM_DIR + '/' + ELECTRON_CUSTOM_FILENAME
 For instance, to use the China mirror:
 
 ```plaintext
-ELECTRON_MIRROR="https://cdn.npm.taobao.org/dist/electron/"
+ELECTRON_MIRROR="https://npm.taobao.org/mirrors/electron/"
 ```
 
 #### Cache
-Alternatively, you can override the local cache. `@electron/get` will cache
+Alternatively, you can override the local cache. `electron-download` will cache
 downloaded binaries in a local directory to not stress your network. You can use
 that cache folder to provide custom builds of Electron or to avoid making contact
 with the network at all.
@@ -89,26 +85,16 @@ The cache contains the version's official zip file as well as a checksum, stored
 a text file. A typical cache might look like this:
 
 ```sh
-├── httpsgithub.comelectronelectronreleasesdownloadv1.7.9electron-v1.7.9-darwin-x64.zip
-│   └── electron-v1.7.9-darwin-x64.zip
-├── httpsgithub.comelectronelectronreleasesdownloadv1.7.9SHASUMS256.txt
-│   └── SHASUMS256.txt
-├── httpsgithub.comelectronelectronreleasesdownloadv1.8.1electron-v1.8.1-darwin-x64.zip
-│   └── electron-v1.8.1-darwin-x64.zip
-├── httpsgithub.comelectronelectronreleasesdownloadv1.8.1SHASUMS256.txt
-│   └── SHASUMS256.txt
-├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.1electron-v1.8.2-beta.1-darwin-x64.zip
-│   └── electron-v1.8.2-beta.1-darwin-x64.zip
-├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.1SHASUMS256.txt
-│   └── SHASUMS256.txt
-├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.2electron-v1.8.2-beta.2-darwin-x64.zip
-│   └── electron-v1.8.2-beta.2-darwin-x64.zip
-├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.2SHASUMS256.txt
-│   └── SHASUMS256.txt
-├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.3electron-v1.8.2-beta.3-darwin-x64.zip
-│   └── electron-v1.8.2-beta.3-darwin-x64.zip
-└── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.3SHASUMS256.txt
-    └── SHASUMS256.txt
+├── electron-v1.7.9-darwin-x64.zip
+├── electron-v1.8.1-darwin-x64.zip
+├── electron-v1.8.2-beta.1-darwin-x64.zip
+├── electron-v1.8.2-beta.2-darwin-x64.zip
+├── electron-v1.8.2-beta.3-darwin-x64.zip
+├── SHASUMS256.txt-1.7.9
+├── SHASUMS256.txt-1.8.1
+├── SHASUMS256.txt-1.8.2-beta.1
+├── SHASUMS256.txt-1.8.2-beta.2
+├── SHASUMS256.txt-1.8.2-beta.3
 ```
 
 ## Skip binary download
@@ -160,8 +146,7 @@ If you need to force a re-download of the asset and the SHASUM file set the
 [npm]: https://docs.npmjs.com
 [versioning]: ./electron-versioning.md
 [releases]: https://github.com/electron/electron/releases
-[proxy-env-10]: https://github.com/gajus/global-agent/blob/v2.1.5/README.md#environment-variables
-[proxy-env]: https://github.com/np-maintain/global-tunnel/blob/v2.7.1/README.md#auto-config
-[electron-get]: https://github.com/electron/get
+[proxy-env]: https://github.com/request/request/tree/f0c4ec061141051988d1216c24936ad2e7d5c45d#controlling-proxy-behaviour-using-environment-variables
+[electron-download]: https://github.com/electron-userland/electron-download
 [npm-permissions]: https://docs.npmjs.com/getting-started/fixing-npm-permissions
 [unsafe-perm]: https://docs.npmjs.com/misc/config#unsafe-perm

docs/tutorial/performance.md

@@ -54,13 +54,13 @@ at once, consider the [Chrome Tracing] tool.
 Chances are that your app could be a little leaner, faster, and generally less
 resource-hungry if you attempt these steps.
 
-1. [Carelessly including modules](#1-carelessly-including-modules)
-2. [Loading and running code too soon](#2-loading-and-running-code-too-soon)
-3. [Blocking the main process](#3-blocking-the-main-process)
-4. [Blocking the renderer process](#4-blocking-the-renderer-process)
-5. [Unnecessary polyfills](#5-unnecessary-polyfills)
-6. [Unnecessary or blocking network requests](#6-unnecessary-or-blocking-network-requests)
-7. [Bundle your code](#7-bundle-your-code)
+1) [Carelessly including modules](#1-carelessly-including-modules)
+2) [Loading and running code too soon](#2-loading-and-running-code-too-soon)
+3) [Blocking the main process](#3-blocking-the-main-process)
+4) [Blocking the renderer process](#4-blocking-the-renderer-process)
+5) [Unnecessary polyfills](#5-unnecessary-polyfills)
+6) [Unnecessary or blocking network requests](#6-unnecessary-or-blocking-network-requests)
+7) [Bundle your code](#7-bundle-your-code)
 
 ## 1) Carelessly including modules
 
@@ -418,6 +418,7 @@ As of writing this article, the popular choices include [Webpack][webpack],
 [performance-cpu-prof]: ../images/performance-cpu-prof.png
 [performance-heap-prof]: ../images/performance-heap-prof.png
 [chrome-devtools-tutorial]: https://developers.google.com/web/tools/chrome-devtools/evaluate-performance/
+[chrome-tracing-tutorial]:
 [worker-threads]: https://nodejs.org/api/worker_threads.html
 [web-workers]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers
 [request-idle-callback]: https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback

docs/tutorial/snapcraft.md

@@ -61,6 +61,7 @@ The output should look roughly like this:
         ├── libgcrypt.so.11
         ├── libnode.so
         ├── locales
+        ├── natives_blob.bin
         ├── resources
         ├── v8_context_snapshot.bin
         └── version

docs/tutorial/windows-store-guide.md

@@ -62,6 +62,7 @@ The output should look roughly like this:
 │   ├── am.pak
 │   ├── ar.pak
 │   ├── [...]
+├── natives_blob.bin
 ├── node.dll
 ├── resources
 │   ├── app

electron_strings.grdp

@@ -69,10 +69,4 @@
   <message name="IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes previous track action.">
     Previous track
   </message>
-  <message name="IDS_SPELLCHECK_DICTIONARY" use_name_for_id="true">
-    en-US
-  </message>
-  <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
-    en-US,en
-  </message>
 </grit-part>

filenames.auto.gni

@@ -135,12 +135,12 @@ auto_filenames = {
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.js",
     "lib/common/api/shell.js",
+    "lib/common/clipboard-utils.ts",
     "lib/common/crash-reporter.js",
     "lib/common/define-properties.ts",
     "lib/common/electron-binding-setup.ts",
-    "lib/common/type-utils.ts",
+    "lib/common/remote/type-utils.ts",
     "lib/common/web-view-methods.ts",
-    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.js",
     "lib/renderer/api/desktop-capturer.ts",
@@ -165,7 +165,6 @@ auto_filenames = {
     "lib/renderer/web-view/web-view-element.ts",
     "lib/renderer/web-view/web-view-impl.ts",
     "lib/renderer/web-view/web-view-init.ts",
-    "lib/renderer/window-setup.ts",
     "lib/sandboxed_renderer/api/exports/electron.ts",
     "lib/sandboxed_renderer/api/module-list.ts",
     "lib/sandboxed_renderer/init.js",
@@ -189,7 +188,6 @@ auto_filenames = {
 
   content_script_bundle_deps = [
     "lib/common/electron-binding-setup.ts",
-    "lib/common/webpack-globals-provider.ts",
     "lib/content_script/init.js",
     "lib/renderer/chrome-api.ts",
     "lib/renderer/extensions/event.ts",
@@ -268,15 +266,15 @@ auto_filenames = {
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.js",
     "lib/common/api/shell.js",
+    "lib/common/clipboard-utils.ts",
     "lib/common/crash-reporter.js",
     "lib/common/define-properties.ts",
     "lib/common/electron-binding-setup.ts",
     "lib/common/init.ts",
     "lib/common/parse-features-string.js",
+    "lib/common/remote/type-utils.ts",
     "lib/common/reset-search-paths.ts",
-    "lib/common/type-utils.ts",
     "lib/common/web-view-methods.ts",
-    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
     "package.json",
@@ -291,14 +289,14 @@ auto_filenames = {
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.js",
     "lib/common/api/shell.js",
+    "lib/common/clipboard-utils.ts",
     "lib/common/crash-reporter.js",
     "lib/common/define-properties.ts",
     "lib/common/electron-binding-setup.ts",
     "lib/common/init.ts",
+    "lib/common/remote/type-utils.ts",
     "lib/common/reset-search-paths.ts",
-    "lib/common/type-utils.ts",
     "lib/common/web-view-methods.ts",
-    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.js",
     "lib/renderer/api/desktop-capturer.ts",
@@ -340,13 +338,13 @@ auto_filenames = {
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.js",
     "lib/common/api/shell.js",
+    "lib/common/clipboard-utils.ts",
     "lib/common/crash-reporter.js",
     "lib/common/define-properties.ts",
     "lib/common/electron-binding-setup.ts",
     "lib/common/init.ts",
+    "lib/common/remote/type-utils.ts",
     "lib/common/reset-search-paths.ts",
-    "lib/common/type-utils.ts",
-    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.js",
     "lib/renderer/api/desktop-capturer.ts",

filenames.gni

@@ -22,99 +22,96 @@ filenames = {
   ]
 
   lib_sources = [
-    "chromium_src/chrome/browser/process_singleton.h",
-    "chromium_src/chrome/browser/process_singleton_posix.cc",
-    "chromium_src/chrome/browser/process_singleton_win.cc",
-    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
-    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
-    "shell/app/electron_content_client.cc",
-    "shell/app/electron_content_client.h",
-    "shell/app/electron_main_delegate.cc",
-    "shell/app/electron_main_delegate.h",
-    "shell/app/electron_main_delegate_mac.h",
-    "shell/app/electron_main_delegate_mac.mm",
+    "shell/app/atom_content_client.cc",
+    "shell/app/atom_content_client.h",
+    "shell/app/atom_main_delegate.cc",
+    "shell/app/atom_main_delegate.h",
+    "shell/app/atom_main_delegate_mac.h",
+    "shell/app/atom_main_delegate_mac.mm",
     "shell/app/command_line_args.cc",
     "shell/app/command_line_args.h",
     "shell/app/uv_task_runner.cc",
     "shell/app/uv_task_runner.h",
-    "shell/browser/api/electron_api_app.cc",
-    "shell/browser/api/electron_api_app.h",
-    "shell/browser/api/electron_api_app_mac.mm",
-    "shell/browser/api/electron_api_auto_updater.cc",
-    "shell/browser/api/electron_api_auto_updater.h",
-    "shell/browser/api/electron_api_browser_view.cc",
-    "shell/browser/api/electron_api_browser_view.h",
-    "shell/browser/api/electron_api_browser_window.cc",
-    "shell/browser/api/electron_api_browser_window.h",
-    "shell/browser/api/electron_api_browser_window_mac.mm",
-    "shell/browser/api/electron_api_browser_window_views.cc",
-    "shell/browser/api/electron_api_content_tracing.cc",
-    "shell/browser/api/electron_api_cookies.cc",
-    "shell/browser/api/electron_api_cookies.h",
-    "shell/browser/api/electron_api_data_pipe_holder.cc",
-    "shell/browser/api/electron_api_data_pipe_holder.h",
-    "shell/browser/api/electron_api_debugger.cc",
-    "shell/browser/api/electron_api_debugger.h",
-    "shell/browser/api/electron_api_dialog.cc",
-    "shell/browser/api/electron_api_download_item.cc",
-    "shell/browser/api/electron_api_download_item.h",
-    "shell/browser/api/electron_api_event.cc",
-    "shell/browser/api/electron_api_global_shortcut.cc",
-    "shell/browser/api/electron_api_global_shortcut.h",
-    "shell/browser/api/electron_api_in_app_purchase.cc",
-    "shell/browser/api/electron_api_in_app_purchase.h",
-    "shell/browser/api/electron_api_menu.cc",
-    "shell/browser/api/electron_api_menu.h",
-    "shell/browser/api/electron_api_menu_mac.h",
-    "shell/browser/api/electron_api_menu_mac.mm",
-    "shell/browser/api/electron_api_menu_views.cc",
-    "shell/browser/api/electron_api_menu_views.h",
-    "shell/browser/api/electron_api_native_theme.cc",
-    "shell/browser/api/electron_api_native_theme.h",
-    "shell/browser/api/electron_api_native_theme_mac.mm",
-    "shell/browser/api/electron_api_net.cc",
-    "shell/browser/api/electron_api_net.h",
-    "shell/browser/api/electron_api_net_log.cc",
-    "shell/browser/api/electron_api_net_log.h",
-    "shell/browser/api/electron_api_notification.cc",
-    "shell/browser/api/electron_api_notification.h",
-    "shell/browser/api/electron_api_power_monitor.cc",
-    "shell/browser/api/electron_api_power_monitor.h",
-    "shell/browser/api/electron_api_power_monitor_mac.mm",
-    "shell/browser/api/electron_api_power_monitor_win.cc",
-    "shell/browser/api/electron_api_power_save_blocker.cc",
-    "shell/browser/api/electron_api_power_save_blocker.h",
-    "shell/browser/api/electron_api_protocol_ns.cc",
-    "shell/browser/api/electron_api_protocol_ns.h",
-    "shell/browser/api/electron_api_screen.cc",
-    "shell/browser/api/electron_api_screen.h",
-    "shell/browser/api/electron_api_session.cc",
-    "shell/browser/api/electron_api_session.h",
-    "shell/browser/api/electron_api_system_preferences.cc",
-    "shell/browser/api/electron_api_system_preferences.h",
-    "shell/browser/api/electron_api_system_preferences_mac.mm",
-    "shell/browser/api/electron_api_system_preferences_win.cc",
-    "shell/browser/api/electron_api_top_level_window.cc",
-    "shell/browser/api/electron_api_top_level_window.h",
-    "shell/browser/api/electron_api_tray.cc",
-    "shell/browser/api/electron_api_tray.h",
-    "shell/browser/api/electron_api_url_loader.cc",
-    "shell/browser/api/electron_api_url_loader.h",
-    "shell/browser/api/electron_api_view.cc",
-    "shell/browser/api/electron_api_view.h",
-    "shell/browser/api/electron_api_web_contents.cc",
-    "shell/browser/api/electron_api_web_contents.h",
-    "shell/browser/api/electron_api_web_contents_impl.cc",
-    "shell/browser/api/electron_api_web_contents_mac.mm",
-    "shell/browser/api/electron_api_web_contents_view.cc",
-    "shell/browser/api/electron_api_web_contents_view.h",
-    "shell/browser/api/electron_api_web_request_ns.cc",
-    "shell/browser/api/electron_api_web_request_ns.h",
-    "shell/browser/api/electron_api_web_view_manager.cc",
+    "shell/browser/api/atom_api_app_mac.mm",
+    "shell/browser/api/atom_api_app.cc",
+    "shell/browser/font_defaults.cc",
+    "shell/browser/font_defaults.h",
+    "shell/browser/feature_list.cc",
+    "shell/browser/feature_list.h",
+    "shell/browser/api/atom_api_app.h",
+    "shell/browser/api/atom_api_auto_updater.cc",
+    "shell/browser/api/atom_api_auto_updater.h",
+    "shell/browser/api/atom_api_browser_view.cc",
+    "shell/browser/api/atom_api_browser_view.h",
+    "shell/browser/api/atom_api_content_tracing.cc",
+    "shell/browser/api/atom_api_cookies.cc",
+    "shell/browser/api/atom_api_cookies.h",
+    "shell/browser/api/atom_api_data_pipe_holder.cc",
+    "shell/browser/api/atom_api_data_pipe_holder.h",
+    "shell/browser/api/atom_api_debugger.cc",
+    "shell/browser/api/atom_api_debugger.h",
+    "shell/browser/api/atom_api_dialog.cc",
+    "shell/browser/api/atom_api_download_item.cc",
+    "shell/browser/api/atom_api_download_item.h",
+    "shell/browser/api/atom_api_event.cc",
+    "shell/browser/api/atom_api_global_shortcut.cc",
+    "shell/browser/api/atom_api_global_shortcut.h",
+    "shell/browser/api/atom_api_in_app_purchase.cc",
+    "shell/browser/api/atom_api_in_app_purchase.h",
+    "shell/browser/api/atom_api_menu.cc",
+    "shell/browser/api/atom_api_menu.h",
+    "shell/browser/api/atom_api_menu_mac.h",
+    "shell/browser/api/atom_api_menu_mac.mm",
+    "shell/browser/api/atom_api_menu_views.cc",
+    "shell/browser/api/atom_api_menu_views.h",
+    "shell/browser/api/atom_api_native_theme.cc",
+    "shell/browser/api/atom_api_native_theme.h",
+    "shell/browser/api/atom_api_native_theme_mac.mm",
+    "shell/browser/api/atom_api_net.cc",
+    "shell/browser/api/atom_api_net.h",
+    "shell/browser/api/atom_api_net_log.cc",
+    "shell/browser/api/atom_api_net_log.h",
+    "shell/browser/api/atom_api_notification.cc",
+    "shell/browser/api/atom_api_notification.h",
+    "shell/browser/api/atom_api_power_monitor_mac.mm",
+    "shell/browser/api/atom_api_power_monitor_win.cc",
+    "shell/browser/api/atom_api_power_monitor.cc",
+    "shell/browser/api/atom_api_power_monitor.h",
+    "shell/browser/api/atom_api_power_save_blocker.cc",
+    "shell/browser/api/atom_api_power_save_blocker.h",
+    "shell/browser/api/atom_api_protocol.cc",
+    "shell/browser/api/atom_api_protocol.h",
+    "shell/browser/api/atom_api_screen.cc",
+    "shell/browser/api/atom_api_screen.h",
+    "shell/browser/api/atom_api_session.cc",
+    "shell/browser/api/atom_api_session.h",
+    "shell/browser/api/atom_api_system_preferences.cc",
+    "shell/browser/api/atom_api_system_preferences.h",
+    "shell/browser/api/atom_api_system_preferences_mac.mm",
+    "shell/browser/api/atom_api_system_preferences_win.cc",
+    "shell/browser/api/atom_api_top_level_window.cc",
+    "shell/browser/api/atom_api_top_level_window.h",
+    "shell/browser/api/atom_api_tray.cc",
+    "shell/browser/api/atom_api_tray.h",
+    "shell/browser/api/atom_api_url_request.cc",
+    "shell/browser/api/atom_api_url_request.h",
+    "shell/browser/api/atom_api_view.cc",
+    "shell/browser/api/atom_api_view.h",
+    "shell/browser/api/atom_api_web_contents.cc",
+    "shell/browser/api/atom_api_web_contents.h",
+    "shell/browser/api/atom_api_web_contents_impl.cc",
+    "shell/browser/api/atom_api_web_contents_mac.mm",
+    "shell/browser/api/atom_api_web_contents_view.cc",
+    "shell/browser/api/atom_api_web_contents_view.h",
+    "shell/browser/api/atom_api_web_request.cc",
+    "shell/browser/api/atom_api_web_request.h",
+    "shell/browser/api/atom_api_web_view_manager.cc",
+    "shell/browser/api/atom_api_browser_window.cc",
+    "shell/browser/api/atom_api_browser_window.h",
+    "shell/browser/api/atom_api_browser_window_mac.mm",
+    "shell/browser/api/atom_api_browser_window_views.cc",
     "shell/browser/api/event.cc",
     "shell/browser/api/event.h",
-    "shell/browser/api/event_emitter_deprecated.cc",
-    "shell/browser/api/event_emitter_deprecated.h",
     "shell/browser/api/frame_subscriber.cc",
     "shell/browser/api/frame_subscriber.h",
     "shell/browser/api/gpu_info_enumerator.cc",
@@ -125,75 +122,67 @@ filenames = {
     "shell/browser/api/process_metric.h",
     "shell/browser/api/save_page_handler.cc",
     "shell/browser/api/save_page_handler.h",
-    "shell/browser/api/trackable_object.cc",
-    "shell/browser/api/trackable_object.h",
-    "shell/browser/electron_autofill_driver.cc",
-    "shell/browser/electron_autofill_driver.h",
-    "shell/browser/electron_autofill_driver_factory.cc",
-    "shell/browser/electron_autofill_driver_factory.h",
-    "shell/browser/electron_browser_client.cc",
-    "shell/browser/electron_browser_client.h",
-    "shell/browser/electron_browser_context.cc",
-    "shell/browser/electron_browser_context.h",
-    "shell/browser/electron_browser_main_parts.cc",
-    "shell/browser/electron_browser_main_parts.h",
-    "shell/browser/electron_browser_main_parts_mac.mm",
-    "shell/browser/electron_browser_main_parts_posix.cc",
-    "shell/browser/electron_download_manager_delegate.cc",
-    "shell/browser/electron_download_manager_delegate.h",
-    "shell/browser/electron_gpu_client.cc",
-    "shell/browser/electron_gpu_client.h",
-    "shell/browser/electron_javascript_dialog_manager.cc",
-    "shell/browser/electron_javascript_dialog_manager.h",
-    "shell/browser/electron_navigation_throttle.cc",
-    "shell/browser/electron_navigation_throttle.h",
-    "shell/browser/electron_paths.h",
-    "shell/browser/electron_permission_manager.cc",
-    "shell/browser/electron_permission_manager.h",
-    "shell/browser/electron_quota_permission_context.cc",
-    "shell/browser/electron_quota_permission_context.h",
-    "shell/browser/electron_speech_recognition_manager_delegate.cc",
-    "shell/browser/electron_speech_recognition_manager_delegate.h",
-    "shell/browser/electron_web_ui_controller_factory.cc",
-    "shell/browser/electron_web_ui_controller_factory.h",
     "shell/browser/auto_updater.cc",
     "shell/browser/auto_updater.h",
     "shell/browser/auto_updater_mac.mm",
+    "shell/browser/atom_autofill_driver_factory.cc",
+    "shell/browser/atom_autofill_driver_factory.h",
+    "shell/browser/atom_autofill_driver.cc",
+    "shell/browser/atom_autofill_driver.h",
+    "shell/browser/atom_browser_client.cc",
+    "shell/browser/atom_browser_client.h",
+    "shell/browser/atom_browser_context.cc",
+    "shell/browser/atom_browser_context.h",
+    "shell/browser/atom_download_manager_delegate.cc",
+    "shell/browser/atom_download_manager_delegate.h",
+    "shell/browser/atom_gpu_client.cc",
+    "shell/browser/atom_gpu_client.h",
+    "shell/browser/atom_browser_main_parts.cc",
+    "shell/browser/atom_browser_main_parts.h",
+    "shell/browser/atom_browser_main_parts_mac.mm",
+    "shell/browser/atom_browser_main_parts_posix.cc",
+    "shell/browser/atom_javascript_dialog_manager.cc",
+    "shell/browser/atom_javascript_dialog_manager.h",
+    "shell/browser/atom_navigation_throttle.h",
+    "shell/browser/atom_navigation_throttle.cc",
+    "shell/browser/atom_paths.h",
+    "shell/browser/atom_permission_manager.cc",
+    "shell/browser/atom_permission_manager.h",
+    "shell/browser/atom_quota_permission_context.cc",
+    "shell/browser/atom_quota_permission_context.h",
+    "shell/browser/atom_speech_recognition_manager_delegate.cc",
+    "shell/browser/atom_speech_recognition_manager_delegate.h",
+    "shell/browser/atom_web_ui_controller_factory.cc",
+    "shell/browser/atom_web_ui_controller_factory.h",
     "shell/browser/browser.cc",
     "shell/browser/browser.h",
     "shell/browser/browser_linux.cc",
     "shell/browser/browser_mac.mm",
+    "shell/browser/browser_win.cc",
     "shell/browser/browser_observer.h",
     "shell/browser/browser_process_impl.cc",
     "shell/browser/browser_process_impl.h",
-    "shell/browser/browser_win.cc",
     "shell/browser/child_web_contents_tracker.cc",
     "shell/browser/child_web_contents_tracker.h",
-    "shell/browser/common_web_contents_delegate.cc",
-    "shell/browser/common_web_contents_delegate.h",
     "shell/browser/common_web_contents_delegate_mac.mm",
     "shell/browser/common_web_contents_delegate_views.cc",
+    "shell/browser/common_web_contents_delegate.cc",
+    "shell/browser/common_web_contents_delegate.h",
     "shell/browser/cookie_change_notifier.cc",
     "shell/browser/cookie_change_notifier.h",
-    "shell/browser/feature_list.cc",
-    "shell/browser/feature_list.h",
-    "shell/browser/font_defaults.cc",
-    "shell/browser/font_defaults.h",
     "shell/browser/javascript_environment.cc",
     "shell/browser/javascript_environment.h",
     "shell/browser/lib/bluetooth_chooser.cc",
     "shell/browser/lib/bluetooth_chooser.h",
     "shell/browser/lib/power_observer.h",
-    "shell/browser/lib/power_observer_linux.cc",
     "shell/browser/lib/power_observer_linux.h",
-    "shell/browser/linux/unity_service.cc",
-    "shell/browser/linux/unity_service.h",
+    "shell/browser/lib/power_observer_linux.cc",
     "shell/browser/login_handler.cc",
     "shell/browser/login_handler.h",
-    "shell/browser/mac/electron_application.h",
-    "shell/browser/mac/electron_application.mm",
-    "shell/browser/mac/electron_application_delegate.h",
-    "shell/browser/mac/electron_application_delegate.mm",
+    "shell/browser/mac/atom_application.h",
+    "shell/browser/mac/atom_application.mm",
+    "shell/browser/mac/atom_application_delegate.h",
+    "shell/browser/mac/atom_application_delegate.mm",
     "shell/browser/mac/dict_util.h",
     "shell/browser/mac/dict_util.mm",
     "shell/browser/mac/in_app_purchase.h",
@@ -202,55 +191,48 @@ filenames = {
     "shell/browser/mac/in_app_purchase_observer.mm",
     "shell/browser/mac/in_app_purchase_product.h",
     "shell/browser/mac/in_app_purchase_product.mm",
-    "shell/browser/media/media_capture_devices_dispatcher.cc",
-    "shell/browser/media/media_capture_devices_dispatcher.h",
-    "shell/browser/media/media_device_id_salt.cc",
-    "shell/browser/media/media_device_id_salt.h",
-    "shell/browser/media/media_stream_devices_controller.cc",
-    "shell/browser/media/media_stream_devices_controller.h",
     "shell/browser/microtasks_runner.cc",
     "shell/browser/microtasks_runner.h",
     "shell/browser/native_browser_view.cc",
     "shell/browser/native_browser_view.h",
     "shell/browser/native_browser_view_mac.h",
     "shell/browser/native_browser_view_mac.mm",
-    "shell/browser/native_browser_view_views.cc",
     "shell/browser/native_browser_view_views.h",
+    "shell/browser/native_browser_view_views.cc",
     "shell/browser/native_window.cc",
     "shell/browser/native_window.h",
+    "shell/browser/native_window_views_win.cc",
+    "shell/browser/native_window_views.cc",
+    "shell/browser/native_window_views.h",
     "shell/browser/native_window_mac.h",
     "shell/browser/native_window_mac.mm",
     "shell/browser/native_window_observer.h",
-    "shell/browser/native_window_views.cc",
-    "shell/browser/native_window_views.h",
-    "shell/browser/native_window_views_win.cc",
+    "shell/browser/media/media_capture_devices_dispatcher.cc",
+    "shell/browser/media/media_capture_devices_dispatcher.h",
+    "shell/browser/media/media_device_id_salt.cc",
+    "shell/browser/media/media_device_id_salt.h",
+    "shell/browser/media/media_stream_devices_controller.cc",
+    "shell/browser/media/media_stream_devices_controller.h",
     "shell/browser/net/asar/asar_url_loader.cc",
     "shell/browser/net/asar/asar_url_loader.h",
-    "shell/browser/net/electron_url_loader_factory.cc",
-    "shell/browser/net/electron_url_loader_factory.h",
+    "shell/browser/net/atom_url_loader_factory.cc",
+    "shell/browser/net/atom_url_loader_factory.h",
     "shell/browser/net/cert_verifier_client.cc",
     "shell/browser/net/cert_verifier_client.h",
-    "shell/browser/net/network_context_service.cc",
-    "shell/browser/net/network_context_service.h",
-    "shell/browser/net/network_context_service_factory.cc",
-    "shell/browser/net/network_context_service_factory.h",
-    "shell/browser/net/node_stream_loader.cc",
-    "shell/browser/net/node_stream_loader.h",
     "shell/browser/net/proxying_url_loader_factory.cc",
     "shell/browser/net/proxying_url_loader_factory.h",
-    "shell/browser/net/proxying_websocket.cc",
-    "shell/browser/net/proxying_websocket.h",
+    "shell/browser/net/network_context_service_factory.cc",
+    "shell/browser/net/network_context_service_factory.h",
+    "shell/browser/net/network_context_service.cc",
+    "shell/browser/net/network_context_service.h",
+    "shell/browser/net/node_stream_loader.cc",
+    "shell/browser/net/node_stream_loader.h",
     "shell/browser/net/resolve_proxy_helper.cc",
     "shell/browser/net/resolve_proxy_helper.h",
     "shell/browser/net/system_network_context_manager.cc",
     "shell/browser/net/system_network_context_manager.h",
     "shell/browser/net/url_pipe_loader.cc",
     "shell/browser/net/url_pipe_loader.h",
-    "shell/browser/net/web_request_api_interface.h",
-    "shell/browser/network_hints_handler_impl.cc",
-    "shell/browser/network_hints_handler_impl.h",
-    "shell/browser/node_debugger.cc",
-    "shell/browser/node_debugger.h",
     "shell/browser/notifications/linux/libnotify_notification.cc",
     "shell/browser/notifications/linux/libnotify_notification.h",
     "shell/browser/notifications/linux/notification_presenter_linux.cc",
@@ -283,65 +265,67 @@ filenames = {
     "shell/browser/notifications/win/win32_notification.h",
     "shell/browser/notifications/win/windows_toast_notification.cc",
     "shell/browser/notifications/win/windows_toast_notification.h",
+    "shell/browser/node_debugger.cc",
+    "shell/browser/node_debugger.h",
     "shell/browser/pref_store_delegate.cc",
     "shell/browser/pref_store_delegate.h",
-    "shell/browser/relauncher.cc",
-    "shell/browser/relauncher.h",
     "shell/browser/relauncher_linux.cc",
     "shell/browser/relauncher_mac.cc",
     "shell/browser/relauncher_win.cc",
+    "shell/browser/relauncher.cc",
+    "shell/browser/relauncher.h",
+    "shell/browser/renderer_host/electron_render_message_filter.cc",
+    "shell/browser/renderer_host/electron_render_message_filter.h",
     "shell/browser/session_preferences.cc",
     "shell/browser/session_preferences.h",
     "shell/browser/special_storage_policy.cc",
     "shell/browser/special_storage_policy.h",
     "shell/browser/ui/accelerator_util.cc",
     "shell/browser/ui/accelerator_util.h",
-    "shell/browser/ui/electron_menu_model.cc",
-    "shell/browser/ui/electron_menu_model.h",
+    "shell/browser/ui/atom_menu_model.cc",
+    "shell/browser/ui/atom_menu_model.h",
     "shell/browser/ui/autofill_popup.cc",
     "shell/browser/ui/autofill_popup.h",
     "shell/browser/ui/certificate_trust.h",
     "shell/browser/ui/certificate_trust_mac.mm",
     "shell/browser/ui/certificate_trust_win.cc",
-    "shell/browser/ui/cocoa/NSColor+Hex.h",
-    "shell/browser/ui/cocoa/NSColor+Hex.mm",
-    "shell/browser/ui/cocoa/NSString+ANSI.h",
-    "shell/browser/ui/cocoa/NSString+ANSI.mm",
-    "shell/browser/ui/cocoa/electron_bundle_mover.h",
-    "shell/browser/ui/cocoa/electron_bundle_mover.mm",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
-    "shell/browser/ui/cocoa/electron_menu_controller.h",
-    "shell/browser/ui/cocoa/electron_menu_controller.mm",
-    "shell/browser/ui/cocoa/electron_native_widget_mac.h",
-    "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
-    "shell/browser/ui/cocoa/electron_ns_window.h",
-    "shell/browser/ui/cocoa/electron_ns_window.mm",
-    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
-    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
-    "shell/browser/ui/cocoa/electron_preview_item.h",
-    "shell/browser/ui/cocoa/electron_preview_item.mm",
-    "shell/browser/ui/cocoa/electron_touch_bar.h",
-    "shell/browser/ui/cocoa/electron_touch_bar.mm",
+    "shell/browser/ui/cocoa/atom_bundle_mover.h",
+    "shell/browser/ui/cocoa/atom_bundle_mover.mm",
+    "shell/browser/ui/cocoa/atom_menu_controller.h",
+    "shell/browser/ui/cocoa/atom_menu_controller.mm",
+    "shell/browser/ui/cocoa/atom_native_widget_mac.h",
+    "shell/browser/ui/cocoa/atom_native_widget_mac.mm",
+    "shell/browser/ui/cocoa/atom_ns_window.h",
+    "shell/browser/ui/cocoa/atom_ns_window.mm",
+    "shell/browser/ui/cocoa/atom_ns_window_delegate.h",
+    "shell/browser/ui/cocoa/atom_ns_window_delegate.mm",
+    "shell/browser/ui/cocoa/atom_preview_item.h",
+    "shell/browser/ui/cocoa/atom_preview_item.mm",
+    "shell/browser/ui/cocoa/atom_touch_bar.h",
+    "shell/browser/ui/cocoa/atom_touch_bar.mm",
     "shell/browser/ui/cocoa/delayed_native_view_host.cc",
     "shell/browser/ui/cocoa/delayed_native_view_host.h",
-    "shell/browser/ui/cocoa/event_dispatching_window.h",
-    "shell/browser/ui/cocoa/event_dispatching_window.mm",
-    "shell/browser/ui/cocoa/root_view_mac.h",
-    "shell/browser/ui/cocoa/root_view_mac.mm",
     "shell/browser/ui/cocoa/views_delegate_mac.h",
     "shell/browser/ui/cocoa/views_delegate_mac.mm",
+    "shell/browser/ui/cocoa/root_view_mac.mm",
+    "shell/browser/ui/cocoa/root_view_mac.h",
+    "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h",
+    "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.mm",
+    "shell/browser/ui/cocoa/event_dispatching_window.h",
+    "shell/browser/ui/cocoa/event_dispatching_window.mm",
     "shell/browser/ui/devtools_manager_delegate.cc",
     "shell/browser/ui/devtools_manager_delegate.h",
     "shell/browser/ui/devtools_ui.cc",
     "shell/browser/ui/devtools_ui.h",
-    "shell/browser/ui/drag_util.h",
     "shell/browser/ui/drag_util_mac.mm",
     "shell/browser/ui/drag_util_views.cc",
+    "shell/browser/ui/drag_util.h",
     "shell/browser/ui/file_dialog.h",
     "shell/browser/ui/file_dialog_gtk.cc",
     "shell/browser/ui/file_dialog_mac.mm",
     "shell/browser/ui/file_dialog_win.cc",
+    "shell/browser/ui/util_gtk.cc",
+    "shell/browser/ui/util_gtk.h",
     "shell/browser/ui/inspectable_web_contents.cc",
     "shell/browser/ui/inspectable_web_contents.h",
     "shell/browser/ui/inspectable_web_contents_delegate.h",
@@ -356,17 +340,20 @@ filenames = {
     "shell/browser/ui/message_box_gtk.cc",
     "shell/browser/ui/message_box_mac.mm",
     "shell/browser/ui/message_box_win.cc",
+    "shell/browser/ui/cocoa/NSColor+Hex.mm",
+    "shell/browser/ui/cocoa/NSColor+Hex.h",
+    "shell/browser/ui/cocoa/NSString+ANSI.mm",
+    "shell/browser/ui/cocoa/NSString+ANSI.h",
     "shell/browser/ui/tray_icon.cc",
     "shell/browser/ui/tray_icon.h",
-    "shell/browser/ui/tray_icon_cocoa.h",
-    "shell/browser/ui/tray_icon_cocoa.mm",
     "shell/browser/ui/tray_icon_gtk.cc",
     "shell/browser/ui/tray_icon_gtk.h",
+    "shell/browser/ui/tray_icon_cocoa.h",
+    "shell/browser/ui/tray_icon_cocoa.mm",
     "shell/browser/ui/tray_icon_observer.h",
     "shell/browser/ui/tray_icon_win.cc",
-    "shell/browser/ui/views/electron_views_delegate.cc",
-    "shell/browser/ui/views/electron_views_delegate_win.cc",
-    "shell/browser/ui/views/electron_views_delegate.h",
+    "shell/browser/ui/views/atom_views_delegate.cc",
+    "shell/browser/ui/views/atom_views_delegate.h",
     "shell/browser/ui/views/autofill_popup_view.cc",
     "shell/browser/ui/views/autofill_popup_view.h",
     "shell/browser/ui/views/frameless_view.cc",
@@ -389,16 +376,16 @@ filenames = {
     "shell/browser/ui/views/submenu_button.h",
     "shell/browser/ui/views/win_frame_view.cc",
     "shell/browser/ui/views/win_frame_view.h",
-    "shell/browser/ui/win/electron_desktop_native_widget_aura.cc",
-    "shell/browser/ui/win/electron_desktop_native_widget_aura.h",
-    "shell/browser/ui/win/electron_desktop_window_tree_host_win.cc",
-    "shell/browser/ui/win/electron_desktop_window_tree_host_win.h",
+    "shell/browser/ui/win/atom_desktop_native_widget_aura.cc",
+    "shell/browser/ui/win/atom_desktop_native_widget_aura.h",
+    "shell/browser/ui/win/atom_desktop_window_tree_host_win.cc",
+    "shell/browser/ui/win/atom_desktop_window_tree_host_win.h",
     "shell/browser/ui/win/jump_list.cc",
     "shell/browser/ui/win/jump_list.h",
-    "shell/browser/ui/win/notify_icon.cc",
-    "shell/browser/ui/win/notify_icon.h",
     "shell/browser/ui/win/notify_icon_host.cc",
     "shell/browser/ui/win/notify_icon_host.h",
+    "shell/browser/ui/win/notify_icon.cc",
+    "shell/browser/ui/win/notify_icon.h",
     "shell/browser/ui/win/taskbar_host.cc",
     "shell/browser/ui/win/taskbar_host.h",
     "shell/browser/ui/x/event_disabler.cc",
@@ -409,6 +396,8 @@ filenames = {
     "shell/browser/ui/x/x_window_utils.h",
     "shell/browser/unresponsive_suppressor.cc",
     "shell/browser/unresponsive_suppressor.h",
+    "shell/browser/win/scoped_hstring.cc",
+    "shell/browser/win/scoped_hstring.h",
     "shell/browser/web_contents_permission_helper.cc",
     "shell/browser/web_contents_permission_helper.h",
     "shell/browser/web_contents_preferences.cc",
@@ -421,48 +410,46 @@ filenames = {
     "shell/browser/web_view_guest_delegate.h",
     "shell/browser/web_view_manager.cc",
     "shell/browser/web_view_manager.h",
-    "shell/browser/win/scoped_hstring.cc",
-    "shell/browser/win/scoped_hstring.h",
     "shell/browser/window_list.cc",
     "shell/browser/window_list.h",
     "shell/browser/window_list_observer.h",
     "shell/browser/zoom_level_delegate.cc",
     "shell/browser/zoom_level_delegate.h",
-    "shell/common/api/electron_api_asar.cc",
-    "shell/common/api/electron_api_clipboard.cc",
-    "shell/common/api/electron_api_clipboard.h",
-    "shell/common/api/electron_api_clipboard_mac.mm",
-    "shell/common/api/electron_api_command_line.cc",
-    "shell/common/api/electron_api_crash_reporter.cc",
-    "shell/common/api/electron_api_key_weak_map.h",
-    "shell/common/api/electron_api_native_image.cc",
-    "shell/common/api/electron_api_native_image.h",
-    "shell/common/api/electron_api_native_image_mac.mm",
-    "shell/common/api/electron_api_shell.cc",
-    "shell/common/api/electron_api_v8_util.cc",
-    "shell/common/api/constructor.h",
+    "shell/common/api/atom_api_asar.cc",
+    "shell/common/api/atom_api_clipboard.cc",
+    "shell/common/api/atom_api_clipboard.h",
+    "shell/common/api/atom_api_clipboard_mac.mm",
+    "shell/common/api/atom_api_command_line.cc",
+    "shell/common/api/atom_api_crash_reporter.cc",
+    "shell/common/api/atom_api_key_weak_map.h",
+    "shell/common/api/atom_api_native_image.cc",
+    "shell/common/api/atom_api_native_image.h",
+    "shell/common/api/atom_api_native_image_mac.mm",
+    "shell/common/api/atom_api_shell.cc",
+    "shell/common/api/atom_api_v8_util.cc",
     "shell/common/api/electron_bindings.cc",
     "shell/common/api/electron_bindings.h",
+    "shell/common/api/constructor.h",
     "shell/common/api/event_emitter_caller_deprecated.cc",
     "shell/common/api/event_emitter_caller_deprecated.h",
     "shell/common/api/features.cc",
     "shell/common/api/locker.cc",
     "shell/common/api/locker.h",
-    "shell/common/application_info.cc",
-    "shell/common/application_info.h",
-    "shell/common/application_info_linux.cc",
-    "shell/common/application_info_mac.mm",
-    "shell/common/application_info_win.cc",
     "shell/common/asar/archive.cc",
     "shell/common/asar/archive.h",
     "shell/common/asar/asar_util.cc",
     "shell/common/asar/asar_util.h",
     "shell/common/asar/scoped_temporary_file.cc",
     "shell/common/asar/scoped_temporary_file.h",
-    "shell/common/electron_command_line.cc",
-    "shell/common/electron_command_line.h",
-    "shell/common/electron_constants.cc",
-    "shell/common/electron_constants.h",
+    "shell/common/application_info_linux.cc",
+    "shell/common/application_info_mac.mm",
+    "shell/common/application_info_win.cc",
+    "shell/common/application_info.cc",
+    "shell/common/application_info.h",
+    "shell/common/atom_command_line.cc",
+    "shell/common/atom_command_line.h",
+    "shell/common/atom_constants.cc",
+    "shell/common/atom_constants.h",
     "shell/common/color_util.cc",
     "shell/common/color_util.h",
     "shell/common/crash_reporter/crash_reporter.cc",
@@ -471,16 +458,17 @@ filenames = {
     "shell/common/crash_reporter/crash_reporter_linux.h",
     "shell/common/crash_reporter/crash_reporter_mac.h",
     "shell/common/crash_reporter/crash_reporter_mac.mm",
-    "shell/common/crash_reporter/crash_reporter_win.cc",
     "shell/common/crash_reporter/crash_reporter_win.h",
+    "shell/common/crash_reporter/crash_reporter_win.cc",
     "shell/common/crash_reporter/linux/crash_dump_handler.cc",
     "shell/common/crash_reporter/linux/crash_dump_handler.h",
     "shell/common/crash_reporter/win/crash_service_main.cc",
     "shell/common/crash_reporter/win/crash_service_main.h",
-    "shell/common/deprecate_util.cc",
-    "shell/common/deprecate_util.h",
-    "shell/common/gin_converters/blink_converter_gin_adapter.h",
+    "shell/common/gin_converters/accelerator_converter.cc",
+    "shell/common/gin_converters/accelerator_converter.h",
     "shell/common/gin_converters/callback_converter.h",
+    "shell/common/gin_converters/content_converter.cc",
+    "shell/common/gin_converters/content_converter.h",
     "shell/common/gin_converters/file_dialog_converter.cc",
     "shell/common/gin_converters/file_dialog_converter.h",
     "shell/common/gin_converters/file_path_converter.h",
@@ -495,6 +483,7 @@ filenames = {
     "shell/common/gin_converters/net_converter.cc",
     "shell/common/gin_converters/net_converter.h",
     "shell/common/gin_converters/std_converter.h",
+    "shell/common/gin_converters/blink_converter_gin_adapter.h",
     "shell/common/gin_converters/value_converter_gin_adapter.h",
     "shell/common/gin_helper/arguments.cc",
     "shell/common/gin_helper/arguments.h",
@@ -505,42 +494,39 @@ filenames = {
     "shell/common/gin_helper/dictionary.h",
     "shell/common/gin_helper/error_thrower.cc",
     "shell/common/gin_helper/error_thrower.h",
-    "shell/common/gin_helper/event_emitter.cc",
-    "shell/common/gin_helper/event_emitter.h",
     "shell/common/gin_helper/event_emitter_caller.cc",
     "shell/common/gin_helper/event_emitter_caller.h",
+    "shell/common/gin_helper/event_emitter.cc",
+    "shell/common/gin_helper/event_emitter.h",
     "shell/common/gin_helper/function_template.cc",
     "shell/common/gin_helper/function_template.h",
     "shell/common/gin_helper/object_template_builder.cc",
     "shell/common/gin_helper/object_template_builder.h",
+    "shell/common/gin_helper/trackable_object.cc",
+    "shell/common/gin_helper/trackable_object.h",
     "shell/common/heap_snapshot.cc",
     "shell/common/heap_snapshot.h",
     "shell/common/key_weak_map.h",
     "shell/common/keyboard_util.cc",
     "shell/common/keyboard_util.h",
-    "shell/common/mac/main_application_bundle.h",
-    "shell/common/mac/main_application_bundle.mm",
+    "shell/common/deprecate_util.cc",
+    "shell/common/deprecate_util.h",
     "shell/common/mouse_util.cc",
     "shell/common/mouse_util.h",
-    "shell/common/native_mate_converters/accelerator_converter.cc",
-    "shell/common/native_mate_converters/accelerator_converter.h",
+    "shell/common/mac/main_application_bundle.h",
+    "shell/common/mac/main_application_bundle.mm",
     "shell/common/native_mate_converters/blink_converter.cc",
     "shell/common/native_mate_converters/blink_converter.h",
     "shell/common/native_mate_converters/callback_converter_deprecated.cc",
     "shell/common/native_mate_converters/callback_converter_deprecated.h",
-    "shell/common/native_mate_converters/content_converter.cc",
-    "shell/common/native_mate_converters/content_converter.h",
     "shell/common/native_mate_converters/file_dialog_converter.h",
     "shell/common/native_mate_converters/file_path_converter.h",
     "shell/common/native_mate_converters/gurl_converter.h",
     "shell/common/native_mate_converters/image_converter.h",
     "shell/common/native_mate_converters/native_window_converter.h",
     "shell/common/native_mate_converters/net_converter.h",
-    "shell/common/native_mate_converters/network_converter.cc",
-    "shell/common/native_mate_converters/network_converter.h",
     "shell/common/native_mate_converters/once_callback.h",
     "shell/common/native_mate_converters/string16_converter.h",
-    "shell/common/native_mate_converters/ui_base_types_converter.h",
     "shell/common/native_mate_converters/v8_value_converter.cc",
     "shell/common/native_mate_converters/v8_value_converter.h",
     "shell/common/native_mate_converters/value_converter.cc",
@@ -554,50 +540,51 @@ filenames = {
     "shell/common/node_bindings_win.cc",
     "shell/common/node_bindings_win.h",
     "shell/common/node_includes.h",
-    "shell/common/node_util.cc",
     "shell/common/node_util.h",
+    "shell/common/node_util.cc",
     "shell/common/options_switches.cc",
     "shell/common/options_switches.h",
     "shell/common/platform_util.h",
     "shell/common/platform_util_linux.cc",
     "shell/common/platform_util_mac.mm",
     "shell/common/platform_util_win.cc",
-    "shell/common/promise_util.cc",
     "shell/common/promise_util.h",
-    "shell/common/skia_util.cc",
+    "shell/common/promise_util.cc",
     "shell/common/skia_util.h",
-    "shell/renderer/api/context_bridge/object_cache.cc",
-    "shell/renderer/api/context_bridge/object_cache.h",
-    "shell/renderer/api/context_bridge/render_frame_function_store.cc",
-    "shell/renderer/api/context_bridge/render_frame_function_store.h",
-    "shell/renderer/api/electron_api_context_bridge.cc",
-    "shell/renderer/api/electron_api_context_bridge.h",
-    "shell/renderer/api/electron_api_renderer_ipc.cc",
-    "shell/renderer/api/electron_api_spell_check_client.cc",
-    "shell/renderer/api/electron_api_spell_check_client.h",
-    "shell/renderer/api/electron_api_web_frame.cc",
-    "shell/renderer/electron_autofill_agent.cc",
-    "shell/renderer/electron_autofill_agent.h",
-    "shell/renderer/electron_render_frame_observer.cc",
-    "shell/renderer/electron_render_frame_observer.h",
-    "shell/renderer/electron_renderer_client.cc",
-    "shell/renderer/electron_renderer_client.h",
-    "shell/renderer/electron_sandboxed_renderer_client.cc",
-    "shell/renderer/electron_sandboxed_renderer_client.h",
-    "shell/renderer/browser_exposed_renderer_interfaces.cc",
-    "shell/renderer/browser_exposed_renderer_interfaces.h",
+    "shell/common/skia_util.cc",
+    "shell/renderer/api/context_bridge/render_frame_context_bridge_store.cc",
+    "shell/renderer/api/context_bridge/render_frame_context_bridge_store.h",
+    "shell/renderer/api/atom_api_context_bridge.cc",
+    "shell/renderer/api/atom_api_context_bridge.h",
+    "shell/renderer/api/atom_api_renderer_ipc.cc",
+    "shell/renderer/api/atom_api_spell_check_client.cc",
+    "shell/renderer/api/atom_api_spell_check_client.h",
+    "shell/renderer/api/atom_api_web_frame.cc",
+    "shell/renderer/atom_autofill_agent.cc",
+    "shell/renderer/atom_autofill_agent.h",
+    "shell/renderer/atom_render_frame_observer.cc",
+    "shell/renderer/atom_render_frame_observer.h",
+    "shell/renderer/atom_renderer_client.cc",
+    "shell/renderer/atom_renderer_client.h",
     "shell/renderer/content_settings_observer.cc",
     "shell/renderer/content_settings_observer.h",
     "shell/renderer/electron_api_service_impl.cc",
     "shell/renderer/electron_api_service_impl.h",
+    "shell/renderer/atom_sandboxed_renderer_client.cc",
+    "shell/renderer/atom_sandboxed_renderer_client.h",
     "shell/renderer/guest_view_container.cc",
     "shell/renderer/guest_view_container.h",
     "shell/renderer/renderer_client_base.cc",
     "shell/renderer/renderer_client_base.h",
     "shell/renderer/web_worker_observer.cc",
     "shell/renderer/web_worker_observer.h",
-    "shell/utility/electron_content_utility_client.cc",
-    "shell/utility/electron_content_utility_client.h",
+    "shell/utility/atom_content_utility_client.cc",
+    "shell/utility/atom_content_utility_client.h",
+    "chromium_src/chrome/browser/process_singleton_posix.cc",
+    "chromium_src/chrome/browser/process_singleton_win.cc",
+    "chromium_src/chrome/browser/process_singleton.h",
+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
   ]
 
   lib_sources_nss = [
@@ -606,43 +593,43 @@ filenames = {
   ]
 
   lib_sources_extensions = [
-    "shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc",
-    "shell/browser/extensions/api/runtime/electron_runtime_api_delegate.h",
-    "shell/browser/extensions/electron_extensions_browser_client.cc",
-    "shell/browser/extensions/electron_extensions_browser_client.h",
-    "shell/browser/extensions/electron_browser_context_keyed_service_factories.cc",
-    "shell/browser/extensions/electron_browser_context_keyed_service_factories.h",
-    "shell/browser/extensions/electron_display_info_provider.cc",
-    "shell/browser/extensions/electron_display_info_provider.h",
-    "shell/browser/extensions/electron_extension_host_delegate.cc",
-    "shell/browser/extensions/electron_extension_host_delegate.h",
-    "shell/browser/extensions/electron_extension_loader.cc",
-    "shell/browser/extensions/electron_extension_loader.h",
-    "shell/browser/extensions/electron_extension_system.cc",
-    "shell/browser/extensions/electron_extension_system.h",
-    "shell/browser/extensions/electron_extension_system_factory.cc",
-    "shell/browser/extensions/electron_extension_system_factory.h",
-    "shell/browser/extensions/electron_extension_web_contents_observer.cc",
-    "shell/browser/extensions/electron_extension_web_contents_observer.h",
-    "shell/browser/extensions/electron_navigation_ui_data.cc",
-    "shell/browser/extensions/electron_navigation_ui_data.h",
-    "shell/common/extensions/electron_extensions_api_provider.cc",
-    "shell/common/extensions/electron_extensions_api_provider.h",
-    "shell/common/extensions/electron_extensions_client.cc",
-    "shell/common/extensions/electron_extensions_client.h",
-    "shell/renderer/extensions/electron_extensions_renderer_client.cc",
-    "shell/renderer/extensions/electron_extensions_renderer_client.h",
+    "shell/browser/extensions/api/runtime/atom_runtime_api_delegate.cc",
+    "shell/browser/extensions/api/runtime/atom_runtime_api_delegate.h",
+    "shell/browser/extensions/atom_extensions_browser_client.cc",
+    "shell/browser/extensions/atom_extensions_browser_client.h",
+    "shell/browser/extensions/atom_browser_context_keyed_service_factories.cc",
+    "shell/browser/extensions/atom_browser_context_keyed_service_factories.h",
+    "shell/browser/extensions/atom_display_info_provider.cc",
+    "shell/browser/extensions/atom_display_info_provider.h",
+    "shell/browser/extensions/atom_extension_host_delegate.cc",
+    "shell/browser/extensions/atom_extension_host_delegate.h",
+    "shell/browser/extensions/atom_extension_loader.cc",
+    "shell/browser/extensions/atom_extension_loader.h",
+    "shell/browser/extensions/atom_extension_system.cc",
+    "shell/browser/extensions/atom_extension_system.h",
+    "shell/browser/extensions/atom_extension_system_factory.cc",
+    "shell/browser/extensions/atom_extension_system_factory.h",
+    "shell/browser/extensions/atom_extension_web_contents_observer.cc",
+    "shell/browser/extensions/atom_extension_web_contents_observer.h",
+    "shell/browser/extensions/atom_navigation_ui_data.cc",
+    "shell/browser/extensions/atom_navigation_ui_data.h",
+    "shell/common/extensions/atom_extensions_api_provider.cc",
+    "shell/common/extensions/atom_extensions_api_provider.h",
+    "shell/common/extensions/atom_extensions_client.cc",
+    "shell/common/extensions/atom_extensions_client.h",
+    "shell/renderer/extensions/atom_extensions_renderer_client.cc",
+    "shell/renderer/extensions/atom_extensions_renderer_client.h",
   ]
 
   app_sources = [
-    "shell/app/electron_main.cc",
-    "shell/app/electron_main.h",
+    "shell/app/atom_main.cc",
+    "shell/app/atom_main.h",
   ]
 
   framework_sources = [
-    "shell/app/electron_library_main.h",
-    "shell/app/electron_library_main.mm",
+    "shell/app/atom_library_main.h",
+    "shell/app/atom_library_main.mm",
   ]
 
-  login_helper_sources = [ "shell/app/electron_login_helper.mm" ]
+  login_helper_sources = [ "shell/app/atom_login_helper.mm" ]
 }

filenames.hunspell.gni

@@ -1,60 +0,0 @@
-hunspell_dictionaries = [
-  "//third_party/hunspell_dictionaries/af-ZA-3-0.bdic",
-  "//third_party/hunspell_dictionaries/bg-BG-3-0.bdic",
-  "//third_party/hunspell_dictionaries/ca-ES-3-0.bdic",
-  "//third_party/hunspell_dictionaries/cs-CZ-3-0.bdic",
-  "//third_party/hunspell_dictionaries/cy-GB-1-0.bdic",
-  "//third_party/hunspell_dictionaries/da-DK-3-0.bdic",
-  "//third_party/hunspell_dictionaries/de-DE-3-0.bdic",
-  "//third_party/hunspell_dictionaries/el-GR-3-0.bdic",
-  "//third_party/hunspell_dictionaries/en-AU-8-0.bdic",
-  "//third_party/hunspell_dictionaries/en-CA-8-0.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-8-0.bdic",
-  "//third_party/hunspell_dictionaries/en-US-8-0.bdic",
-  "//third_party/hunspell_dictionaries/es-ES-3-0.bdic",
-  "//third_party/hunspell_dictionaries/et-EE-3-0.bdic",
-  "//third_party/hunspell_dictionaries/fa-IR-8-0.bdic",
-  "//third_party/hunspell_dictionaries/fo-FO-3-0.bdic",
-  "//third_party/hunspell_dictionaries/fr-FR-3-0.bdic",
-  "//third_party/hunspell_dictionaries/he-IL-3-0.bdic",
-  "//third_party/hunspell_dictionaries/hi-IN-3-0.bdic",
-  "//third_party/hunspell_dictionaries/hr-HR-3-0.bdic",
-  "//third_party/hunspell_dictionaries/hu-HU-3-0.bdic",
-  "//third_party/hunspell_dictionaries/hy-1-0.bdic",
-  "//third_party/hunspell_dictionaries/id-ID-3-0.bdic",
-  "//third_party/hunspell_dictionaries/it-IT-3-0.bdic",
-  "//third_party/hunspell_dictionaries/ko-3-0.bdic",
-  "//third_party/hunspell_dictionaries/lt-LT-3-0.bdic",
-  "//third_party/hunspell_dictionaries/lv-LV-3-0.bdic",
-  "//third_party/hunspell_dictionaries/nb-NO-3-0.bdic",
-  "//third_party/hunspell_dictionaries/nl-NL-3-0.bdic",
-  "//third_party/hunspell_dictionaries/pl-PL-3-0.bdic",
-  "//third_party/hunspell_dictionaries/pt-BR-3-0.bdic",
-  "//third_party/hunspell_dictionaries/pt-PT-3-0.bdic",
-  "//third_party/hunspell_dictionaries/ro-RO-3-0.bdic",
-  "//third_party/hunspell_dictionaries/ru-RU-3-0.bdic",
-  "//third_party/hunspell_dictionaries/sh-3-0.bdic",
-  "//third_party/hunspell_dictionaries/sh-4-0.bdic",
-  "//third_party/hunspell_dictionaries/sk-SK-3-0.bdic",
-  "//third_party/hunspell_dictionaries/sl-SI-3-0.bdic",
-  "//third_party/hunspell_dictionaries/sq-3-0.bdic",
-  "//third_party/hunspell_dictionaries/sr-3-0.bdic",
-  "//third_party/hunspell_dictionaries/sr-4-0.bdic",
-  "//third_party/hunspell_dictionaries/sv-SE-3-0.bdic",
-  "//third_party/hunspell_dictionaries/ta-IN-3-0.bdic",
-  "//third_party/hunspell_dictionaries/tg-TG-5-0.bdic",
-  "//third_party/hunspell_dictionaries/tr-TR-4-0.bdic",
-  "//third_party/hunspell_dictionaries/uk-UA-3-0.bdic",
-  "//third_party/hunspell_dictionaries/vi-VN-3-0.bdic",
-  "//third_party/hunspell_dictionaries/xx-XX-3-0.bdic",
-]
-
-hunspell_licenses = [
-  "//third_party/hunspell_dictionaries/COPYING",
-  "//third_party/hunspell_dictionaries/COPYING.Apache",
-  "//third_party/hunspell_dictionaries/COPYING.LESSER",
-  "//third_party/hunspell_dictionaries/COPYING.LGPL",
-  "//third_party/hunspell_dictionaries/COPYING.MIT",
-  "//third_party/hunspell_dictionaries/COPYING.MPL",
-  "//third_party/hunspell_dictionaries/LICENSE",
-]

lib/browser/api/app.ts

@@ -105,9 +105,9 @@ if (process.platform === 'linux') {
 }
 
 // Routes the events to webContents.
-const events = ['certificate-error', 'select-client-certificate']
+const events = ['login', 'certificate-error', 'select-client-certificate']
 for (const name of events) {
-  app.on(name as 'certificate-error', (event, webContents, ...args: any[]) => {
+  app.on(name as 'login', (event, webContents, ...args: any[]) => {
     webContents.emit(name, event, ...args)
   })
 }

lib/browser/api/browser-window.js

@@ -33,7 +33,7 @@ BrowserWindow.prototype._init = function () {
 
   // Hide the auto-hide menu when webContents is focused.
   this.webContents.on('activate', () => {
-    if (process.platform !== 'darwin' && this.autoHideMenuBar && this.isMenuBarVisible()) {
+    if (process.platform !== 'darwin' && this.isMenuBarAutoHide() && this.isMenuBarVisible()) {
       this.setMenuBarVisibility(false)
     }
   })
@@ -116,7 +116,7 @@ BrowserWindow.getFocusedWindow = () => {
 
 BrowserWindow.fromWebContents = (webContents) => {
   for (const window of BrowserWindow.getAllWindows()) {
-    if (window.webContents && window.webContents.equal(webContents)) return window
+    if (window.webContents.equal(webContents)) return window
   }
 
   return null

lib/browser/api/dialog.js

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

lib/browser/api/exports/electron.ts

@@ -2,7 +2,5 @@ import { defineProperties } from '@electron/internal/common/define-properties'
 import { commonModuleList } from '@electron/internal/common/api/module-list'
 import { browserModuleList } from '@electron/internal/browser/api/module-list'
 
-module.exports = {}
-
-defineProperties(module.exports, commonModuleList)
-defineProperties(module.exports, browserModuleList)
+defineProperties(exports, commonModuleList)
+defineProperties(exports, browserModuleList)

lib/browser/api/module-keys.js

@@ -21,7 +21,6 @@ module.exports = [
   { name: 'inAppPurchase' },
   { name: 'Menu' },
   { name: 'MenuItem' },
-  { name: 'nativeTheme' },
   { name: 'net' },
   { name: 'netLog' },
   { name: 'Notification' },

lib/browser/api/net.js

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

lib/browser/api/power-monitor.ts

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

lib/browser/api/session.js

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

lib/browser/api/web-contents.js

@@ -7,7 +7,6 @@ const path = require('path')
 const url = require('url')
 const { app, ipcMain, session, deprecate } = electron
 
-const { internalWindowOpen } = require('@electron/internal/browser/guest-window-manager')
 const NavigationController = require('@electron/internal/browser/navigation-controller')
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
@@ -72,6 +71,7 @@ const defaultPrintingSetting = {
   headerFooterEnabled: false,
   marginsType: 0,
   isFirstRequest: false,
+  requestID: getNextId(),
   previewUIID: 0,
   previewModifiable: true,
   printToPDF: true,
@@ -184,33 +184,27 @@ for (const method of webFrameMethods) {
   }
 }
 
-const waitTillCanExecuteJavaScript = async (webContents) => {
-  if (webContents.getURL() && !webContents.isLoadingMainFrame()) return
-
-  return new Promise((resolve) => {
-    webContents.once('did-stop-loading', () => {
-      resolve()
-    })
-  })
+const executeJavaScript = (contents, code, hasUserGesture) => {
+  return ipcMainUtils.invokeInWebContents(contents, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScript', code, hasUserGesture)
 }
 
 // Make sure WebContents::executeJavaScript would run the code only when the
 // WebContents has been loaded.
-WebContents.prototype.executeJavaScript = async function (code, hasUserGesture) {
-  await waitTillCanExecuteJavaScript(this)
-  return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScript', code, hasUserGesture)
-}
-WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (code, hasUserGesture) {
-  await waitTillCanExecuteJavaScript(this)
-  return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScriptInIsolatedWorld', code, hasUserGesture)
+WebContents.prototype.executeJavaScript = function (code, hasUserGesture) {
+  if (this.getURL() && !this.isLoadingMainFrame()) {
+    return executeJavaScript(this, code, hasUserGesture)
+  } else {
+    return new Promise((resolve, reject) => {
+      this.once('did-stop-loading', () => {
+        executeJavaScript(this, code, hasUserGesture).then(resolve, reject)
+      })
+    })
+  }
 }
 
 // Translate the options of printToPDF.
 WebContents.prototype.printToPDF = function (options) {
-  const printingSetting = {
-    ...defaultPrintingSetting,
-    requestID: getNextId()
-  }
+  const printingSetting = Object.assign({}, defaultPrintingSetting)
   if (options.landscape) {
     printingSetting.landscape = options.landscape
   }
@@ -255,8 +249,6 @@ WebContents.prototype.printToPDF = function (options) {
 
   // Chromium expects this in a 0-100 range number, not as float
   printingSetting.scaleFactor = Math.ceil(printingSetting.scaleFactor) % 100
-  // PrinterType enum from //printing/print_job_constants.h
-  printingSetting.printerType = 2
   if (features.isPrintingEnabled()) {
     return this._printToPDF(printingSetting)
   } else {
@@ -277,7 +269,6 @@ WebContents.prototype.getPrinters = function () {
     return this._getPrinters()
   } else {
     console.error('Error: Printing feature is disabled.')
-    return []
   }
 }
 
@@ -320,14 +311,8 @@ const addReturnValueToEvent = (event) => {
   })
 }
 
-let warnedAboutRendererProcessReuse = false
-
 // Add JavaScript wrappers for WebContents class.
 WebContents.prototype._init = function () {
-  if (!process.noDeprecation && !warnedAboutRendererProcessReuse && app._allowRendererProcessReuseIsDefaultValue) {
-    deprecate.log('The default value of app.allowRendererProcessReuse is deprecated, it is currently "false".  It will change to be "true" in Electron 9.  For more information please check https://github.com/electron/electron/issues/18397')
-    warnedAboutRendererProcessReuse = true
-  }
   // The navigation controller.
   NavigationController.call(this, this)
 
@@ -405,7 +390,9 @@ WebContents.prototype._init = function () {
         width: 800,
         height: 600
       }
-      internalWindowOpen(event, url, referrer, frameName, disposition, options, additionalFeatures, postData)
+      ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN',
+        event, url, referrer, frameName, disposition,
+        options, additionalFeatures, postData)
     })
 
     // Create a new browser window for the native implementation of
@@ -427,14 +414,11 @@ WebContents.prototype._init = function () {
         webContents
       }
       const referrer = { url: '', policy: 'default' }
-      internalWindowOpen(event, url, referrer, frameName, disposition, options)
+      ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN',
+        event, url, referrer, frameName, disposition, options)
     })
   }
 
-  this.on('login', (event, ...args) => {
-    app.emit('login', event, this, ...args)
-  })
-
   const event = process.electronBinding('event').createEmpty()
   app.emit('web-contents-created', event, this)
 }

lib/browser/guest-view-manager.js

@@ -4,8 +4,7 @@ const { webContents } = require('electron')
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
 const parseFeaturesString = require('@electron/internal/common/parse-features-string')
-const { syncMethods, asyncMethods, properties } = require('@electron/internal/common/web-view-methods')
-const { serialize } = require('@electron/internal/common/type-utils')
+const { syncMethods, asyncMethods } = require('@electron/internal/common/web-view-methods')
 
 // Doesn't exist in early initialization.
 let webViewManager = null
@@ -201,7 +200,7 @@ const attachGuest = function (event, embedderFrameId, elementInstanceId, guestIn
     nodeIntegrationInSubFrames: params.nodeintegrationinsubframes != null ? params.nodeintegrationinsubframes : false,
     enableRemoteModule: params.enableremotemodule,
     plugins: params.plugins,
-    zoomFactor: embedder.zoomFactor,
+    zoomFactor: embedder.getZoomFactor(),
     disablePopups: !params.allowpopups,
     webSecurity: !params.disablewebsecurity,
     enableBlinkFeatures: params.blinkfeatures,
@@ -388,30 +387,6 @@ handleMessageSync('ELECTRON_GUEST_VIEW_MANAGER_CALL', function (event, guestInst
   return guest[method](...args)
 })
 
-handleMessageSync('ELECTRON_GUEST_VIEW_MANAGER_PROPERTY_GET', function (event, guestInstanceId, property) {
-  const guest = getGuestForWebContents(guestInstanceId, event.sender)
-  if (!properties.has(property)) {
-    throw new Error(`Invalid property: ${property}`)
-  }
-
-  return guest[property]
-})
-
-handleMessageSync('ELECTRON_GUEST_VIEW_MANAGER_PROPERTY_SET', function (event, guestInstanceId, property, val) {
-  const guest = getGuestForWebContents(guestInstanceId, event.sender)
-  if (!properties.has(property)) {
-    throw new Error(`Invalid property: ${property}`)
-  }
-
-  guest[property] = val
-})
-
-handleMessage('ELECTRON_GUEST_VIEW_MANAGER_CAPTURE_PAGE', async function (event, guestInstanceId, args) {
-  const guest = getGuestForWebContents(guestInstanceId, event.sender)
-
-  return serialize(await guest.capturePage(...args))
-})
-
 // Returns WebContents from its guest id hosted in given webContents.
 const getGuestForWebContents = function (guestInstanceId, contents) {
   const guest = getGuest(guestInstanceId)

lib/browser/guest-window-manager.js

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

lib/browser/init.ts

@@ -18,10 +18,8 @@ require('@electron/internal/common/init')
 if (process.platform === 'win32') {
   // Redirect node's console to use our own implementations, since node can not
   // handle console output when running as GUI program.
-  const consoleLog = (...args: any[]) => {
-    // @ts-ignore this typing is incorrect; 'format' is an optional parameter
-    // See https://nodejs.org/api/util.html#util_util_format_format_args
-    return process.log(util.format(...args) + '\n')
+  const consoleLog = (format: any, ...args: any[]) => {
+    return process.log(util.format(format, ...args) + '\n')
   }
   const streamWrite: NodeJS.WritableStream['write'] = function (chunk: Buffer | string, encoding?: any, callback?: Function) {
     if (Buffer.isBuffer(chunk)) {
@@ -197,14 +195,13 @@ app.on('window-all-closed', () => {
   }
 })
 
-const { setDefaultApplicationMenu } = require('@electron/internal/browser/default-menu')
-
-// Create default menu.
-//
-// Note that the task must be added before loading any app, so we can make sure
-// the call is maded before any user window is created, otherwise the default
-// menu may show even when user explicitly hides the menu.
-app.once('ready', setDefaultApplicationMenu)
+Promise.all([
+  import('@electron/internal/browser/default-menu'),
+  app.whenReady()
+]).then(([{ setDefaultApplicationMenu }]) => {
+  // Create default menu
+  setDefaultApplicationMenu()
+})
 
 if (packagePath) {
   // Finally load app's main.js and transfer control to C++.

lib/browser/navigation-controller.js

@@ -152,8 +152,7 @@ const NavigationController = (function () {
   NavigationController.prototype.reloadIgnoringCache = function () {
     this.pendingIndex = this.currentIndex
     return this.webContents._loadURL(this.getURL(), {
-      extraHeaders: 'pragma: no-cache\n',
-      reloadIgnoringCache: true
+      extraHeaders: 'pragma: no-cache\n'
     })
   }
 

lib/browser/remote/server.ts

@@ -5,7 +5,7 @@ import { EventEmitter } from 'events'
 import objectsRegistry from './objects-registry'
 import { ipcMainInternal } from '../ipc-main-internal'
 import * as guestViewManager from '@electron/internal/browser/guest-view-manager'
-import { isPromise, isSerializableObject } from '@electron/internal/common/type-utils'
+import { isPromise, isSerializableObject } from '@electron/internal/common/remote/type-utils'
 
 const v8Util = process.electronBinding('v8_util')
 const eventBinding = process.electronBinding('event')
@@ -309,7 +309,7 @@ const unwrapArgs = function (sender: electron.WebContents, frameId: number, cont
         v8Util.setHiddenValue(callIntoRenderer, 'location', meta.location)
         Object.defineProperty(callIntoRenderer, 'length', { value: meta.length })
 
-        v8Util.setRemoteCallbackFreer(callIntoRenderer, frameId, contextId, meta.id, sender)
+        v8Util.setRemoteCallbackFreer(callIntoRenderer, contextId, meta.id, sender)
         rendererFunctions.set(objectId, callIntoRenderer)
         return callIntoRenderer
       }

lib/browser/rpc-server.js

@@ -11,7 +11,7 @@ const { crashReporterInit } = require('@electron/internal/browser/crash-reporter
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
 const guestViewManager = require('@electron/internal/browser/guest-view-manager')
-const typeUtils = require('@electron/internal/common/type-utils')
+const clipboardUtils = require('@electron/internal/common/clipboard-utils')
 
 const emitCustomEvent = function (contents, eventName, ...args) {
   const event = eventBinding.createWithSender(contents)
@@ -62,7 +62,7 @@ ipcMainUtils.handleSync('ELECTRON_BROWSER_CLIPBOARD', function (event, method, .
     throw new Error(`Invalid method: ${method}`)
   }
 
-  return typeUtils.serialize(electron.clipboard[method](...typeUtils.deserialize(args)))
+  return clipboardUtils.serialize(electron.clipboard[method](...clipboardUtils.deserialize(args)))
 })
 
 if (features.isDesktopCapturerEnabled()) {
@@ -112,15 +112,11 @@ ipcMainUtils.handleSync('ELECTRON_BROWSER_SANDBOX_LOAD', async function (event)
     contentScripts = getContentScripts()
   }
 
-  const webPreferences = event.sender.getLastWebPreferences() || {}
-
   return {
     contentScripts,
     preloadScripts: await Promise.all(preloadPaths.map(path => getPreloadScript(path))),
     isRemoteModuleEnabled: isRemoteModuleEnabled(event.sender),
     isWebViewTagEnabled: guestViewManager.isWebViewTagEnabled(event.sender),
-    guestInstanceId: webPreferences.guestInstanceId,
-    openerId: webPreferences.openerId,
     process: {
       arch: process.arch,
       platform: process.platform,

lib/common/api/clipboard.js

@@ -4,13 +4,13 @@ const clipboard = process.electronBinding('clipboard')
 
 if (process.type === 'renderer') {
   const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils')
-  const typeUtils = require('@electron/internal/common/type-utils')
+  const clipboardUtils = require('@electron/internal/common/clipboard-utils')
 
   const makeRemoteMethod = function (method) {
     return (...args) => {
-      args = typeUtils.serialize(args)
+      args = clipboardUtils.serialize(args)
       const result = ipcRendererUtils.invokeSync('ELECTRON_BROWSER_CLIPBOARD', method, ...args)
-      return typeUtils.deserialize(result)
+      return clipboardUtils.deserialize(result)
     }
   }
 

lib/common/asar.js

@@ -8,8 +8,6 @@
   const path = require('path')
   const util = require('util')
 
-  const Promise = global.Promise
-
   const envNoAsar = process.env.ELECTRON_NO_ASAR &&
       process.type !== 'browser' &&
       process.type !== 'renderer'

lib/common/clipboard-utils.ts

@@ -1,32 +1,5 @@
 const { nativeImage, NativeImage } = process.electronBinding('native_image')
 
-export function isPromise (val: any) {
-  return (
-    val &&
-    val.then &&
-    val.then instanceof Function &&
-    val.constructor &&
-    val.constructor.reject &&
-    val.constructor.reject instanceof Function &&
-    val.constructor.resolve &&
-    val.constructor.resolve instanceof Function
-  )
-}
-
-const serializableTypes = [
-  Boolean,
-  Number,
-  String,
-  Date,
-  Error,
-  RegExp,
-  ArrayBuffer
-]
-
-export function isSerializableObject (value: any) {
-  return value === null || ArrayBuffer.isView(value) || serializableTypes.some(type => value instanceof type)
-}
-
 const objectMap = function (source: Object, mapper: (value: any) => any) {
   const sourceEntries = Object.entries(source)
   const targetEntries = sourceEntries.map(([key, val]) => [key, mapper(val)])
@@ -42,7 +15,7 @@ export function serialize (value: any): any {
     }
   } else if (Array.isArray(value)) {
     return value.map(serialize)
-  } else if (isSerializableObject(value)) {
+  } else if (value instanceof Buffer) {
     return value
   } else if (value instanceof Object) {
     return objectMap(value, serialize)
@@ -56,7 +29,7 @@ export function deserialize (value: any): any {
     return nativeImage.createFromBitmap(value.buffer, value.size)
   } else if (Array.isArray(value)) {
     return value.map(deserialize)
-  } else if (isSerializableObject(value)) {
+  } else if (value instanceof Buffer) {
     return value
   } else if (value instanceof Object) {
     return objectMap(value, deserialize)

lib/common/crash-reporter.js

@@ -3,7 +3,7 @@
 const binding = process.electronBinding('crash_reporter')
 
 class CrashReporter {
-  constructor () {
+  contructor () {
     this.productName = null
     this.crashesDirectory = null
   }
@@ -54,12 +54,7 @@ class CrashReporter {
   }
 
   getUploadedReports () {
-    const crashDir = this.getCrashesDirectory()
-    if (!crashDir) {
-      throw new Error('crashReporter has not been started')
-    }
-
-    return binding.getUploadedReports(crashDir)
+    return binding.getUploadedReports(this.getCrashesDirectory())
   }
 
   getCrashesDirectory () {

lib/common/remote/type-utils.ts

@@ -0,0 +1,25 @@
+export function isPromise (val: any) {
+  return (
+    val &&
+    val.then &&
+    val.then instanceof Function &&
+    val.constructor &&
+    val.constructor.reject &&
+    val.constructor.reject instanceof Function &&
+    val.constructor.resolve &&
+    val.constructor.resolve instanceof Function
+  )
+}
+
+const serializableTypes = [
+  Boolean,
+  Number,
+  String,
+  Date,
+  RegExp,
+  ArrayBuffer
+]
+
+export function isSerializableObject (value: any) {
+  return value === null || ArrayBuffer.isView(value) || serializableTypes.some(type => value instanceof type)
+}

lib/common/web-view-methods.ts

@@ -50,16 +50,9 @@ export const syncMethods = new Set([
   'setZoomLevel'
 ])
 
-export const properties = new Set([
-  'audioMuted',
-  'userAgent',
-  'zoomLevel',
-  'zoomFactor',
-  'frameRate'
-])
-
 export const asyncMethods = new Set([
   'loadURL',
+  'capturePage',
   'executeJavaScript',
   'insertCSS',
   'insertText',

lib/common/webpack-globals-provider.ts

@@ -1,8 +0,0 @@
-// Captures original globals into a scope to ensure that userland modifications do
-// not impact Electron.  Note that users doing:
-//
-// global.Promise.resolve = myFn
-//
-// Will mutate this captured one as well and that is OK.
-
-export const Promise = global.Promise

lib/renderer/api/exports/electron.ts

@@ -2,7 +2,5 @@ import { defineProperties } from '@electron/internal/common/define-properties'
 import { commonModuleList } from '@electron/internal/common/api/module-list'
 import { rendererModuleList } from '@electron/internal/renderer/api/module-list'
 
-module.exports = {}
-
-defineProperties(module.exports, commonModuleList)
-defineProperties(module.exports, rendererModuleList)
+defineProperties(exports, commonModuleList)
+defineProperties(exports, rendererModuleList)

lib/renderer/api/remote.js

@@ -4,7 +4,7 @@ const v8Util = process.electronBinding('v8_util')
 const { hasSwitch } = process.electronBinding('command_line')
 
 const { CallbacksRegistry } = require('@electron/internal/renderer/remote/callbacks-registry')
-const { isPromise, isSerializableObject } = require('@electron/internal/common/type-utils')
+const { isPromise, isSerializableObject } = require('@electron/internal/common/remote/type-utils')
 const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal')
 
 const callbacksRegistry = new CallbacksRegistry()
@@ -64,6 +64,11 @@ function wrapArgs (args, visited = new Set()) {
           type: 'remote-object',
           id: v8Util.getHiddenValue(value, 'atomId')
         }
+      } else if (value instanceof Error) {
+        return {
+          type: 'value',
+          value
+        }
       }
 
       const meta = {

lib/renderer/api/web-frame.ts

@@ -1,10 +1,7 @@
 import { EventEmitter } from 'events'
-import { deprecate } from 'electron'
 
 const binding = process.electronBinding('web_frame')
 
-const setLayoutZoomLevelLimitsWarning = deprecate.warnOnce('setLayoutZoomLevelLimits')
-
 class WebFrame extends EventEmitter {
   constructor (public context: Window) {
     super()
@@ -48,10 +45,6 @@ class WebFrame extends EventEmitter {
   get routingId () {
     return binding._getRoutingId(this.context)
   }
-
-  setLayoutZoomLevelLimits () {
-    setLayoutZoomLevelLimitsWarning()
-  }
 }
 
 // Populate the methods.

lib/renderer/chrome-api.ts

@@ -120,11 +120,7 @@ export function injectTo (extensionId: string, context: any) {
       let targetExtensionId = extensionId
       let connectInfo = { name: '' }
       if (args.length === 1) {
-        if (typeof args[0] === 'string') {
-          targetExtensionId = args[0]
-        } else {
-          connectInfo = args[0]
-        }
+        targetExtensionId = args[0]
       } else if (args.length === 2) {
         [targetExtensionId, connectInfo] = args
       }

lib/renderer/init.ts

@@ -192,8 +192,6 @@ if (nodeIntegration) {
       delete global.setImmediate
       delete global.clearImmediate
       delete global.global
-      delete global.root
-      delete global.GLOBAL
     })
   }
 }

lib/renderer/web-view/web-view-impl.ts

@@ -4,8 +4,7 @@ import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-in
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'
 import * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal'
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants'
-import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods'
-import { deserialize } from '@electron/internal/common/type-utils'
+import { syncMethods, asyncMethods } from '@electron/internal/common/web-view-methods'
 const { webFrame } = electron
 
 const v8Util = process.electronBinding('v8_util')
@@ -239,12 +238,6 @@ export const setupMethods = (WebViewElement: typeof ElectronInternal.WebViewElem
     return remote.getGuestWebContents(internal.guestInstanceId!)
   }
 
-  WebViewElement.prototype.getWebContents = electron.deprecate.moveAPI(
-    WebViewElement.prototype.getWebContents,
-    'webview.getWebContents()',
-    'remote.webContents.fromId(webview.getWebContentsId())'
-  ) as any
-
   // Focusing the webview should move page focus to the underlying iframe.
   WebViewElement.prototype.focus = function () {
     this.contentWindow.focus()
@@ -270,29 +263,6 @@ export const setupMethods = (WebViewElement: typeof ElectronInternal.WebViewElem
   for (const method of asyncMethods) {
     (WebViewElement.prototype as Record<string, any>)[method] = createNonBlockHandler(method)
   }
-
-  WebViewElement.prototype.capturePage = async function (...args) {
-    return deserialize(await ipcRendererInternal.invoke('ELECTRON_GUEST_VIEW_MANAGER_CAPTURE_PAGE', this.getWebContentsId(), args))
-  }
-
-  const createPropertyGetter = function (property: string) {
-    return function (this: ElectronInternal.WebViewElement) {
-      return ipcRendererUtils.invokeSync('ELECTRON_GUEST_VIEW_MANAGER_PROPERTY_GET', this.getWebContentsId(), property)
-    }
-  }
-
-  const createPropertySetter = function (property: string) {
-    return function (this: ElectronInternal.WebViewElement, arg: any) {
-      return ipcRendererUtils.invokeSync('ELECTRON_GUEST_VIEW_MANAGER_PROPERTY_SET', this.getWebContentsId(), property, arg)
-    }
-  }
-
-  for (const property of properties) {
-    Object.defineProperty(WebViewElement.prototype, property, {
-      get: createPropertyGetter(property) as any,
-      set: createPropertySetter(property)
-    })
-  }
 }
 
 export const webViewImplModule = {

lib/renderer/window-setup.ts

@@ -177,7 +177,7 @@ class BrowserWindowProxy {
 export const windowSetup = (
   guestInstanceId: number, openerId: number, isHiddenPage: boolean, usesNativeWindowOpen: boolean
 ) => {
-  if (!process.sandboxed && guestInstanceId == null) {
+  if (guestInstanceId == null) {
     // Override default window.close.
     window.close = function () {
       ipcRendererInternal.sendSync('ELECTRON_BROWSER_WINDOW_CLOSE')
@@ -197,10 +197,10 @@ export const windowSetup = (
         return null
       }
     }
-  }
 
-  if (openerId != null) {
-    window.opener = getOrCreateProxy(openerId)
+    if (openerId != null) {
+      window.opener = getOrCreateProxy(openerId)
+    }
   }
 
   // But we do not support prompt().
@@ -208,47 +208,43 @@ export const windowSetup = (
     throw new Error('prompt() is and will not be supported.')
   }
 
-  if (!usesNativeWindowOpen || openerId != null) {
-    ipcRendererInternal.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
-      _event, sourceId: number, message: any, sourceOrigin: string
-    ) {
-      // Manually dispatch event instead of using postMessage because we also need to
-      // set event.source.
-      //
-      // Why any? We can't construct a MessageEvent and we can't
-      // use `as MessageEvent` because you're not supposed to override
-      // data, origin, and source
-      const event: any = document.createEvent('Event')
-      event.initEvent('message', false, false)
+  ipcRendererInternal.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
+    _event, sourceId: number, message: any, sourceOrigin: string
+  ) {
+    // Manually dispatch event instead of using postMessage because we also need to
+    // set event.source.
+    //
+    // Why any? We can't construct a MessageEvent and we can't
+    // use `as MessageEvent` because you're not supposed to override
+    // data, origin, and source
+    const event: any = document.createEvent('Event')
+    event.initEvent('message', false, false)
 
-      event.data = message
-      event.origin = sourceOrigin
-      event.source = getOrCreateProxy(sourceId)
+    event.data = message
+    event.origin = sourceOrigin
+    event.source = getOrCreateProxy(sourceId)
 
-      window.dispatchEvent(event as MessageEvent)
-    })
+    window.dispatchEvent(event as MessageEvent)
+  })
+
+  window.history.back = function () {
+    ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_BACK')
   }
 
-  if (!process.sandboxed) {
-    window.history.back = function () {
-      ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_BACK')
-    }
-
-    window.history.forward = function () {
-      ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_FORWARD')
-    }
-
-    window.history.go = function (offset: number) {
-      ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_TO_OFFSET', +offset)
-    }
-
-    Object.defineProperty(window.history, 'length', {
-      get: function () {
-        return ipcRendererInternal.sendSync('ELECTRON_NAVIGATION_CONTROLLER_LENGTH')
-      }
-    })
+  window.history.forward = function () {
+    ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_FORWARD')
   }
 
+  window.history.go = function (offset: number) {
+    ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_TO_OFFSET', +offset)
+  }
+
+  Object.defineProperty(window.history, 'length', {
+    get: function () {
+      return ipcRendererInternal.sendSync('ELECTRON_NAVIGATION_CONTROLLER_LENGTH')
+    }
+  })
+
   if (guestInstanceId != null) {
     // Webview `document.visibilityState` tracks window visibility (and ignores
     // the actual <webview> element visibility) for backwards compatibility.

lib/sandboxed_renderer/api/exports/electron.ts

@@ -1,6 +1,4 @@
 import { defineProperties } from '@electron/internal/common/define-properties'
 import { moduleList } from '@electron/internal/sandboxed_renderer/api/module-list'
 
-module.exports = {}
-
-defineProperties(module.exports, moduleList)
+defineProperties(exports, moduleList)

lib/sandboxed_renderer/init.js

@@ -30,13 +30,7 @@ const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-rendere
 const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils')
 
 const {
-  contentScripts,
-  preloadScripts,
-  isRemoteModuleEnabled,
-  isWebViewTagEnabled,
-  guestInstanceId,
-  openerId,
-  process: processProps
+  contentScripts, preloadScripts, isRemoteModuleEnabled, isWebViewTagEnabled, process: processProps
 } = ipcRendererUtils.invokeSync('ELECTRON_BROWSER_SANDBOX_LOAD')
 
 process.isRemoteModuleEnabled = isRemoteModuleEnabled
@@ -100,8 +94,6 @@ Object.defineProperty(preloadProcess, 'noDeprecation', {
 
 process.on('loaded', () => preloadProcess.emit('loaded'))
 process.on('exit', () => preloadProcess.emit('exit'))
-process.on('document-start', () => preloadProcess.emit('document-start'))
-process.on('document-end', () => preloadProcess.emit('document-end'))
 
 // This is the `require` function that will be visible to the preload script
 function preloadRequire (module) {
@@ -115,11 +107,6 @@ function preloadRequire (module) {
 const { hasSwitch } = process.electronBinding('command_line')
 
 const contextIsolation = hasSwitch('context-isolation')
-const isHiddenPage = hasSwitch('hidden-page')
-const usesNativeWindowOpen = true
-
-// The arguments to be passed to isolated world.
-const isolatedWorldArgs = { ipcRendererInternal, guestInstanceId, isHiddenPage, openerId, usesNativeWindowOpen }
 
 switch (window.location.protocol) {
   case 'devtools:': {
@@ -138,10 +125,6 @@ switch (window.location.protocol) {
     break
   }
   default: {
-    // Override default web functions.
-    const { windowSetup } = require('@electron/internal/renderer/window-setup')
-    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen)
-
     // Inject content scripts.
     if (!process.electronBinding('features').isExtensionsEnabled()) {
       require('@electron/internal/renderer/content-scripts-injector')(contentScripts)
@@ -149,17 +132,14 @@ switch (window.location.protocol) {
   }
 }
 
+const guestInstanceId = binding.guestInstanceId && parseInt(binding.guestInstanceId)
+
 // Load webview tag implementation.
 if (process.isMainFrame) {
   const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init')
   webViewInit(contextIsolation, isWebViewTagEnabled, guestInstanceId)
 }
 
-// Pass the arguments to isolatedWorld.
-if (contextIsolation) {
-  v8Util.setHiddenValue(global, 'isolated-world-args', isolatedWorldArgs)
-}
-
 // Wrap the script into a function executed in global scope. It won't have
 // access to the current scope, so we'll expose a few objects as arguments:
 //

native_mate/native_mate/function_template.h

@@ -5,8 +5,6 @@
 #ifndef NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_
 #define NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_
 
-#include <utility>
-
 #include "base/callback.h"
 #include "native_mate/arguments.h"
 #include "native_mate/wrappable_base.h"
@@ -196,8 +194,7 @@ class Invoker<IndicesHolder<indices...>, ArgTypes...>
   void DispatchToCallback(base::Callback<ReturnType(ArgTypes...)> callback) {
     v8::MicrotasksScope script_scope(args_->isolate(),
                                      v8::MicrotasksScope::kRunMicrotasks);
-    args_->Return(
-        callback.Run(std::move(ArgumentHolder<indices, ArgTypes>::value)...));
+    args_->Return(callback.Run(ArgumentHolder<indices, ArgTypes>::value...));
   }
 
   // In C++, you can declare the function foo(void), but you can't pass a void
@@ -206,7 +203,7 @@ class Invoker<IndicesHolder<indices...>, ArgTypes...>
   void DispatchToCallback(base::Callback<void(ArgTypes...)> callback) {
     v8::MicrotasksScope script_scope(args_->isolate(),
                                      v8::MicrotasksScope::kRunMicrotasks);
-    callback.Run(std::move(ArgumentHolder<indices, ArgTypes>::value)...);
+    callback.Run(ArgumentHolder<indices, ArgTypes>::value...);
   }
 
  private:

package.json

@@ -1,11 +1,11 @@
 {
   "name": "electron",
-  "version": "8.1.0",
+  "version": "8.0.0-nightly.20191028",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
     "@electron/docs-parser": "^0.4.2",
-    "@electron/typescript-definitions": "^8.6.4",
+    "@electron/typescript-definitions": "^8.6.1",
     "@octokit/rest": "^16.3.2",
     "@primer/octicons": "^9.1.1",
     "@types/basic-auth": "^1.1.2",
@@ -129,9 +129,6 @@
       "node script/gen-filenames.js",
       "python script/check-trailing-whitespace.py --fix",
       "git add filenames.auto.gni"
-    ],
-    "DEPS": [
-      "node script/gen-hunspell-filenames.js"
     ]
   },
   "dependencies": {

patches/boringssl/.patches

@@ -1,3 +1,3 @@
 expose_ripemd160.patch
 expose_aes-cfb.patch
-fix_add_RSA-PSS_keygen_functions.patch
+fix_add_RSA-PSS_keygen_functions.patch

patches/boringssl/expose_ripemd160.patch

@@ -80,7 +80,7 @@ index d540144b293297791c087e0b968a47d368a73695..53cb9d2dc8f1962a70dc12b648d27c32
 +  callback(EVP_ripemd160(), "ripemd160", NULL, arg);
  }
 diff --git a/include/openssl/digest.h b/include/openssl/digest.h
-index c3ceb7f22a123353f23cb33de9cc2931fb5e1c11..704d43a326e7cced925c9db1c2a6094a16f9abe9 100644
+index c7c679760a30329311b4a6c0db475b2375537028..991fa00b8330a663625719436075bcc8ae32e17a 100644
 --- a/include/openssl/digest.h
 +++ b/include/openssl/digest.h
 @@ -88,6 +88,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_sha512(void);

patches/boringssl/fix_add_RSA-PSS_keygen_functions.patch

@@ -8,8 +8,32 @@ Refs https://github.com/nodejs/node/pull/26960.
 
 Upstreamed at https://boringssl-review.googlesource.com/c/boringssl/+/38524.
 
+diff --git a/crypto/evp/p_rsa.c b/crypto/evp/p_rsa.c
+index 865b36af9b830302fb1068c4965133213c1507dc..71b342f13db5f446aa15f070b6e4aef9b8c25939 100644
+--- a/crypto/evp/p_rsa.c
++++ b/crypto/evp/p_rsa.c
+@@ -569,6 +569,19 @@ int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, int *out_padding) {
+                            0, out_padding);
+ }
+ 
++int EVP_PKEY_CTX_set_rsa_pss_keygen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md) {
++  return 0;
++}
++
++int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int salt_len) {
++  return 0;
++}
++
++int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md(EVP_PKEY_CTX *ctx,
++                                            const EVP_MD *md) {
++  return 0;
++}
++
+ int EVP_PKEY_CTX_set_rsa_pss_saltlen(EVP_PKEY_CTX *ctx, int salt_len) {
+   return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA,
+                            (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY),
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index 19baa64ddba84c3dd59e65aef77d1ebbf49e43df..37217c49f7e05eb25562023bf356fdadae1bc66f 100644
+index ad9c05e052756715e3fe67bf9517863ede027d5b..d1729cfc8beefd2cb20abf05043fed43e566a312 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
 @@ -723,6 +723,18 @@ OPENSSL_EXPORT int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int padding);

patches/breakpad/chore_fix_ftbfs_from_stl_features_used_but_not_included.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Charles Kerr <ckerr@github.com>
-Date: Fri, 15 Nov 2019 17:14:54 -0600
-Subject: chore: fix FTBFS from stl features used but not included
-
-
-diff --git a/src/common/windows/pe_util.cc b/src/common/windows/pe_util.cc
-index 6fa63fa3b5699b79d3479c6d4a37a1c68553223f..59c1c1d74f70dca8f871fdddd8e27da102ec9148 100644
---- a/src/common/windows/pe_util.cc
-+++ b/src/common/windows/pe_util.cc
-@@ -119,7 +119,6 @@ private:
- 
- namespace google_breakpad {
- 
--using std::unique_ptr;
- using google_breakpad::GUIDString;
- 
- bool ReadModuleInfo(const wstring & pe_file, PDBModuleInfo * info) {
-diff --git a/src/tools/windows/dump_syms/dump_syms.cc b/src/tools/windows/dump_syms/dump_syms.cc
-index 5b7d1777538cd3cfefd0bef45558f900798d6c51..2b2fdaf3f908db1d6f3f96a6bc23f0698cf879dc 100644
---- a/src/tools/windows/dump_syms/dump_syms.cc
-+++ b/src/tools/windows/dump_syms/dump_syms.cc
-@@ -41,7 +41,6 @@
- using std::wstring;
- using google_breakpad::PDBSourceLineWriter;
- using google_breakpad::PESourceLineWriter;
--using std::unique_ptr;
- 
- int wmain(int argc, wchar_t **argv) {
-   bool success;

patches/chromium/.patches

@@ -34,13 +34,13 @@ scroll_bounce_flag.patch
 mas-cfisobjc.patch
 mas-cgdisplayusesforcetogray.patch
 mas-audiodeviceduck.patch
-mas_disable_remote_layer.patch
-mas_disable_remote_accessibility.patch
-mas_disable_custom_window_frame.patch
+mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
+ignore_rc_check.patch
 chrome_key_systems.patch
 allow_nested_error_trackers.patch
 blink_initialization_order.patch
 ssl_security_state_tab_helper.patch
+exclude-a-few-test-files-from-build.patch
 desktop_media_list.patch
 proxy_config_monitor.patch
 gritsettings_resource_ids.patch
@@ -60,6 +60,7 @@ fix_disable_usage_of_setapplicationisdaemon_and.patch
 unsandboxed_ppapi_processes_skip_zygote.patch
 patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
 build_add_electron_tracing_category.patch
+disable_custom_libcxx_on_windows.patch
 worker_context_will_destroy.patch
 fix_breakpad_symbol_generation_on_linux_arm.patch
 frame_host_manager.patch
@@ -67,6 +68,7 @@ crashpad_pid_check.patch
 preconnect_feature.patch
 network_service_allow_remote_certificate_verification_logic.patch
 put_back_deleted_colors_for_autofill.patch
+build_win_disable_zc_twophase.patch
 disable_color_correct_rendering.patch
 add_contentgpuclient_precreatemessageloop_callback.patch
 picture-in-picture.patch
@@ -75,18 +77,7 @@ allow_new_privileges_in_unsandboxed_child_processes.patch
 expose_setuseragent_on_networkcontext.patch
 feat_add_set_theme_source_to_allow_apps_to.patch
 revert_cleanup_remove_menu_subtitles_sublabels.patch
+ui_views_fix_jumbo_build.patch
 export_fetchapi_mojo_traits_to_fix_component_build.patch
-revert_remove_contentrendererclient_shouldfork.patch
-ignore_rc_check.patch
-remove_usage_of_incognito_apis_in_the_spellchecker.patch
-chore_use_electron_resources_not_chrome_for_spellchecker.patch
-add_trustedauthclient_to_urlloaderfactory.patch
-feat_allow_disbaling_blink_scheduler_throttling_per_renderview.patch
-accessible_pane_view.patch
-fix_add_executable_to_chromedriver_s_rpath_for_electron_8.patch
-fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch
-port_aria_tree_fix_for_macos_voiceover.patch
-fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
-feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
-os_metrics_mac.patch
-feat_allow_embedders_to_add_observers_on_created_hunspell.patch
+build_fix_when_building_with_enable_plugins_false.patch
+add_zoom_limit_setters_to_webcontents.patch

patches/chromium/accelerator.patch

@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= should show as Ctrl-+
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 025a82c14dd379f82e6c8242727346bd21e768f3..8b8b0e77c355acd1ef22fb51b89f65f90bfe5cc6 100644
+index 841a8ccd1f0ca5073cf0f0621f81561ed6425e0d..ac4c04b74b0a3b8e6d6c375fef021abbd8789a14 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
@@ -74,7 +74,7 @@ index 025a82c14dd379f82e6c8242727346bd21e768f3..8b8b0e77c355acd1ef22fb51b89f65f9
 +          base::StringPrintf("F%d", key_code_ - VKEY_F1 + 1));
    }
  
- #if defined(OS_MACOSX)
+   // Checking whether the character used for the accelerator is alphanumeric.
 @@ -356,7 +356,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
    // more information.
    if (IsCtrlDown())

patches/chromium/accessible_pane_view.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cheng Zhao <zcbenz@gmail.com>
-Date: Thu, 4 Oct 2018 14:57:02 -0700
-Subject: fix: add back virtual methods in AccessiblePaneView
-
-Mark SetPaneFocus and RemovePaneFocus as virtual in AccessiblePaneView, as we
-need to override them in MenuBar.
-
-Pending upstream patch: https://crrev.com/c/1959189
-
-diff --git a/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h
-index 813fd13860a863cd1e6e5bfec38d15f798418673..990c905e8f19dd015a625010ea30adfcb6f51ea6 100644
---- a/ui/views/accessible_pane_view.h
-+++ b/ui/views/accessible_pane_view.h
-@@ -35,7 +35,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View,
-   // If |initial_focus| is not NULL, that control will get
-   // the initial focus, if it's enabled and focusable. Returns true if
-   // the pane was able to receive focus.
--  bool SetPaneFocus(View* initial_focus);
-+  virtual bool SetPaneFocus(View* initial_focus);
- 
-   bool pane_has_focus() const { return pane_has_focus_; }
- 
-@@ -83,7 +83,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View,
-   bool ContainsForFocusSearch(View* root, const View* v);
- 
-   // Remove pane focus.
--  void RemovePaneFocus();
-+  virtual void RemovePaneFocus();
- 
-   View* GetFirstFocusableChild();
-   View* GetLastFocusableChild();

patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 35b450a41a9a790aa166316a09f6439be7df08c6..39b1ac57f674777f398e72f565dc0c959f683ec7 100644
+index 4373f508964cb1e9fd51c952122ac2f41fb35ae9..065a7a57b77f1e3bf5e03fac900f1936d48ad4ff 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -258,6 +258,10 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -236,6 +236,10 @@ int GpuMain(const MainFunctionParams& parameters) {
  
    logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
  
@@ -24,7 +24,7 @@ index 35b450a41a9a790aa166316a09f6439be7df08c6..39b1ac57f674777f398e72f565dc0c95
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -366,7 +370,6 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -349,7 +353,6 @@ int GpuMain(const MainFunctionParams& parameters) {
    GpuProcess gpu_process(io_thread_priority);
  #endif
  
@@ -33,7 +33,7 @@ index 35b450a41a9a790aa166316a09f6439be7df08c6..39b1ac57f674777f398e72f565dc0c95
      client->PostIOThreadCreated(gpu_process.io_task_runner());
  
 diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
-index f68558bd2c4ff725443b0d6893ebe7da07c26a00..3dda58157f32dbc9c7d9001192c30a3a1c152437 100644
+index 830d5e89af7bd3ddb409ac7bf9d8eb3109830d41..7d544536ec846c294deb6626f51d5de7846fc5c2 100644
 --- a/content/public/gpu/content_gpu_client.h
 +++ b/content/public/gpu/content_gpu_client.h
 @@ -39,6 +39,10 @@ class CONTENT_EXPORT ContentGpuClient {
@@ -44,6 +44,6 @@ index f68558bd2c4ff725443b0d6893ebe7da07c26a00..3dda58157f32dbc9c7d9001192c30a3a
 +  // creating the message loop.
 +  virtual void PreCreateMessageLoop() {}
 +
-   // Called during initialization once the GpuService has been initialized.
-   virtual void GpuServiceInitialized() {}
- 
+   // Initializes the registry. |registry| will be passed to a ConnectionFilter
+   // (which lives on the IO thread). Unlike other childthreads, the client must
+   // register additional interfaces on this registry rather than just creating

patches/chromium/add_realloc.patch

@@ -12,7 +12,7 @@ when we override ReallocateBufferMemory, so we therefore need to implement
 Realloc on the v8 side and correspondingly in gin.
 
 diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
-index b94a71ef856f92404e16544e22ebbadf57cff363..b15685f6907bcafeb1acd62bfe76f0713dea27f3 100644
+index a02797e94f61e8c71428633a4585a625dc5aadbd..305b7d307d233af699e3f495f85de0f8097ff311 100644
 --- a/gin/array_buffer.cc
 +++ b/gin/array_buffer.cc
 @@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
@@ -39,45 +39,45 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
  
    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index c69cfebccd7d7bff35d2292e61bf6008f0ca7940..2cb5f5d3f89f2af13221e66b2277a28532d53deb 100644
+index 3b1ced15de47f6b88716db2b79306bb7d98cfdf4..0ed89b4147d98f2239a3504c898666a758cee618 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -654,6 +654,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
-         size, ArrayBufferContents::kDontInitialize);
+@@ -645,6 +645,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+         size, WTF::ArrayBufferContents::kDontInitialize);
    }
  
 +  void* Realloc(void* data, size_t size) override {
-+    return ArrayBufferContents::Realloc(data, size);
++    return WTF::ArrayBufferContents::Realloc(data, size);
 +  }
 +
    void Free(void* data, size_t size) override {
-     ArrayBufferContents::FreeMemory(data);
+     WTF::ArrayBufferContents::FreeMemory(data);
    }
-diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
-index 095ca3db051362319611976b9052725ab16c1b3a..13e802a5732f0b04832d6dd8031ae43e1240b79a 100644
---- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
-+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
-@@ -126,6 +126,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
+diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
+index ac76d127b96b80c8260a7e2cda0b669cd98787ad..dcab64586700a8740262aede8dba2755f652d8e8 100644
+--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
++++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
+@@ -130,6 +130,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
    return AllocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull);
  }
  
 +void* ArrayBufferContents::Realloc(void* data, size_t size) {
-+  return WTF::Partitions::ArrayBufferPartition()->Realloc(data, size,
++  return Partitions::ArrayBufferPartition()->Realloc(data, size,
 +      WTF_HEAP_PROFILER_TYPE_NAME(ArrayBufferContents));
 +}
 +
  void ArrayBufferContents::FreeMemory(void* data) {
-   WTF::Partitions::ArrayBufferPartition()->Free(data);
+   Partitions::ArrayBufferPartition()->Free(data);
  }
-diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
-index 2e871b20c1e6fc3703178957fd03923f02ab1b47..8f2fd80130f1e7f957d642af4e5c22f9a5937ce4 100644
---- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
-+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
-@@ -106,6 +106,7 @@ class CORE_EXPORT ArrayBufferContents {
+diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
+index ee7c89a4950d6b3c97a810c41a62fee7e372018d..c2b60f20a72cca46d05af369f33d9c19395b34ef 100644
+--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
++++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
+@@ -140,6 +140,7 @@ class WTF_EXPORT ArrayBufferContents {
    void CopyTo(ArrayBufferContents& other);
  
    static void* AllocateMemoryOrNull(size_t, InitializationPolicy);
 +  static void* Realloc(void* data, size_t);
    static void FreeMemory(void*);
- 
-  private:
+   static DataHandle CreateDataHandle(size_t, InitializationPolicy);
+   static void Initialize(

patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch

@@ -1,158 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Tue, 12 Nov 2019 11:50:16 -0800
-Subject: add TrustedAuthClient to URLLoaderFactory
-
-This allows intercepting authentication requests for the 'net' module.
-Without this, the 'login' event for electron.net.ClientRequest can't be
-implemented, because the existing path checks for the presence of a
-WebContents, and cancels the authentication if there's no WebContents
-available, which there isn't in the case of the 'net' module.
-
-diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 691f9b0f6f658cc259cc9c4e8bb3abb15592e8a3..09ecb3f3406da54440cdd977556f602496ec39a6 100644
---- a/services/network/public/mojom/network_context.mojom
-+++ b/services/network/public/mojom/network_context.mojom
-@@ -190,6 +190,25 @@ struct HttpAuthStaticNetworkContextParams {
-      = DefaultCredentials.ALLOW_DEFAULT_CREDENTIALS;
- };
- 
-+interface TrustedAuthClient {
-+  OnAuthRequired(
-+      mojo_base.mojom.UnguessableToken? window_id,
-+      uint32 process_id,
-+      uint32 routing_id,
-+      uint32 request_id,
-+      url.mojom.Url url,
-+      bool first_auth_attempt,
-+      AuthChallengeInfo auth_info,
-+      URLResponseHead? head,
-+      pending_remote<AuthChallengeResponder> auth_challenge_responder);
-+};
-+interface TrustedURLLoaderAuthClient {
-+  // When a new URLLoader is created, this will be called to pass a
-+  // corresponding |auth_client|.
-+  OnLoaderCreated(int32 request_id,
-+                  pending_receiver<TrustedAuthClient> auth_client);
-+};
-+
- interface CertVerifierClient {
-   Verify(
-     int32 default_error,
-@@ -597,6 +616,8 @@ struct URLLoaderFactoryParams {
-   // interface. This still respects the per-context block lists.
-   CorsOriginAccessPatterns? factory_bound_access_patterns;
- 
-+  pending_remote<TrustedURLLoaderAuthClient>? auth_client;
-+
-   // Key used to isolate shared network resources like the cache.
-   NetworkIsolationKey? network_isolation_key;
- 
-diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 486c92182695958a0c97d48d55ebd23e0bd5f3de..acd6c63eff1f94cc9fa8490610e571a73764369a 100644
---- a/services/network/url_loader.cc
-+++ b/services/network/url_loader.cc
-@@ -333,6 +333,7 @@ URLLoader::URLLoader(
-     base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
-     base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
-     mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
-+    mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
-     mojom::OriginPolicyManager* origin_policy_manager)
-     : url_request_context_(url_request_context),
-       network_service_client_(network_service_client),
-@@ -390,6 +391,11 @@ URLLoader::URLLoader(
-     header_client_.set_disconnect_handler(
-         base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
-   }
-+  if (url_loader_auth_client) {
-+    url_loader_auth_client->OnLoaderCreated(request_id_, auth_client_.BindNewPipeAndPassReceiver());
-+    auth_client_.set_disconnect_handler(
-+        base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
-+  }
-   if (want_raw_headers_) {
-     options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
-                 mojom::kURLLoadOptionSendSSLInfoForCertificateError;
-@@ -824,7 +830,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
- 
- void URLLoader::OnAuthRequired(net::URLRequest* url_request,
-                                const net::AuthChallengeInfo& auth_info) {
--  if (!network_context_client_) {
-+  if (!network_context_client_ && !auth_client_) {
-     OnAuthCredentials(base::nullopt);
-     return;
-   }
-@@ -840,10 +846,18 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
-   if (url_request->response_headers())
-     head.headers = url_request->response_headers();
-   head.auth_challenge_info = auth_info;
--  network_context_client_->OnAuthRequired(
--      fetch_window_id_, factory_params_->process_id, render_frame_id_,
--      request_id_, url_request_->url(), first_auth_attempt_, auth_info, head,
--      auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
-+
-+  if (auth_client_) {
-+    auth_client_->OnAuthRequired(
-+        fetch_window_id_, factory_params_->process_id, render_frame_id_,
-+        request_id_, url_request_->url(), first_auth_attempt_, auth_info, head,
-+        auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
-+  } else {
-+    network_context_client_->OnAuthRequired(
-+        fetch_window_id_, factory_params_->process_id, render_frame_id_,
-+        request_id_, url_request_->url(), first_auth_attempt_, auth_info, head,
-+        auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
-+  }
- 
-   auth_challenge_responder_receiver_.set_disconnect_handler(
-       base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
-diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 564851586d2ad5fe0ae6acd4457257ce8ed665b3..3291fe28deb20b9630589e8ea11ea1366583081c 100644
---- a/services/network/url_loader.h
-+++ b/services/network/url_loader.h
-@@ -85,6 +85,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
-       base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
-       base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
-       mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
-+      mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
-       mojom::OriginPolicyManager* origin_policy_manager);
-   ~URLLoader() override;
- 
-@@ -378,6 +379,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
-   base::Optional<base::UnguessableToken> fetch_window_id_;
- 
-   mojo::Remote<mojom::TrustedHeaderClient> header_client_;
-+  mojo::Remote<mojom::TrustedAuthClient> auth_client_;
- 
-   std::unique_ptr<FileOpenerForUpload> file_opener_for_upload_;
- 
-diff --git a/services/network/url_loader_factory.cc b/services/network/url_loader_factory.cc
-index 9e9baaf8ecd33e6416027014361edc332ab71e3c..cc2c59828f56988d43b680588d4625d9864aa9b6 100644
---- a/services/network/url_loader_factory.cc
-+++ b/services/network/url_loader_factory.cc
-@@ -65,6 +65,7 @@ URLLoaderFactory::URLLoaderFactory(
-       params_(std::move(params)),
-       resource_scheduler_client_(std::move(resource_scheduler_client)),
-       header_client_(std::move(params_->header_client)),
-+      auth_client_(std::move(params_->auth_client)),
-       cors_url_loader_factory_(cors_url_loader_factory) {
-   DCHECK(context);
-   DCHECK_NE(mojom::kInvalidProcessId, params_->process_id);
-@@ -207,6 +208,7 @@ void URLLoaderFactory::CreateLoaderAndStart(
-       resource_scheduler_client_, std::move(keepalive_statistics_recorder),
-       std::move(network_usage_accumulator),
-       header_client_.is_bound() ? header_client_.get() : nullptr,
-+      auth_client_.is_bound() ? auth_client_.get() : nullptr,
-       context_->origin_policy_manager());
-   cors_url_loader_factory_->OnLoaderCreated(std::move(loader));
- }
-diff --git a/services/network/url_loader_factory.h b/services/network/url_loader_factory.h
-index 7d13494649c43be52b06774f2cf5763ebe9129c0..d4b19342c44f86c685f700e4260475ff2235b298 100644
---- a/services/network/url_loader_factory.h
-+++ b/services/network/url_loader_factory.h
-@@ -72,6 +72,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
-   mojom::URLLoaderFactoryParamsPtr params_;
-   scoped_refptr<ResourceSchedulerClient> resource_scheduler_client_;
-   mojo::Remote<mojom::TrustedURLLoaderHeaderClient> header_client_;
-+  mojo::Remote<mojom::TrustedURLLoaderAuthClient> auth_client_;
- 
-   // |cors_url_loader_factory_| owns this.
-   cors::CorsURLLoaderFactory* cors_url_loader_factory_;

patches/chromium/add_zoom_limit_setters_to_webcontents.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: John Kleinschmidt <kleinschmidtorama@gmail.com>
+Date: Mon, 23 Sep 2019 17:07:53 -0400
+Subject: add zoom limit setters to webcontents
+
+Allows minimum_zoom_percent_ and maximum_zoom_percent_ to be set on WebContents.
+This is needed by Electron to allow apps to limit how much an app can zoom in
+or out.
+
+diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
+index 8586f71224f1cae6a5e9b4005a6acfef9ff64d4d..4d4dce8124312d46f90db8d2fc59bd0b7acd498d 100644
+--- a/content/browser/web_contents/web_contents_impl.cc
++++ b/content/browser/web_contents/web_contents_impl.cc
+@@ -4142,10 +4142,18 @@ bool WebContentsImpl::GetClosedByUserGesture() {
+   return closed_by_user_gesture_;
+ }
+ 
++void WebContentsImpl::SetMinimumZoomPercent(int zoom_percent) {
++  minimum_zoom_percent_ = zoom_percent;
++}
++
+ int WebContentsImpl::GetMinimumZoomPercent() {
+   return minimum_zoom_percent_;
+ }
+ 
++void WebContentsImpl::SetMaximumZoomPercent(int zoom_percent) {
++  maximum_zoom_percent_ = zoom_percent;
++}
++
+ int WebContentsImpl::GetMaximumZoomPercent() {
+   return maximum_zoom_percent_;
+ }
+diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
+index 72f7570ed92886e97629116fec98c1c4dcf95f52..e876929be3df7ba7251886a56acf9b84bbe62e32 100644
+--- a/content/browser/web_contents/web_contents_impl.h
++++ b/content/browser/web_contents/web_contents_impl.h
+@@ -450,7 +450,9 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+   void SystemDragEnded(RenderWidgetHost* source_rwh) override;
+   void SetClosedByUserGesture(bool value) override;
+   bool GetClosedByUserGesture() override;
++  void SetMinimumZoomPercent(int zoom_percent) override;
+   int GetMinimumZoomPercent() override;
++  void SetMaximumZoomPercent(int zoom_percent) override;
+   int GetMaximumZoomPercent() override;
+   void SetPageScale(float page_scale_factor) override;
+   gfx::Size GetPreferredSize() override;
+@@ -1714,8 +1716,8 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+   bool closed_by_user_gesture_;
+ 
+   // Minimum/maximum zoom percent.
+-  const int minimum_zoom_percent_;
+-  const int maximum_zoom_percent_;
++  int minimum_zoom_percent_;
++  int maximum_zoom_percent_;
+ 
+   // Used to correctly handle integer zooming through a smooth scroll device.
+   float zoom_scroll_remainder_;
+diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
+index 94a5b87ca72998729f1fca14f247914bb81d60d1..3af575d51d0a36f9586a3cfc00575e83e70a46b9 100644
+--- a/content/public/browser/web_contents.h
++++ b/content/public/browser/web_contents.h
+@@ -808,8 +808,10 @@ class WebContents : public PageNavigator,
+   virtual void SetClosedByUserGesture(bool value) = 0;
+   virtual bool GetClosedByUserGesture() = 0;
+ 
+-  // Gets the minimum/maximum zoom percent.
++  // Gets/sets the minimum/maximum zoom percent.
++  virtual void SetMinimumZoomPercent(int zoom_percent) = 0;
+   virtual int GetMinimumZoomPercent() = 0;
++  virtual void SetMaximumZoomPercent(int zoom_percent) = 0;
+   virtual int GetMaximumZoomPercent() = 0;
+ 
+   // Set the renderer's page scale to the given factor.

patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch

@@ -6,10 +6,10 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.
 
 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index ea5258a03f83bcbda7bae296392a46cdd63d6fe1..14eed861e8828fd2ed7d8f27f9fd3bf180d04677 100644
+index 720b92a1a3a7ab5512f839005b272e4989d2ac65..b1759109627cd00053489dcdd397e942fa9d289f 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
-@@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
+@@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
      const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
      options->fds_to_remap.push_back(
          std::make_pair(sandbox_fd, service_manager::GetSandboxFD()));

patches/chromium/blink-worker-enable-csp-in-file-scheme.patch

@@ -5,7 +5,7 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
 
 
 diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-index 1f8273a782a5d3580e139d724ce8a791a100dcfb..90ad0d663003c0bded47183b61bff71a0c01a196 100644
+index b1b9f451951bb7b11eefe6453a71a6b44be838a5..0f62ba09ef99538a5b0b306f601d10c44a7a7abf 100644
 --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 @@ -308,7 +308,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(

patches/chromium/blink_file_path.patch

@@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
 documentation at https://electronjs.org/docs/api/file-object
 
 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index 7ea8ad8fd162fd6a97052188a8e8868dab1c1fe9..a64966e2db0e2e7b0390a322525522e05ddbb022 100644
+index 05e05fb1631851009897f3789d3e770475ce1363..e2ad5fef884532847d035430c14c25e042e2ab24 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
-@@ -193,6 +193,9 @@ class CORE_EXPORT File final : public Blob {
+@@ -201,6 +201,9 @@ class CORE_EXPORT File final : public Blob {
    }
    const String& name() const { return name_; }
  
@@ -21,7 +21,7 @@ index 7ea8ad8fd162fd6a97052188a8e8868dab1c1fe9..a64966e2db0e2e7b0390a322525522e0
    // http://dev.w3.org/2006/webapi/FileAPI/#file-attrs
    int64_t lastModified() const;
 diff --git a/third_party/blink/renderer/core/fileapi/file.idl b/third_party/blink/renderer/core/fileapi/file.idl
-index e5cf6cc926ff2670f713018dd750e79c53ee76eb..60eca3cf100b31c3d2c0c68271d98c60321e69a7 100644
+index 41b8183e858b6d955bacbb72281a08e750b6b29f..0db894ecfae63795724335d914f9f992c0755fd1 100644
 --- a/third_party/blink/renderer/core/fileapi/file.idl
 +++ b/third_party/blink/renderer/core/fileapi/file.idl
 @@ -32,6 +32,7 @@

patches/chromium/blink_initialization_order.patch

@@ -10,10 +10,10 @@ to fix electron/electron#13787.  The backport landed in Chromium 67 but the
 DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index 8095edd988c171a8ad7382d1c2f9fa63ee9e5ffc..802316843c6c270efb871a5d697c4e0d182605d0 100644
+index 4eb7d11483b55ef99758aa6782b3516fef706628..c384a9707d0f998b5e8bc80ad9af1ca29d9ef58c 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-@@ -227,11 +227,10 @@ void LocalWindowProxy::Initialize() {
+@@ -210,11 +210,10 @@ void LocalWindowProxy::Initialize() {
                   GetFrame()->IsMainFrame());
      MainThreadDebugger::Instance()->ContextCreated(script_state_, GetFrame(),
                                                     origin);

patches/chromium/blink_local_frame.patch

@@ -14,10 +14,10 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 0aa1376a9483ec93ecb6763295b3664105f106a4..c1045707d14051e9f990f571a3fe0aa708c5fb74 100644
+index 0c69b3af9d2144b5d4d61e2d4add7edec839d0b5..acfba2544f6329348f60dd92ca5d9865960db371 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -336,10 +336,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -325,10 +325,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    }
    CHECK(!view_ || !view_->IsAttached());
  
@@ -28,7 +28,7 @@ index 0aa1376a9483ec93ecb6763295b3664105f106a4..c1045707d14051e9f990f571a3fe0aa7
    if (!Client())
      return;
  
-@@ -357,6 +353,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -346,6 +342,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    // Notify ScriptController that the frame is closing, since its cleanup ends
    // up calling back to LocalFrameClient via WindowProxy.
    GetScriptController().ClearForClose();

patches/chromium/blink_world_context.patch

@@ -5,10 +5,10 @@ Subject: blink_world_context.patch
 
 
 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index 05a33b9a2cbed57e4e037428397b59f30f83ce66..0cd308b38a158a016b099beed6a31fa1c5a487ad 100644
+index 900c1e97bd5b8ad113def9001be495cae94bbcdf..6cec8d0bdfce94fd3980eb7509dfced79903f0d6 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
-@@ -341,6 +341,9 @@ class WebLocalFrame : public WebFrame {
+@@ -356,6 +356,9 @@ class WebLocalFrame : public WebFrame {
    // be calling this API.
    virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
  
@@ -19,10 +19,10 @@ index 05a33b9a2cbed57e4e037428397b59f30f83ce66..0cd308b38a158a016b099beed6a31fa1
    // that the script evaluated to with callback. Script execution can be
    // suspend.
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index 8c984ae92de2a53e59782bea94a143ee7fde2248..105e1e92002adde207db5c770197547ab6b55f97 100644
+index bb640f13de34de5d966d97cf617faa3cb3fd54c2..686cddd0755ee219eaf367b3ce84320aeeb5053d 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -935,6 +935,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -879,6 +879,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
    return MainWorldScriptContext()->Global();
  }
  
@@ -37,15 +37,15 @@ index 8c984ae92de2a53e59782bea94a143ee7fde2248..105e1e92002adde207db5c770197547a
    return BindingSecurity::ShouldAllowAccessToFrame(
        CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index e3d4a369e6708827497b7ef8ce38817bde8c8010..ad7fd6c34f10d10257ef5c6e5b4b916dc924f20c 100644
+index ab52cef219785766b1315ec7e17d15c2ba2d6138..cf12b32172a0dc814a1478c275d1b5c067d5eaeb 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-@@ -171,6 +171,8 @@ class CORE_EXPORT WebLocalFrameImpl final
+@@ -150,6 +150,8 @@ class CORE_EXPORT WebLocalFrameImpl final
        int argc,
        v8::Local<v8::Value> argv[]) override;
    v8::Local<v8::Context> MainWorldScriptContext() const override;
 +  v8::Local<v8::Context> WorldScriptContext(
 +      v8::Isolate* isolate, int world_id) const override;
-   void RequestExecuteScriptAndReturnValue(const WebScriptSource&,
-                                           bool user_gesture,
-                                           WebScriptExecutionCallback*) override;
+   v8::Local<v8::Object> GlobalProxy() const override;
+   void StartReload(WebFrameLoadType) override;
+   void ReloadImage(const WebNode&) override;

patches/chromium/build_add_electron_tracing_category.patch

@@ -8,10 +8,10 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 1ac3513eb4f74bddacae224c1f0fdd1932151224..6ed8074d16580daa48d443653ac21984981aa8e2 100644
+index dcb32a5eadb7fc3c431099107bdfdfba8764a187..e1a343fdbdc6098189bce9fc1d81e6df5555e7ab 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -66,6 +66,7 @@
+@@ -63,6 +63,7 @@
    X("dwrite")                                                            \
    X("DXVA Decoding")                                                     \
    X("EarlyJava")                                                         \

patches/chromium/build_fix_when_building_with_enable_plugins_false.patch

@@ -0,0 +1,74 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Tue, 8 Oct 2019 15:40:50 +0000
+Subject: build: fix when building with enable_plugins=false
+
+Bug: none
+Change-Id: If878b3a7f5bb051c6e99c617418475c12754ae90
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845624
+Reviewed-by: Robert Sesek <rsesek@chromium.org>
+Commit-Queue: Robert Sesek <rsesek@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#703739}
+
+diff --git a/AUTHORS b/AUTHORS
+index 6714e69599bc87c47663bec740b91e352ef92780..41aa5584412e4a325d2360691b00c43d7b08f1bb 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -223,6 +223,7 @@ Debashish Samantaray <d.samantaray@samsung.com>
+ Debug Wang <debugwang@tencent.com>
+ Deepak Dilip Borade <deepak.db@samsung.com>
+ Deepak Mittal <deepak.m1@samsung.com>
++Deepak Mohan <hop2deep@gmail.com>
+ Deepak Sharma <deepak.sharma@amd.com>
+ Deepak Singla <deepak.s@samsung.com>
+ Deokjin Kim <deokjin81.kim@samsung.com>
+diff --git a/content/browser/sandbox_parameters_mac.mm b/content/browser/sandbox_parameters_mac.mm
+index 5eead918eb9d9df03c86b5201b3f924643707f4b..a12cc8734c45a4ebb29672306da3a695a883eb9b 100644
+--- a/content/browser/sandbox_parameters_mac.mm
++++ b/content/browser/sandbox_parameters_mac.mm
+@@ -25,12 +25,16 @@
+ #include "content/public/common/content_client.h"
+ #include "content/public/common/content_features.h"
+ #include "content/public/common/content_switches.h"
+-#include "content/public/common/pepper_plugin_info.h"
++#include "ppapi/buildflags/buildflags.h"
+ #include "sandbox/mac/seatbelt_exec.h"
+ #include "services/service_manager/sandbox/mac/sandbox_mac.h"
+ #include "services/service_manager/sandbox/sandbox_type.h"
+ #include "services/service_manager/sandbox/switches.h"
+ 
++#if BUILDFLAG(ENABLE_PLUGINS)
++#include "content/public/common/pepper_plugin_info.h"
++#endif
++
+ namespace content {
+ 
+ namespace {
+@@ -148,6 +152,7 @@ void SetupNetworkSandboxParameters(sandbox::SeatbeltExecClient* client) {
+   }
+ }
+ 
++#if BUILDFLAG(ENABLE_PLUGINS)
+ void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) {
+   SetupCommonSandboxParameters(client);
+ 
+@@ -172,6 +177,7 @@ void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) {
+   // to n+1 more than the plugins added.
+   CHECK(index <= 5);
+ }
++#endif
+ 
+ void SetupCDMSandboxParameters(sandbox::SeatbeltExecClient* client) {
+   SetupCommonSandboxParameters(client);
+@@ -212,9 +218,11 @@ void SetupSandboxParameters(service_manager::SandboxType sandbox_type,
+     case service_manager::SANDBOX_TYPE_NETWORK:
+       SetupNetworkSandboxParameters(client);
+       break;
++#if BUILDFLAG(ENABLE_PLUGINS)
+     case service_manager::SANDBOX_TYPE_PPAPI:
+       SetupPPAPISandboxParameters(client);
+       break;
++#endif
+     case service_manager::SANDBOX_TYPE_PROFILING:
+     case service_manager::SANDBOX_TYPE_UTILITY:
+       SetupUtilitySandboxParameters(client, command_line);

patches/chromium/build_win_disable_zc_twophase.patch

@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Tue, 16 Jul 2019 14:38:52 -0700
+Subject: build_win_disable_zc_twophase.patch
+
+Temporarily disable /Zc:twoPhase when libcxx is not used on
+Windows. This is to workaround the bug in crbug.com/969698#c10
+until fixes have landed in upstream.
+
+diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
+index a3a164b41b45381061c7fceb7d7ec1fdb4907792..8de0cb6a8d1987f84aaca5c3bb30ead0a2019bef 100644
+--- a/build/config/win/BUILD.gn
++++ b/build/config/win/BUILD.gn
+@@ -2,6 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
++import("//build/config/c++/c++.gni")
+ import("//build/config/chrome_build.gni")
+ import("//build/config/clang/clang.gni")
+ import("//build/config/compiler/compiler.gni")
+@@ -61,9 +62,13 @@ config("compiler") {
+     "/FS",  # Preserve previous PDB behavior.
+     "/bigobj",  # Some of our files are bigger than the regular limits.
+     "/utf-8",  # Assume UTF-8 by default to avoid code page dependencies.
+-    "/Zc:twoPhase",
+   ]
+ 
++  if (use_custom_libcxx) {
++    # Work around crbug.com/969698#c6, bug in MSSTL <xxatomic>.
++    cflags += [ "/Zc:twoPhase" ]
++  }
++
+   # Force C/C++ mode for the given GN detected file type. This is necessary
+   # for precompiled headers where the same source file is compiled in both
+   # modes.

patches/chromium/can_create_window.patch

@@ -5,10 +5,10 @@ Subject: can_create_window.patch
 
 
 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index bbd42aad3d42311dfff47e725a5deddb4ed04134..797ee4073cfc7b78038d0c007922783a55b89683 100644
+index d6d88e7b66f2de4b6733ea454fc45bb804f13a0e..30e9eabf785a0f241e9581ea38f55dd779acd8ce 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -4375,6 +4375,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -4054,6 +4054,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -17,10 +17,10 @@ index bbd42aad3d42311dfff47e725a5deddb4ed04134..797ee4073cfc7b78038d0c007922783a
            &no_javascript_access);
  
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 822413b2824cc25ea5c699056a22623b7ac1f92a..79444323a6c8c7ab7e2abf0bd45b59e2699def31 100644
+index f0d9cafca7efb0ae0440619b821b1976d8460396..e34e0e6387b907960d234da93a3e90a390488d02 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -301,6 +301,10 @@ struct CreateNewWindowParams {
+@@ -313,6 +313,10 @@ struct CreateNewWindowParams {
  
    // The window features to use for the new window.
    blink.mojom.WindowFeatures features;
@@ -32,10 +32,10 @@ index 822413b2824cc25ea5c699056a22623b7ac1f92a..79444323a6c8c7ab7e2abf0bd45b59e2
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index bcb85464359ce2f1c2b46e7bd86f71cbeaebb25d..53bafb5b97034078784f8ebb43212b792f6a5d17 100644
+index a9fddd7dd2d3f5c07a3b15925209a396c9aa096d..da7eca5f443e2ecdcb3f0819848735aafeb43a00 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -514,6 +514,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -502,6 +502,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -45,18 +45,18 @@ index bcb85464359ce2f1c2b46e7bd86f71cbeaebb25d..53bafb5b97034078784f8ebb43212b79
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index b70473936db044506e6d7ada4520920f0774eff7..fa942dd135ecfc6fe735b4ae52410ec00b6098af 100644
+index 4e18dfd0dc8d4be9b59f12e7010b7f2be70d6cf0..07fa16953d6167a5a381b28a5da3c08a78de4306 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -134,6 +134,7 @@ class NetworkService;
- class TrustedURLLoaderHeaderClient;
- }  // namespace mojom
- struct ResourceRequest;
+@@ -178,6 +178,7 @@ class RenderFrameHost;
+ class RenderProcessHost;
+ class RenderViewHost;
+ class ResourceContext;
 +class ResourceRequestBody;
- }  // namespace network
- 
- namespace rappor {
-@@ -833,6 +834,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+ class SerialDelegate;
+ class SiteInstance;
+ class SpeechRecognitionManagerDelegate;
+@@ -801,6 +802,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -66,7 +66,7 @@ index b70473936db044506e6d7ada4520920f0774eff7..fa942dd135ecfc6fe735b4ae52410ec0
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 7bf0464c14f81b5c607c541f8ec7e5b4c860a25c..c90fd39058e3e0ab98727a71836e549ee794f7bd 100644
+index 4a3c760000fca5f53244a03b9a2074991bc0c382..c5ab8ad81bf11d0ec151b9585a4f1a7f5397ae4b 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -71,6 +71,7 @@
@@ -75,9 +75,9 @@ index 7bf0464c14f81b5c607c541f8ec7e5b4c860a25c..c90fd39058e3e0ab98727a71836e549e
  #include "content/renderer/loader/request_extra_data.h"
 +#include "content/renderer/loader/web_url_request_util.h"
  #include "content/renderer/media/audio/audio_device_factory.h"
- #include "content/renderer/render_frame_impl.h"
- #include "content/renderer/render_frame_proxy.h"
-@@ -1336,6 +1337,8 @@ WebView* RenderViewImpl::CreateView(
+ #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
+ #include "content/renderer/media/webrtc/rtc_peer_connection_handler.h"
+@@ -1367,6 +1368,8 @@ WebView* RenderViewImpl::CreateView(
    }
    params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
  
@@ -87,10 +87,10 @@ index 7bf0464c14f81b5c607c541f8ec7e5b4c860a25c..c90fd39058e3e0ab98727a71836e549e
    // moved on send.
    bool is_background_tab =
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
-index b02eb3cef899fd5bd2c8c38fc77039aa240f8a7a..0e2d1e3c50af833ec60e3c49df45da7c4782ee74 100644
+index 5faaea374484d51b1af261ff93fb96aec2eaa4e1..786d3a904a765b5cb53859c35a045b9e04b6250b 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
-@@ -330,6 +330,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -312,6 +312,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -100,10 +100,10 @@ index b02eb3cef899fd5bd2c8c38fc77039aa240f8a7a..0e2d1e3c50af833ec60e3c49df45da7c
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h
-index 3b30376feb2d32418978973316ad348ce4973ab1..508381ca134169d0bfe222bcf250ba1d7ca63dee 100644
+index 435f204a364e54b59c0bd651b760bf350ea94d11..1e6bee1fa08fa2d2a396678838d475e0e7e4ce0c 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.h
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.h
-@@ -69,6 +69,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
+@@ -68,6 +68,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
                         const std::string& frame_name,
                         WindowOpenDisposition disposition,
                         const blink::mojom::WindowFeatures& features,

patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch

@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Wed, 23 Oct 2019 14:17:18 -0700
-Subject: chore: use electron resources not chrome for spellchecker
-
-spellchecker uses a few IDS_ resources.  We need to load these from
-Electrons grit header instead of Chromes
-
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index aefba4a5a3ca9b7cd0b91693727ea77900dc714b..c9cf6c65386b6a600dab37663f3eef411956a96d 100644
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -5125,6 +5125,7 @@ jumbo_static_library("browser") {
-     deps += [
-       "//components/spellcheck/browser",
-       "//components/spellcheck/common",
-+      "//electron:resources",
-     ]
- 
-     if (!is_android) {
-diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
-index 48ac0a24efde0cb7d3ba71c8b8bdf5178f606e80..e2beefc276098fdc8f1cdab2e0edb8fae4ee67ca 100644
---- a/chrome/browser/spellchecker/spellcheck_factory.cc
-+++ b/chrome/browser/spellchecker/spellcheck_factory.cc
-@@ -6,7 +6,7 @@
- 
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/spellchecker/spellcheck_service.h"
--#include "chrome/grit/locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
-diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn
-index f28230ea94fece5ae8ca7ac27a14da48f40fadbb..c10eea103852b9411a644e1fe20a7e20a38bf187 100644
---- a/components/language/core/browser/BUILD.gn
-+++ b/components/language/core/browser/BUILD.gn
-@@ -31,6 +31,7 @@ static_library("browser") {
-     "//components/pref_registry",
-     "//components/prefs",
-     "//components/strings",
-+    "//electron:resources",
-     "//ui/base",
-   ]
- }
-diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
-index 4fd35c8d5bba01c25c906b19bb251222ba3d25b4..4770f0d6a8d145e5d16931d5caf4f1f85abead20 100644
---- a/components/language/core/browser/language_prefs.cc
-+++ b/components/language/core/browser/language_prefs.cc
-@@ -21,7 +21,7 @@
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
- #include "components/prefs/scoped_user_pref_update.h"
--#include "components/strings/grit/components_locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- 
- namespace language {

patches/chromium/command-ismediakey.patch

@@ -3,18 +3,48 @@ From: Jeremy Apthorp <jeremya@chromium.org>
 Date: Wed, 10 Oct 2018 15:07:34 -0700
 Subject: command-ismediakey.patch
 
-Override MediaKeysListener::IsMediaKeycode to also listen for Volume Up, Volume Down,
-and Mute. We also need to patch out Chromium's usage of RemoteCommandCenterDelegate, as
-it uses MPRemoteCommandCenter. MPRemoteCommandCenter makes it such that GlobalShortcuts
-in Electron will not work as intended, because by design an app does not receive remote
-control events until it begins playing audio. This means that a media shortcut would not kick
-into effect until you, for example, began playing a YouTube video which sort of defeats the
-purpose of GlobalShortcuts.
+define Command::IsMediaKey on mac; copied from //chrome/common/extensions/command.cc,
+which also defines a bunch of other stuff that depends on extensions.
+since we only need IsMediaKey, and we don't want the extensions stuff
+(and aren't compiling command.cc), it's safe to duplicate the
+definition. A candidate for upstreaming would be to move the IsMediaKey
+function into //ui.
 
-At the moment there is no upstream possibility for this; but perhaps Chromium may
-consider some kind of switch, enabled by default, which would conditionally choose to avoid usage of
-RemoteCommandCenterDelegate on macOS.
+Also apply electron/electron@0f67b1866a9f00b852370e721affa4efda623f3a
+and electron/electron@d2368d2d3b3de9eec4cc32b6aaf035cc89921bf1 as
+patches.
 
+diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/browser/extensions/global_shortcut_listener_mac.mm
+index befe726af9c10b1563a7fc0bb77cc55f65943d5c..46c6fe08bab8471007f78d3ef227e5195bfdf0e1 100644
+--- a/chrome/browser/extensions/global_shortcut_listener_mac.mm
++++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm
+@@ -21,6 +21,26 @@
+ 
+ namespace extensions {
+ 
++// NOTE: this is defined in command.cc, but command.cc is full of
++// chrome-extensions-specific logic that we don't want to depend on.
++// Since we don't build command.cc in Electron, it's safe to re-define this
++// function here. Ideally, though, `IsMediaKey` would be the responsibility of
++// `ui::Accelerator`, rather than `extensions::Command`.
++
++// static
++bool Command::IsMediaKey(const ui::Accelerator& accelerator) {
++  if (accelerator.modifiers() != 0)
++    return false;
++
++  return (accelerator.key_code() == ui::VKEY_MEDIA_NEXT_TRACK ||
++          accelerator.key_code() == ui::VKEY_MEDIA_PREV_TRACK ||
++          accelerator.key_code() == ui::VKEY_MEDIA_PLAY_PAUSE ||
++          accelerator.key_code() == ui::VKEY_MEDIA_STOP ||
++          accelerator.key_code() == ui::VKEY_VOLUME_UP ||
++          accelerator.key_code() == ui::VKEY_VOLUME_DOWN ||
++          accelerator.key_code() == ui::VKEY_VOLUME_MUTE);
++}
++
+ // static
+ GlobalShortcutListener* GlobalShortcutListener::GetInstance() {
+   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
 index c5125495b4d178ffb18be4d2d9670f7556412cbd..cddb321abb938c667a4a2089f87eab999510e9b1 100644
 --- a/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -57,34 +87,11 @@ index 392cf3d58c64c088596e8d321a2ce37b0ec60b6e..43e30f47240dc10a3a9b950255d4e487
  
    ui::Accelerator accelerator(
        ui::KeyboardCodeFromXKeyEvent(x_event), modifiers);
-diff --git a/ui/base/accelerators/media_keys_listener.cc b/ui/base/accelerators/media_keys_listener.cc
-index 1145e1f3d79482b5bb468c3128431ac674310e5f..e319e7a3e34e05b0e96d4a2dbb456355f327137a 100644
---- a/ui/base/accelerators/media_keys_listener.cc
-+++ b/ui/base/accelerators/media_keys_listener.cc
-@@ -13,7 +13,9 @@ MediaKeysListener::~MediaKeysListener() = default;
- // static
- bool MediaKeysListener::IsMediaKeycode(KeyboardCode key_code) {
-   return key_code == VKEY_MEDIA_PLAY_PAUSE || key_code == VKEY_MEDIA_STOP ||
--         key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK;
-+         key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK ||
-+         key_code == VKEY_VOLUME_UP || key_code == VKEY_VOLUME_DOWN ||
-+         key_code == VKEY_VOLUME_MUTE;
- }
- 
- }  // namespace ui
 diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
-index 85378bb565de617b1bd611d28c8714361747a357..d67d558b91b49835dfa927893093948093c54f7a 100644
+index f4e3126a4efd66f05c4f13e40ba23db10b8cca96..bb4c1a891dd13855227b39a0e582fd4dbc342ec9 100644
 --- a/ui/base/accelerators/media_keys_listener_mac.mm
 +++ b/ui/base/accelerators/media_keys_listener_mac.mm
-@@ -11,6 +11,7 @@
- #include <IOKit/hidsystem/ev_keymap.h>
- 
- #include "base/containers/flat_set.h"
-+#include "electron/buildflags/buildflags.h"
- #include "ui/base/accelerators/accelerator.h"
- #include "ui/base/accelerators/system_media_controls_media_keys_listener.h"
- 
-@@ -32,6 +33,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
+@@ -33,6 +33,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
      case NX_KEYTYPE_NEXT:
      case NX_KEYTYPE_FAST:
        return VKEY_MEDIA_NEXT_TRACK;
@@ -97,7 +104,7 @@ index 85378bb565de617b1bd611d28c8714361747a357..d67d558b91b49835dfa9278930939480
    }
    return VKEY_UNKNOWN;
  }
-@@ -192,7 +199,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
+@@ -193,7 +199,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
    int key_code = (data1 & 0xFFFF0000) >> 16;
    if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
        key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&

patches/chromium/content_browser_main_loop.patch

@@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
 in atom::CommonWebContentsDelegate::ResetManageWebContents.
 
 diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
-index 9da6475030a7962edc776e9427ce411eb11506dc..bc8031cde18f92c1f5a8c24adb4e654e3c381fd3 100644
+index 82f291613ac9682ddf414699046393125eb102eb..440681987b4d6420be93fe2f17180cb42adc8d2c 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
-@@ -1531,7 +1531,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
+@@ -1505,7 +1505,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
    NOTREACHED();
  #else
    base::RunLoop run_loop;