build: the win32 tests should build ia32 native modules

build: windows zip manifest is ia32 not x86
build: do not run electron hooks on the checkout-and-save-cache step group
2026-02-19 03:14:51 -05:00 · 2019-11-29 23:48:24 -08:00 · 2019-11-29 18:23:46 -08:00 · 2019-11-29 12:10:09 -08:00 · 2019-11-29 12:04:20 -08:00 · 2019-11-29 11:21:00 -08:00
1582 changed files with 40265 additions and 82012 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -6,11 +6,9 @@
    "browser": true
  },
  "rules": {
-    "semi": ["error", "always"],
    "no-var": "error",
    "no-unused-vars": 0,
    "no-global-assign": 0,
-    "guard-for-in": 2,
    "@typescript-eslint/no-unused-vars": ["error", {
      "vars": "all",
      "args": "after-used",
@@ -27,13 +25,7 @@
    "sourceType": "module"
  },
  "globals": {
-    "standardScheme": "readonly",
-    "BUILDFLAG": "readonly",
-    "ENABLE_DESKTOP_CAPTURER": "readonly",
-    "ENABLE_ELECTRON_EXTENSIONS": "readonly",
-    "ENABLE_REMOTE_MODULE": "readonly",
-    "ENABLE_VIEW_API": "readonly",
-    "BigInt": "readonly"
+    "standardScheme": "readonly"
  },
  "overrides": [
    {
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,14 +1,3 @@
 # `git apply` and friends don't understand CRLF, even on windows. Force those
 # files to be checked out with LF endings even if core.autocrlf is true.
 *.patch text eol=lf
-patches/**/.patches merge=union
-
-# Source code and markdown files should always use LF as line ending.
-*.cc text eol=lf
-*.mm text eol=lf
-*.h text eol=lf
-*.js text eol=lf
-*.ts text eol=lf
-*.py text eol=lf
-*.ps1 text eol=lf
-*.md text eol=lf
--- a/.github/ISSUE_TEMPLATE/security_report.md
+++ b/.github/ISSUE_TEMPLATE/security_report.md
@@ -0,0 +1,10 @@
+---
+name: Security report
+about: Do not create an issue for security reports, send an email to security@electronjs.org
+
+---
+
+### Notice 
+
+**DO NOT** create an issue for security reports.
+Send an email to: **security@electronjs.org**.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3,7 +3,6 @@ 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("//extensions/buildflags/buildflags.gni")
 import("//pdf/features.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
@@ -59,17 +58,6 @@ if (is_mas_build) {
         "It doesn't make sense to build a MAS build on a non-mac platform")
 }

-if (enable_pdf_viewer) {
-  assert(enable_pdf, "PDF viewer support requires enable_pdf=true")
-  assert(enable_electron_extensions,
-         "PDF viewer support requires enable_electron_extensions=true")
-}
-
-if (enable_electron_extensions) {
-  assert(enable_extensions,
-         "Chrome extension support requires enable_extensions=true")
-}
-
 config("branding") {
  defines = [
    "ELECTRON_PRODUCT_NAME=\"$electron_product_name\"",
@@ -91,11 +79,15 @@ npm_action("build_electron_definitions") {
  args = [ rebase_path("$target_gen_dir/tsc/typings/electron.d.ts") ]
  inputs = auto_filenames.api_docs + [ "yarn.lock" ]

-  outputs = [ "$target_gen_dir/tsc/typings/electron.d.ts" ]
+  outputs = [
+    "$target_gen_dir/tsc/typings/electron.d.ts",
+  ]
 }

 webpack_build("electron_browser_bundle") {
-  deps = [ ":build_electron_definitions" ]
+  deps = [
+    ":build_electron_definitions",
+  ]

  inputs = auto_filenames.browser_bundle_deps

@@ -104,7 +96,9 @@ webpack_build("electron_browser_bundle") {
 }

 webpack_build("electron_renderer_bundle") {
-  deps = [ ":build_electron_definitions" ]
+  deps = [
+    ":build_electron_definitions",
+  ]

  inputs = auto_filenames.renderer_bundle_deps

@@ -113,7 +107,9 @@ webpack_build("electron_renderer_bundle") {
 }

 webpack_build("electron_worker_bundle") {
-  deps = [ ":build_electron_definitions" ]
+  deps = [
+    ":build_electron_definitions",
+  ]

  inputs = auto_filenames.worker_bundle_deps

@@ -122,7 +118,9 @@ webpack_build("electron_worker_bundle") {
 }

 webpack_build("electron_sandboxed_renderer_bundle") {
-  deps = [ ":build_electron_definitions" ]
+  deps = [
+    ":build_electron_definitions",
+  ]

  inputs = auto_filenames.sandbox_bundle_deps

@@ -131,7 +129,9 @@ webpack_build("electron_sandboxed_renderer_bundle") {
 }

 webpack_build("electron_isolated_renderer_bundle") {
-  deps = [ ":build_electron_definitions" ]
+  deps = [
+    ":build_electron_definitions",
+  ]

  inputs = auto_filenames.isolated_bundle_deps

@@ -140,7 +140,9 @@ webpack_build("electron_isolated_renderer_bundle") {
 }

 webpack_build("electron_content_script_bundle") {
-  deps = [ ":build_electron_definitions" ]
+  deps = [
+    ":build_electron_definitions",
+  ]

  inputs = auto_filenames.content_script_bundle_deps

@@ -148,20 +150,22 @@ 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",
  ]
-  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
+  outputs = [
+    "$target_gen_dir/js2c/{{source_file_part}}",
+  ]
 }

-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",
@@ -169,11 +173,11 @@ action("electron_js2c") {

  webpack_sources = [
    "$target_gen_dir/js2c/browser_init.js",
+    "$target_gen_dir/js2c/renderer_init.js",
+    "$target_gen_dir/js2c/worker_init.js",
    "$target_gen_dir/js2c/content_script_bundle.js",
    "$target_gen_dir/js2c/isolated_bundle.js",
-    "$target_gen_dir/js2c/renderer_init.js",
    "$target_gen_dir/js2c/sandbox_bundle.js",
-    "$target_gen_dir/js2c/worker_init.js",
  ]

  sources = webpack_sources + [
@@ -182,7 +186,9 @@ action("electron_js2c") {
            ]

  inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
-  outputs = [ "$root_gen_dir/electron_natives.cc" ]
+  outputs = [
+    "$root_gen_dir/atom_natives.cc",
+  ]

  script = "tools/js2c.py"
  args = [ rebase_path("//third_party/electron_node") ] +
@@ -193,7 +199,9 @@ action("electron_js2c") {
 target_gen_default_app_js = "$target_gen_dir/js/default_app"

 typescript_build("default_app_js") {
-  deps = [ ":build_electron_definitions" ]
+  deps = [
+    ":build_electron_definitions",
+  ]
  type_root = rebase_path("$target_gen_dir/tsc/electron/typings")

  sources = filenames.default_app_ts_sources
@@ -205,12 +213,16 @@ typescript_build("default_app_js") {

 copy("default_app_static") {
  sources = filenames.default_app_static_sources
-  outputs = [ "$target_gen_default_app_js/{{source}}" ]
+  outputs = [
+    "$target_gen_default_app_js/{{source}}",
+  ]
 }

 copy("default_app_octicon_deps") {
  sources = filenames.default_app_octicon_sources
-  outputs = [ "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}" ]
+  outputs = [
+    "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}",
+  ]
 }

 asar("default_app_asar") {
@@ -224,7 +236,9 @@ asar("default_app_asar") {
  sources = get_target_outputs(":default_app_js") +
            get_target_outputs(":default_app_static") +
            get_target_outputs(":default_app_octicon_deps")
-  outputs = [ "$root_out_dir/resources/default_app.asar" ]
+  outputs = [
+    "$root_out_dir/resources/default_app.asar",
+  ]
 }

 grit("resources") {
@@ -236,19 +250,26 @@ grit("resources") {
  ]

  # Mojo manifest overlays are generated.
+  source_is_generated = true
  grit_flags = [
    "-E",
    "target_gen_dir=" + rebase_path(target_gen_dir, root_build_dir),
  ]

-  deps = [ ":copy_shell_devtools_discovery_page" ]
+  deps = [
+    ":copy_shell_devtools_discovery_page",
+  ]

  output_dir = "$target_gen_dir"
 }

 copy("copy_shell_devtools_discovery_page") {
-  sources = [ "//content/shell/resources/shell_devtools_discovery_page.html" ]
-  outputs = [ "$target_gen_dir/shell_devtools_discovery_page.html" ]
+  sources = [
+    "//content/shell/resources/shell_devtools_discovery_page.html",
+  ]
+  outputs = [
+    "$target_gen_dir/shell_devtools_discovery_page.html",
+  ]
 }

 if (is_linux) {
@@ -294,7 +315,9 @@ source_set("manifests") {
 npm_action("electron_version_args") {
  script = "generate-version-json"

-  outputs = [ "$target_gen_dir/electron_version.args" ]
+  outputs = [
+    "$target_gen_dir/electron_version.args",
+  ]

  args = rebase_path(outputs)

@@ -305,7 +328,9 @@ npm_action("electron_version_args") {
 }

 templated_file("electron_version_header") {
-  deps = [ ":electron_version_args" ]
+  deps = [
+    ":electron_version_args",
+  ]

  template = "build/templates/electron_version.tmpl"
  output = "$target_gen_dir/electron_version.h"
@@ -323,17 +348,16 @@ 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",
    "//base/allocator:buildflags",
-    "//chrome/app:command_ids",
    "//chrome/app/resources:platform_locale_settings",
    "//chrome/services/printing/public/mojom",
    "//components/certificate_transparency",
@@ -343,10 +367,7 @@ source_set("electron_lib") {
    "//components/network_hints/common:mojo_bindings",
    "//components/network_hints/renderer",
    "//components/network_session_configurator/common",
-    "//components/pref_registry",
    "//components/prefs",
-    "//components/upload_list",
-    "//components/user_prefs",
    "//components/viz/host",
    "//components/viz/service",
    "//content/public/browser",
@@ -362,10 +383,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",
@@ -377,7 +400,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",
@@ -442,9 +465,6 @@ source_set("electron_lib") {
      "*\bviews/*",
    ]
  }
-  if (!is_mas_build) {
-    deps += [ "//components/crash/core/app" ]
-  }

  set_sources_assignment_filter(
      sources_assignment_filter + extra_source_filters)
@@ -462,8 +482,8 @@ source_set("electron_lib") {
    ]
  }

-  if (is_linux) {
-    deps += [ "//components/crash/content/browser" ]
+  if (enable_builtin_spellchecker) {
+    deps += [ "chromium_src:chrome_spellchecker" ]
  }

  if (is_mac) {
@@ -473,10 +493,6 @@ source_set("electron_lib") {
      "//ui/accelerated_widget_mac",
    ]

-    if (!is_mas_build) {
-      deps += [ "//third_party/crashpad/crashpad/client" ]
-    }
-
    libs = [
      "AVFoundation.framework",
      "Carbon.framework",
@@ -494,15 +510,13 @@ 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/auto_updater_mac.mm" ]
-      defines += [ "MAS_BUILD" ]
+      sources += [ "shell/browser/api/atom_api_app_mas.mm" ]
      sources -= [
-        "shell/app/electron_crash_reporter_client.cc",
-        "shell/app/electron_crash_reporter_client.h",
-        "shell/common/crash_keys.cc",
-        "shell/common/crash_keys.h",
+        "shell/browser/auto_updater_mac.mm",
+        "shell/common/crash_reporter/crash_reporter_mac.h",
+        "shell/common/crash_reporter/crash_reporter_mac.mm",
      ]
+      defines += [ "MAS_BUILD" ]
    } else {
      libs += [
        "Squirrel.framework",
@@ -522,21 +536,17 @@ source_set("electron_lib") {
    deps += [
      ":libnotify_loader",
      "//build/config/linux/gtk",
+      "//chrome/browser/ui/libgtkui",
      "//dbus",
      "//device/bluetooth",
+      "//third_party/breakpad:client",
      "//ui/events/devices/x11",
      "//ui/events/platform/x11",
-      "//ui/gtk",
      "//ui/views/controls/webview",
      "//ui/wm",
    ]
-    if (use_x11) {
-      deps += [
-        "//ui/gfx/x",
-        "//ui/gtk:x",
-      ]
-    }
    configs += [ ":gio_unix" ]
+    include_dirs += [ "//third_party/breakpad" ]
    configs += [ "//build/config/linux:x11" ]
    defines += [
      # Disable warnings for g_settings_list_schemas.
@@ -545,16 +555,6 @@ source_set("electron_lib") {

    sources += filenames.lib_sources_nss
    sources += [
-      "shell/browser/ui/gtk/app_indicator_icon.cc",
-      "shell/browser/ui/gtk/app_indicator_icon.h",
-      "shell/browser/ui/gtk/app_indicator_icon_menu.cc",
-      "shell/browser/ui/gtk/app_indicator_icon_menu.h",
-      "shell/browser/ui/gtk/gtk_status_icon.cc",
-      "shell/browser/ui/gtk/gtk_status_icon.h",
-      "shell/browser/ui/gtk/menu_util.cc",
-      "shell/browser/ui/gtk/menu_util.h",
-      "shell/browser/ui/gtk/status_icon.cc",
-      "shell/browser/ui/gtk/status_icon.h",
      "shell/browser/ui/gtk_util.cc",
      "shell/browser/ui/gtk_util.h",
    ]
@@ -562,7 +562,6 @@ source_set("electron_lib") {
  if (is_win) {
    libs += [ "dwmapi.lib" ]
    deps += [
-      "//components/crash/core/app:crash_export_thunks",
      "//ui/native_theme:native_theme_browser",
      "//ui/views/controls/webview",
      "//ui/wm",
@@ -574,6 +573,14 @@ source_set("electron_lib") {
    ]
  }

+  if ((is_mac && !is_mas_build) || is_win) {
+    sources += [
+      "shell/common/crash_reporter/crash_reporter_crashpad.cc",
+      "shell/common/crash_reporter/crash_reporter_crashpad.h",
+    ]
+    deps += [ "//third_party/crashpad/crashpad/client" ]
+  }
+
  if (enable_plugins) {
    deps += [ "chromium_src:plugins" ]
    sources += [
@@ -613,6 +620,8 @@ source_set("electron_lib") {

  if (enable_remote_module) {
    sources += [
+      "shell/common/api/remote/object_life_monitor.cc",
+      "shell/common/api/remote/object_life_monitor.h",
      "shell/common/api/remote/remote_callback_freer.cc",
      "shell/common/api/remote/remote_callback_freer.h",
      "shell/common/api/remote/remote_object_freer.cc",
@@ -628,27 +637,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",
    ]
  }

@@ -659,32 +668,26 @@ source_set("electron_lib") {
      "shell/renderer/printing/print_render_frame_helper_delegate.cc",
      "shell/renderer/printing/print_render_frame_helper_delegate.h",
    ]
-    deps += [ "//components/printing/common:mojo_interfaces" ]
  }

+  public_deps += [ "shell/common/extensions/api:extensions_features" ]
+  deps += [
+    "//components/pref_registry",
+    "//components/user_prefs",
+    "//extensions/browser",
+    "//extensions/browser:core_api_provider",
+    "//extensions/common",
+    "//extensions/common:core_api_provider",
+    "//extensions/renderer",
+  ]
  if (enable_electron_extensions) {
    sources += filenames.lib_sources_extensions
-    deps += [
-      "shell/browser/extensions/api:api_registration",
-      "shell/common/extensions/api",
-      "shell/common/extensions/api:extensions_features",
-      "//chrome/browser/resources:component_extension_resources",
-      "//components/zoom",
-      "//extensions/browser",
-      "//extensions/browser:core_api_provider",
-      "//extensions/common",
-      "//extensions/common:core_api_provider",
-      "//extensions/renderer",
-    ]
  }

  if (enable_pdf) {
    # Printing depends on some //pdf code, so it needs to be built even if the
    # pdf viewer isn't enabled.
-    deps += [
-      "//pdf",
-      "//pdf:features",
-    ]
+    deps += [ "//pdf" ]
  }
  if (enable_pdf_viewer) {
    deps += [
@@ -715,11 +718,15 @@ if (is_mac) {
  electron_version = read_file("ELECTRON_VERSION", "trim string")

  mac_xib_bundle_data("electron_xibs") {
-    sources = [ "shell/common/resources/mac/MainMenu.xib" ]
+    sources = [
+      "shell/common/resources/mac/MainMenu.xib",
+    ]
  }

  bundle_data("electron_framework_resources") {
-    public_deps = [ ":packed_resources" ]
+    public_deps = [
+      ":packed_resources",
+    ]
    sources = []
    if (icu_use_data_file) {
      sources += [ "$root_out_dir/icudtl.dat" ]
@@ -734,16 +741,22 @@ if (is_mac) {
        sources += [ "$root_out_dir/snapshot_blob.bin" ]
      }
    }
-    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
+    outputs = [
+      "{{bundle_resources_dir}}/{{source_file_part}}",
+    ]
  }

-  if (!is_component_build && is_component_ffmpeg) {
+  if (!is_component_build) {
    bundle_data("electron_framework_libraries") {
      sources = []
      public_deps = []
-      sources += [ "$root_out_dir/libffmpeg.dylib" ]
-      public_deps += [ "//third_party/ffmpeg:ffmpeg" ]
-      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      if (is_component_ffmpeg) {
+        sources += [ "$root_out_dir/libffmpeg.dylib" ]
+        public_deps += [ "//third_party/ffmpeg:ffmpeg" ]
+      }
+      outputs = [
+        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
+      ]
    }
  } else {
    group("electron_framework_libraries") {
@@ -756,8 +769,12 @@ if (is_mac) {
        "$root_out_dir/egl_intermediates/libEGL.dylib",
        "$root_out_dir/egl_intermediates/libGLESv2.dylib",
      ]
-      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-      public_deps = [ "//ui/gl:angle_library_copy" ]
+      outputs = [
+        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
+      ]
+      public_deps = [
+        "//ui/gl:angle_library_copy",
+      ]
    }

    # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
@@ -765,40 +782,43 @@ if (is_mac) {
      sources = [
        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
-        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
-        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
      ]
-      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      outputs = [
+        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
+      ]
      public_deps = [
-        "//ui/gl:swiftshader_egl_library_copy",
-        "//ui/gl:swiftshader_vk_library_copy",
+        "//ui/gl:swiftshader_library_copy",
      ]
    }
  }
  group("electron_angle_library") {
    if (use_egl) {
-      deps = [ ":electron_angle_binaries" ]
+      deps = [
+        ":electron_angle_binaries",
+      ]
    }
  }

  group("electron_swiftshader_library") {
    if (use_egl) {
-      deps = [ ":electron_swiftshader_binaries" ]
+      deps = [
+        ":electron_swiftshader_binaries",
+      ]
    }
  }

  bundle_data("electron_crashpad_helper") {
-    sources = [ "$root_out_dir/chrome_crashpad_handler" ]
+    sources = [
+      "$root_out_dir/crashpad_handler",
+    ]

-    outputs = [ "{{bundle_contents_dir}}/Helpers/{{source_file_part}}" ]
+    outputs = [
+      "{{bundle_resources_dir}}/{{source_file_part}}",
+    ]

-    public_deps = [ "//components/crash/core/app:chrome_crashpad_handler" ]
-
-    if (is_asan) {
-      # crashpad_handler requires the ASan runtime at its @executable_path.
-      sources += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ]
-      public_deps += [ "//build/config/sanitizers:copy_asan_runtime" ]
-    }
+    public_deps = [
+      "//third_party/crashpad/crashpad/handler:crashpad_handler",
+    ]
  }

  mac_framework_bundle("electron_framework") {
@@ -808,9 +828,6 @@ if (is_mac) {
      "Resources",
      "Libraries",
    ]
-    if (!is_mas_build) {
-      framework_contents += [ "Helpers" ]
-    }
    public_deps = [
      ":electron_framework_libraries",
      ":electron_lib",
@@ -834,7 +851,6 @@ if (is_mac) {

    include_dirs = [ "." ]
    sources = filenames.framework_sources
-    libs = []

    if (enable_osr) {
      libs += [ "IOSurface.framework" ]
@@ -860,13 +876,15 @@ if (is_mac) {
      assert(defined(invoker.helper_name_suffix))

      output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [ ":electron_framework+link" ]
+      deps = [
+        ":electron_framework+link",
+      ]
      if (!is_mas_build) {
        deps += [ "//sandbox/mac:seatbelt" ]
      }
      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 =
@@ -894,7 +912,9 @@ if (is_mac) {
  }

  bundle_data("electron_app_framework_bundle_data") {
-    sources = [ "$root_out_dir/$electron_framework_name.framework" ]
+    sources = [
+      "$root_out_dir/$electron_framework_name.framework",
+    ]
    if (!is_mas_build) {
      sources += [
        "external_binaries/Mantle.framework",
@@ -902,8 +922,12 @@ if (is_mac) {
        "external_binaries/Squirrel.framework",
      ]
    }
-    outputs = [ "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}" ]
-    public_deps = [ ":electron_framework+link" ]
+    outputs = [
+      "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}",
+    ]
+    public_deps = [
+      ":electron_framework+link",
+    ]

    foreach(helper_params, content_mac_helpers) {
      sources +=
@@ -923,10 +947,15 @@ if (is_mac) {
  }

  bundle_data("electron_login_helper_app") {
-    public_deps = [ ":electron_login_helper" ]
-    sources = [ "$root_out_dir/$electron_login_helper_name.app" ]
-    outputs =
-        [ "{{bundle_contents_dir}}/Library/LoginItems/{{source_file_part}}" ]
+    public_deps = [
+      ":electron_login_helper",
+    ]
+    sources = [
+      "$root_out_dir/$electron_login_helper_name.app",
+    ]
+    outputs = [
+      "{{bundle_contents_dir}}/Library/LoginItems/{{source_file_part}}",
+    ]
  }

  action("electron_app_lproj_dirs") {
@@ -941,9 +970,15 @@ if (is_mac) {

  foreach(locale, locales_as_mac_outputs) {
    bundle_data("electron_app_strings_${locale}_bundle_data") {
-      sources = [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
-      outputs = [ "{{bundle_resources_dir}}/$locale.lproj" ]
-      public_deps = [ ":electron_app_lproj_dirs" ]
+      sources = [
+        "$target_gen_dir/app_infoplist_strings/$locale.lproj",
+      ]
+      outputs = [
+        "{{bundle_resources_dir}}/$locale.lproj",
+      ]
+      public_deps = [
+        ":electron_app_lproj_dirs",
+      ]
    }
  }
  group("electron_app_strings_bundle_data") {
@@ -962,13 +997,15 @@ if (is_mac) {
      "$root_out_dir/resources/default_app.asar",
      "shell/browser/resources/mac/electron.icns",
    ]
-    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
+    outputs = [
+      "{{bundle_resources_dir}}/{{source_file_part}}",
+    ]
  }

  mac_app_bundle("electron_app") {
    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",
@@ -993,7 +1030,9 @@ if (is_mac) {
      binary = "$root_out_dir/$electron_framework_name.framework/Versions/$electron_framework_version/$electron_framework_name"
      symbol_dir = "$root_out_dir/breakpad_symbols"
      dsym_file = "$root_out_dir/$electron_framework_name.dSYM/Contents/Resources/DWARF/$electron_framework_name"
-      deps = [ ":electron_framework" ]
+      deps = [
+        ":electron_framework",
+      ]
    }

    foreach(helper_params, content_mac_helpers) {
@@ -1004,7 +1043,9 @@ if (is_mac) {
        binary = "$root_out_dir/$electron_helper_name${_helper_suffix}.app/Contents/MacOS/$electron_helper_name${_helper_suffix}"
        symbol_dir = "$root_out_dir/breakpad_symbols"
        dsym_file = "$root_out_dir/$electron_helper_name${_helper_suffix}.dSYM/Contents/Resources/DWARF/$electron_helper_name${_helper_suffix}"
-        deps = [ ":electron_helper_app_${_helper_target}" ]
+        deps = [
+          ":electron_helper_app_${_helper_target}",
+        ]
      }
    }

@@ -1012,15 +1053,18 @@ if (is_mac) {
      binary = "$root_out_dir/$electron_product_name.app/Contents/MacOS/$electron_product_name"
      symbol_dir = "$root_out_dir/breakpad_symbols"
      dsym_file = "$root_out_dir/$electron_product_name.dSYM/Contents/Resources/DWARF/$electron_product_name"
-      deps = [ ":electron_app" ]
+      deps = [
+        ":electron_app",
+      ]
    }

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

    extract_symbols("swiftshader_gles_syms") {
@@ -1033,24 +1077,23 @@ if (is_mac) {
    }

    extract_symbols("crashpad_handler_syms") {
-      binary = "$root_out_dir/chrome_crashpad_handler"
+      binary = "$root_out_dir/crashpad_handler"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      dsym_file = "$root_out_dir/chrome_crashpad_handler.dSYM/Contents/Resources/DWARF/chrome_crashpad_handler"
-      deps = [ "//components/crash/core/app:chrome_crashpad_handler" ]
+      dsym_file = "$root_out_dir/crashpad_handler.dSYM/Contents/Resources/DWARF/crashpad_handler"
+      deps = [
+        "//third_party/crashpad/crashpad/handler:crashpad_handler",
+      ]
    }

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

-      if (!is_mas_build) {
-        deps += [ ":crashpad_handler_syms" ]
-      }
-
      foreach(helper_params, content_mac_helpers) {
        _helper_target = helper_params[0]
        deps += [ ":electron_helper_syms_${_helper_target}" ]
@@ -1080,7 +1123,6 @@ if (is_mac) {
      ":electron_app_manifest",
      ":electron_lib",
      ":packed_resources",
-      "//components/crash/core/app",
      "//content:sandbox_helper_win",
      "//electron/buildflags",
      "//ui/strings",
@@ -1101,7 +1143,9 @@ if (is_mac) {
      data += [ "$root_out_dir/resources/default_app.asar" ]
    }

-    public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
+    public_deps = [
+      "//tools/v8_context_snapshot:v8_context_snapshot",
+    ]

    if (is_win) {
      sources += [
@@ -1110,22 +1154,20 @@ if (is_mac) {
        "shell/browser/resources/win/resource.h",
      ]

-      deps += [
-        "//components/browser_watcher:browser_watcher_client",
-        "//components/crash/core/app:run_as_crashpad_handler",
-      ]
-
-      ldflags = []
-
      libs = [
        "comctl32.lib",
        "uiautomationcore.lib",
        "wtsapi32.lib",
      ]

-      configs += [
-        "//build/config/win:windowed",
-        "//build/config/win:delayloads",
+      configs += [ "//build/config/win:windowed" ]
+
+      ldflags = [
+        # Windows 7 doesn't have these DLLs.
+        # TODO: are there other DLLs we need to list here to be win7
+        # compatible?
+        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
+        "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
      ]

      # This is to support renaming of electron.exe. node-gyp has hard-coded
@@ -1160,14 +1202,17 @@ if (is_mac) {
    extract_symbols("electron_app_symbols") {
      binary = "$root_out_dir/$electron_project_name$_target_executable_suffix"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [ ":electron_app" ]
+      deps = [
+        ":electron_app",
+      ]
    }

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

    extract_symbols("swiftshader_gles_symbols") {
@@ -1239,7 +1284,9 @@ template("dist_zip") {

  action(target_name) {
    script = "//electron/build/zip.py"
-    deps = [ ":$_runtime_deps_target" ]
+    deps = [
+      ":$_runtime_deps_target",
+    ]
    forward_variables_from(invoker,
                           [
                             "outputs",
@@ -1258,64 +1305,78 @@ template("dist_zip") {
 }

 copy("electron_license") {
-  sources = [ "LICENSE" ]
-  outputs = [ "$root_build_dir/{{source_file_part}}" ]
+  sources = [
+    "LICENSE",
+  ]
+  outputs = [
+    "$root_build_dir/{{source_file_part}}",
+  ]
 }
 copy("chromium_licenses") {
-  deps = [ "//components/resources:about_credits" ]
-  sources = [ "$root_gen_dir/components/resources/about_credits.html" ]
-  outputs = [ "$root_build_dir/LICENSES.chromium.html" ]
+  deps = [
+    "//components/resources:about_credits",
+  ]
+  sources = [
+    "$root_gen_dir/components/resources/about_credits.html",
+  ]
+  outputs = [
+    "$root_build_dir/LICENSES.chromium.html",
+  ]
 }

 group("licenses") {
  data_deps = [
-    ":chromium_licenses",
    ":electron_license",
+    ":chromium_licenses",
  ]
 }

 copy("electron_version") {
-  sources = [ "ELECTRON_VERSION" ]
-  outputs = [ "$root_build_dir/version" ]
+  sources = [
+    "ELECTRON_VERSION",
+  ]
+  outputs = [
+    "$root_build_dir/version",
+  ]
 }

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

 dist_zip("electron_ffmpeg_zip") {
-  data_deps = [ "//third_party/ffmpeg" ]
-  outputs = [ "$root_build_dir/ffmpeg.zip" ]
-}
-
-electron_chromedriver_deps = [
-  ":licenses",
-  "//chrome/test/chromedriver",
-  "//electron/buildflags",
-]
-
-group("electron_chromedriver") {
-  testonly = true
-  public_deps = electron_chromedriver_deps
+  data_deps = [
+    "//third_party/ffmpeg",
+  ]
+  outputs = [
+    "$root_build_dir/ffmpeg.zip",
+  ]
 }

 dist_zip("electron_chromedriver_zip") {
  testonly = true
-  data_deps = electron_chromedriver_deps
-  outputs = [ "$root_build_dir/chromedriver.zip" ]
+  data_deps = [
+    "//chrome/test/chromedriver",
+    ":licenses",
+  ]
+  outputs = [
+    "$root_build_dir/chromedriver.zip",
+  ]
 }

 mksnapshot_deps = [
  ":licenses",
-  "//tools/v8_context_snapshot:v8_context_snapshot_generator($v8_snapshot_toolchain)",
+  "//tools/v8_context_snapshot:v8_context_snapshot_generator",
  "//v8:mksnapshot($v8_snapshot_toolchain)",
 ]

@@ -1325,21 +1386,31 @@ group("electron_mksnapshot") {

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

 copy("hunspell_dictionaries") {
  sources = hunspell_dictionaries + hunspell_licenses
-  outputs = [ "$target_gen_dir/electron_hunspell/{{source_file_part}}" ]
+  outputs = [
+    "$target_gen_dir/electron_hunspell/{{source_file_part}}",
+  ]
 }

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

-  outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
+  outputs = [
+    "$root_build_dir/hunspell_dictionaries.zip",
+  ]
 }

 group("electron") {
-  public_deps = [ ":electron_app" ]
+  public_deps = [
+    ":electron_app",
+  ]
 }
--- a/11
+++ b/11
@@ -6,15 +6,14 @@ gclient_gn_args = [
  'checkout_libaom',
  'checkout_nacl',
  'checkout_oculus_sdk',
-  'checkout_openxr',
-  'checkout_google_benchmark'
+  'checkout_openxr'
 ]

 vars = {
  'chromium_version':
-    '83.0.4103.122',
+    'dc9525d251bf30828899e4cd7161f6dc6507023f',
  'node_version':
-    'v12.14.1',
+    'v12.13.0',
  'nan_version':
    '2ee313aaca52e2b478965ac50eb5082520380d1b',

@@ -70,8 +69,6 @@ vars = {
    False,
  'checkout_android_native_support':
    False,
-  'checkout_google_benchmark':
-    False,
 }

 deps = {
@@ -155,5 +152,3 @@ hooks = [
 recursedeps = [
  'src',
 ]
-
-# Touch DEPS again to bust cache
--- a/2
+++ b/2
@@ -1 +1 @@
-9.4.3
+9.0.0-nightly.20191127
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2020 GitHub Inc.
+Copyright (c) 2013-2019 GitHub Inc.

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,7 @@

 version: 1.0.{build}
 build_cloud: libcc-20
-image: vs2019bt-16.4.0
+image: vs2019-16.3-10.0.18362
 environment:
  GIT_CACHE_PATH: C:\Users\electron\libcc_cache
  ELECTRON_OUT_DIR: Default
@@ -53,9 +53,7 @@ build_script:
      } else {
        node script/yarn.js install --frozen-lockfile

-        $result = node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-        Write-Output $result
-        if ($result.ExitCode -eq 0) {
+        if ($(node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH;$LASTEXITCODE -eq 0)) {
          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
        }
      }
@@ -80,7 +78,7 @@ build_script:
      "https://github.com/electron/electron"
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
-        $env:RUN_GCLIENT_SYNC="true"
+        gclient sync --with_branch_heads --with_tags --reset
      } else {
        cd src\electron
        node script\generate-deps-hash.js
@@ -90,73 +88,38 @@ build_script:
        if (Test-Path -Path $zipfile) {
          # file exists, unzip and then gclient sync
          7z x -y $zipfile -mmt=30 -aoa
-          if (-not (Test-Path -Path "src\buildtools")) {
-            # the zip file must be corrupt - resync
-            $env:RUN_GCLIENT_SYNC="true"
-            if ($env:TARGET_ARCH -ne 'ia32') {
-              # only save on x64/woa to avoid contention saving
-              $env:SAVE_GCLIENT_SRC="true"
-            }
-          } else {
-            # update external binaries
-            python src/electron/script/update-external-binaries.py
-          }
+          # update external binaries
+          python src/electron/script/update-external-binaries.py
        } else {    
          # file does not exist, gclient sync, then zip
-          $env:RUN_GCLIENT_SYNC="true"
+          gclient sync --with_branch_heads --with_tags --reset
          if ($env:TARGET_ARCH -ne 'ia32') {
-            # only save on x64/woa to avoid contention saving
-            $env:SAVE_GCLIENT_SRC="true"
+            # archive current source for future use 
+            # only run on x64/woa to avoid contention saving
+            if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
+              Write-warning "Could not save source to shared drive; continuing anyway"
+            }
          }
        }
      }
-  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags --ignore_locks)
-  - ps: >-
-      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
-        # archive current source for future use 
-        # only run on x64/woa to avoid contention saving
-        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
-          Write-warning "Could not save source to shared drive; continuing anyway"
-        }
-      }
-  - ps: >-
-      if ($env:GN_CONFIG -ne 'release') {
-        if (Test-Path 'env:RAW_GOMA_AUTH') {
-          $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
-          $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE      
-        }
-        git clone https://github.com/electron/build-tools.git
-        cd build-tools
-        npm install
-        mkdir third_party
-        node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-        $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-        $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-        cd ..
-        .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
-      }
  - cd src
-  - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
-  - if DEFINED GN_GOMA_FILE (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% ") else (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS% cc_wrapper=\"%SCCACHE_PATH%\"")
+  - 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 check out/Default //electron:electron_lib
  - gn check out/Default //electron:electron_app
  - gn check out/Default //electron:manifests
  - gn check out/Default //electron/shell/common/api:mojo
-  - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
-  - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
+  - ninja -C out/Default electron:electron_app
+  - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default )  
  - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
  - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
  - ninja -C out/Default electron:electron_dist_zip
  - ninja -C out/Default shell_browser_ui_unittests
-  - gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
  - ninja -C out/Default electron:electron_mksnapshot_zip
-  - cd out\Default
-  - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
-  - cd ..\..
  - ninja -C out/Default electron:hunspell_dictionaries_zip
  - ninja -C out/Default electron:electron_chromedriver_zip
  - ninja -C out/Default third_party/electron_node:headers
-  - if "%GN_CONFIG%"=="testing" ( python %LOCAL_GOMA_DIR%\goma_ctl.py stat )
+  - cmd /C %SCCACHE_PATH% --show-stats
  - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
  - appveyor PushArtifact out/Default/windows_toolchain_profile.json
  - appveyor PushArtifact out/Default/dist.zip
@@ -177,12 +140,12 @@ build_script:
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
        python electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        appveyor PushArtifact out/Default/symbols.zip
      } else {
        # It's useful to have pdb files when debugging testing builds that are
        # built on CI.
        7z a pdb.zip out\Default\*.pdb
-        appveyor-retry appveyor PushArtifact pdb.zip
+        appveyor PushArtifact pdb.zip
      }
  - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:
@@ -206,18 +169,16 @@ test_script:
  - echo "About to verify mksnapshot"
  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
  - echo "Done verifying mksnapshot"
-  - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
-  - echo "Done verifying chromedriver"
 deploy_script:
  - cd electron
  - ps: >-
      if (Test-Path Env:\ELECTRON_RELEASE) {
        if (Test-Path Env:\UPLOAD_TO_S3) {
          Write-Output "Uploading Electron release distribution to s3"
-          & python script\release\uploaders\upload.py --verbose --upload_to_s3
+          & python script\release\uploaders\upload.py --upload_to_s3
        } else {
          Write-Output "Uploading Electron release distribution to github releases"
-          & python script\release\uploaders\upload.py --verbose
+          & python script\release\uploaders\upload.py
        }
      } elseif (Test-Path Env:\TEST_WOA) {
        node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -88,6 +88,5 @@ steps:
 - powershell: |
    Get-Process | Where Name –Like "electron*" | Stop-Process
    Get-Process | Where Name –Like "MicrosoftEdge*" | Stop-Process
-    Get-Process | Where Name –Like "msedge*" | Stop-Process
  displayName: 'Kill processes left running from last test run'
  condition: always()
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

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

 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
@@ -17,6 +17,8 @@ ffmpeg_branding = "Chrome"

 enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
-dawn_enable_vulkan_validation_layers = false

 is_cfi = false
+
+# TODO: disabled due to crashes. re-enable.
+enable_osr = false
--- a/build/args/goma.gn
+++ b/build/args/goma.gn
@@ -1,2 +0,0 @@
-goma_dir = rebase_path("//electron/external_binaries/goma")
-use_goma = true
--- a/build/extract_symbols.gni
+++ b/build/extract_symbols.gni
@@ -34,7 +34,9 @@ template("extract_symbols") {
      dump_syms_binary,
    ]
    stamp_file = "${target_gen_dir}/${target_name}.stamp"
-    outputs = [ stamp_file ]
+    outputs = [
+      stamp_file,
+    ]
    args = [
      "./" + rebase_path(dump_syms_binary, root_build_dir),
      rebase_path(invoker.binary, root_build_dir),
--- a/build/npm.gni
+++ b/build/npm.gni
@@ -10,7 +10,9 @@ template("npm_action") {
    ]
    script = "//electron/build/npm-run.py"

-    outputs = [ "$target_gen_dir/npm_pre_stamps/" + target_name + ".stamp" ]
+    outputs = [
+      "$target_gen_dir/npm_pre_stamps/" + target_name + ".stamp",
+    ]

    args = [
      "--silent",
--- a/build/rules.gni
+++ b/build/rules.gni
@@ -81,7 +81,9 @@ template("mac_xib_bundle_data") {
                             "visibility",
                           ])

-    public_deps = [ ":$_compile_target_name" ]
+    public_deps = [
+      ":$_compile_target_name",
+    ]
    sources = get_target_outputs(":$_compile_target_name")

    _output_path = "{{bundle_resources_dir}}"
@@ -89,6 +91,8 @@ template("mac_xib_bundle_data") {
      _output_path = invoker.output_path
    }

-    outputs = [ "$_output_path/{{source_file_part}}" ]
+    outputs = [
+      "$_output_path/{{source_file_part}}",
+    ]
  }
 }
--- a/build/templated_file.gni
+++ b/build/templated_file.gni
@@ -15,8 +15,12 @@ template("templated_file") {
                             "inputs",
                             "outputs",
                           ])
-    inputs = [ invoker.template ]
-    outputs = [ invoker.output ]
+    inputs = [
+      invoker.template,
+    ]
+    outputs = [
+      invoker.output,
+    ]
    script = "//electron/build/generate-template.py"
    args = [
      rebase_path(invoker.template),
--- a/build/webpack/run-compiler.js
+++ b/build/webpack/run-compiler.js
@@ -1,4 +1,3 @@
-const fs = require('fs');
 const path = require('path')
 const webpack = require('webpack')

@@ -10,9 +9,7 @@ config.output = {
  filename: path.basename(outPath)
 }

-const { wrapInitWithProfilingTimeout, wrapInitWithTryCatch, ...webpackConfig } = config;
-
-webpack(webpackConfig, (err, stats) => {
+webpack(config, (err, stats) => {
  if (err) {
    console.error(err)
    process.exit(1)
@@ -20,26 +17,6 @@ webpack(webpackConfig, (err, stats) => {
    console.error(stats.toString('normal'))
    process.exit(1)
  } else {
-    let contents = fs.readFileSync(outPath, 'utf8');
-    if (wrapInitWithTryCatch) {
-      contents = `try {
-${contents}
-} catch (err) {
-  console.error('Electron ${webpackConfig.output.filename} script failed to run');
-  console.error(err);
-}`;
-    }
-    if (wrapInitWithProfilingTimeout) {
-      contents = `function ___electron_webpack_init__() {
-${contents}
-};
-if ((globalThis.process || binding.process).argv.includes("--profile-electron-init")) {
-  setTimeout(___electron_webpack_init__, 0);
-} else {
-  ___electron_webpack_init__();
-}`;
-    }
-    fs.writeFileSync(outPath, contents)
    process.exit(0)
  }
 })
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -1,7 +1,6 @@
 const fs = require('fs')
 const path = require('path')
 const webpack = require('webpack')
-const TerserPlugin = require('terser-webpack-plugin');

 const electronRoot = path.resolve(__dirname, '../..')

@@ -21,73 +20,11 @@ class AccessDependenciesPlugin {
  }
 }

-const defines = {
-  BUILDFLAG: onlyPrintingGraph ? '(a => a)' : ''
-}
-
-const buildFlagsPrefix = '--buildflags='
-const buildFlagArg = process.argv.find(arg => arg.startsWith(buildFlagsPrefix))
-
-if (buildFlagArg) {
-  const buildFlagPath = buildFlagArg.substr(buildFlagsPrefix.length)
-
-  const flagFile = fs.readFileSync(buildFlagPath, 'utf8')
-  for (const line of flagFile.split(/(\r\n|\r|\n)/g)) {
-    const flagMatch = line.match(/#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/)
-    if (flagMatch) {
-      const [, flagName, flagValue] = flagMatch;
-      defines[flagName] = JSON.stringify(Boolean(parseInt(flagValue, 10)));
-    }
-  }
-}
-
-const ignoredModules = []
-
-if (defines['ENABLE_DESKTOP_CAPTURER'] === 'false') {
-  ignoredModules.push(
-    '@electron/internal/browser/desktop-capturer',
-    '@electron/internal/renderer/api/desktop-capturer'
-  )
-}
-
-if (defines['ENABLE_REMOTE_MODULE'] === 'false') {
-  ignoredModules.push(
-    '@electron/internal/browser/remote/server',
-    '@electron/internal/renderer/api/remote'
-  )
-}
-
-if (defines['ENABLE_VIEW_API'] === 'false') {
-  ignoredModules.push(
-    '@electron/internal/browser/api/views/box-layout',
-    '@electron/internal/browser/api/views/button',
-    '@electron/internal/browser/api/views/label-button',
-    '@electron/internal/browser/api/views/layout-manager',
-    '@electron/internal/browser/api/views/md-text-button',
-    '@electron/internal/browser/api/views/resize-area',
-    '@electron/internal/browser/api/views/text-field'
-  )
-}
-
-if (defines['ENABLE_ELECTRON_EXTENSIONS'] === 'false') {
-  ignoredModules.push(
-    '@electron/internal/@browser/chrome-extension-shim'
-  )
-} else {
-  ignoredModules.push(
-    '@electron/internal/browser/chrome-extension',
-    '@electron/internal/renderer/chrome-api',
-    '@electron/internal/renderer/content-scripts-injector'
-  )
-}
-
 module.exports = ({
  alwaysHasNode,
  loadElectronFromAlternateTarget,
  targetDeletesNodeGlobals,
-  target,
-  wrapInitWithProfilingTimeout,
-  wrapInitWithTryCatch
+  target
 }) => {
  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts')
  if (!fs.existsSync(entry)) {
@@ -96,37 +33,29 @@ module.exports = ({

  return ({
    mode: 'development',
-    devtool: false,
+    devtool: 'inline-source-map',
    entry,
    target: alwaysHasNode ? 'node' : 'web',
    output: {
      filename: `${target}.bundle.js`
    },
-    wrapInitWithProfilingTimeout,
-    wrapInitWithTryCatch,
    resolve: {
      alias: {
        '@electron/internal': path.resolve(electronRoot, 'lib'),
        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts'),
-        // Force timers to resolve to our dependency that doesn't use window.postMessage
+        // Force timers to resolve to our dependency that doens't use window.postMessage
        'timers': path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
      },
      extensions: ['.ts', '.js']
    },
    module: {
      rules: [{
-        test: (moduleName) => !onlyPrintingGraph && ignoredModules.includes(moduleName),
-        loader: 'null-loader',
-      }, {
        test: /\.ts$/,
        loader: 'ts-loader',
        options: {
          configFile: path.resolve(electronRoot, 'tsconfig.electron.json'),
          transpileOnly: onlyPrintingGraph,
-          ignoreDiagnostics: [
-            // File '{0}' is not under 'rootDir' '{1}'.
-            6059,
-          ]
+          ignoreDiagnostics: [6059]
        }
      }]
    },
@@ -137,17 +66,6 @@ module.exports = ({
      // one of our renderer bundles should import it from the 'timers' package
      setImmediate: false,
    },
-    optimization: {
-      minimize: true,
-      minimizer: [
-        new TerserPlugin({
-          terserOptions: {
-            keep_classnames: true,
-            keep_fnames: true,
-          },
-        }),
-      ],
-    },
    plugins: [
      new AccessDependenciesPlugin(),
      ...(targetDeletesNodeGlobals ? [
@@ -160,7 +78,6 @@ module.exports = ({
      new webpack.ProvidePlugin({
        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise'],
      }),
-      new webpack.DefinePlugin(defines),
    ]
  })
 }
--- a/build/webpack/webpack.config.isolated_renderer.js
+++ b/build/webpack/webpack.config.isolated_renderer.js
@@ -1,5 +1,4 @@
 module.exports = require('./webpack.config.base')({
  target: 'isolated_renderer',
-  alwaysHasNode: false,
-  wrapInitWithTryCatch: true
+  alwaysHasNode: false
 })
--- a/build/webpack/webpack.config.renderer.js
+++ b/build/webpack/webpack.config.renderer.js
@@ -1,7 +1,5 @@
 module.exports = require('./webpack.config.base')({
  target: 'renderer',
  alwaysHasNode: true,
-  targetDeletesNodeGlobals: true,
-  wrapInitWithProfilingTimeout: true,
-  wrapInitWithTryCatch: true
+  targetDeletesNodeGlobals: true
 })
--- a/build/webpack/webpack.config.sandboxed_renderer.js
+++ b/build/webpack/webpack.config.sandboxed_renderer.js
@@ -1,6 +1,4 @@
 module.exports = require('./webpack.config.base')({
  target: 'sandboxed_renderer',
-  alwaysHasNode: false,
-  wrapInitWithProfilingTimeout: true,
-  wrapInitWithTryCatch: true
+  alwaysHasNode: false
 })
--- a/build/webpack/webpack.config.worker.js
+++ b/build/webpack/webpack.config.worker.js
@@ -2,6 +2,5 @@ module.exports = require('./webpack.config.base')({
  target: 'worker',
  loadElectronFromAlternateTarget: 'renderer',
  alwaysHasNode: true,
-  targetDeletesNodeGlobals: true,
-  wrapInitWithTryCatch: true
+  targetDeletesNodeGlobals: true
 })
--- a/build/webpack/webpack.gni
+++ b/build/webpack/webpack.gni
@@ -16,7 +16,6 @@ template("webpack_build") {
    inputs = [
               invoker.config_file,
               "//electron/build/webpack/webpack.config.base.js",
-               "//electron/build/webpack/run-compiler.js",
               "//electron/tsconfig.json",
               "//electron/yarn.lock",
               "//electron/typings/internal-ambient.d.ts",
@@ -26,10 +25,10 @@ template("webpack_build") {
    args = [
      rebase_path(invoker.config_file),
      rebase_path(invoker.out_file),
-      "--buildflags=" + rebase_path("$target_gen_dir/buildflags/buildflags.h"),
    ]
-    deps += [ "buildflags" ]

-    outputs = [ invoker.out_file ]
+    outputs = [
+      invoker.out_file,
+    ]
  }
 }
--- a/build/zip.py
+++ b/build/zip.py
@@ -9,7 +9,6 @@ EXTENSIONS_TO_SKIP = [
  '.pdb',
  '.mojom.js',
  '.mojom-lite.js',
-  '.info'
 ]

 PATHS_TO_SKIP = [
@@ -17,21 +16,10 @@ PATHS_TO_SKIP = [
  './libVkICD_mock_', #Skipping because these are outputs that we don't need
  './VkICD_mock_', #Skipping because these are outputs that we don't need

-  # Skipping because its an output of create_bundle from //build/config/mac/rules.gni
-  # that we don't need
-  'Electron.dSYM',
-
  # //chrome/browser:resources depends on this via
  # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
  # ship it.
  'pyproto',
-
-  # On Windows, this binary doesn't exist (the crashpad handler is built-in).
-  # On MacOS, the binary is called 'chrome_crashpad_handler' and is inside the
-  # app bundle.
-  # On Linux, we don't use crashpad, but this binary is still built for some
-  # reason. Exclude it from the zip.
-  './crashpad_handler',
 ]

 def skip_path(dep, dist_zip, target_cpu):
@@ -64,13 +52,14 @@ def main(argv):
  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)
+      dist_files.add(dep)
  if sys.platform == 'darwin' and not should_flatten:
    execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
  else:
    with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z:
      for dep in dist_files:
+        if skip_path(dep, dist_zip, target_cpu):
+          continue
        if os.path.isdir(dep):
          for root, dirs, files in os.walk(dep):
            for file in files:
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -14,7 +14,7 @@ declare_args() {

  enable_view_api = false

-  enable_pdf_viewer = true
+  enable_pdf_viewer = false

  enable_tts = true

@@ -32,7 +32,7 @@ declare_args() {
  enable_pepper_flash = true

  # Enable Chrome extensions support.
-  enable_electron_extensions = true
+  enable_electron_extensions = false

  # Enable Spellchecker support
  enable_builtin_spellchecker = true
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -14,8 +14,6 @@ static_library("chrome") {
  sources = [
    "//chrome/browser/browser_process.cc",
    "//chrome/browser/browser_process.h",
-    "//chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc",
-    "//chrome/browser/crash_upload_list/crash_upload_list_crashpad.h",
    "//chrome/browser/devtools/devtools_contents_resizing_strategy.cc",
    "//chrome/browser/devtools/devtools_contents_resizing_strategy.h",
    "//chrome/browser/devtools/devtools_embedder_message_dispatcher.cc",
@@ -53,12 +51,10 @@ static_library("chrome") {
    "//chrome/browser/ssl/security_state_tab_helper.cc",
    "//chrome/browser/ssl/security_state_tab_helper.h",
    "//chrome/browser/ssl/tls_deprecation_config.cc",
-    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
-    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
+    "//chrome/browser/ui/autofill/popup_view_common.cc",
+    "//chrome/browser/ui/autofill/popup_view_common.h",
    "//chrome/browser/win/chrome_process_finder.cc",
    "//chrome/browser/win/chrome_process_finder.h",
-    "//chrome/child/v8_crashpad_support_win.cc",
-    "//chrome/child/v8_crashpad_support_win.h",
    "//extensions/browser/app_window/size_constraints.cc",
    "//extensions/browser/app_window/size_constraints.h",
  ]
@@ -73,7 +69,6 @@ static_library("chrome") {
  deps = [
    "//chrome/browser:resource_prefetch_predictor_proto",
    "//components/feature_engagement:buildflags",
-    "//components/optimization_guide/proto:optimization_guide_proto",
  ]

  if (is_linux) {
@@ -114,15 +109,11 @@ static_library("chrome") {
    ]

    if (use_aura) {
-      sources += [ "//chrome/browser/platform_util_aura.cc" ]
-
-      if (!is_win) {
-        sources += [
-          "//chrome/browser/ui/views/color_chooser_aura.cc",
-          "//chrome/browser/ui/views/color_chooser_aura.h",
-        ]
-      }
-
+      sources += [
+        "//chrome/browser/platform_util_aura.cc",
+        "//chrome/browser/ui/views/color_chooser_aura.cc",
+        "//chrome/browser/ui/views/color_chooser_aura.h",
+      ]
      deps += [ "//components/feature_engagement" ]
    }

@@ -193,9 +184,9 @@ static_library("chrome") {
      "//chrome/services/printing:lib",
      "//components/printing/browser",
      "//components/printing/renderer",
-      "//components/services/print_compositor",
-      "//components/services/print_compositor/public/cpp",
-      "//components/services/print_compositor/public/mojom",
+      "//components/services/pdf_compositor",
+      "//components/services/pdf_compositor/public/cpp",
+      "//components/services/pdf_compositor/public/mojom",
    ]

    deps += [
@@ -238,28 +229,6 @@ static_library("chrome") {
      "//components/vector_icons:vector_icons",
    ]
  }
-
-  if (enable_electron_extensions) {
-    sources += [
-      "//chrome/browser/extensions/chrome_url_request_util.cc",
-      "//chrome/browser/extensions/chrome_url_request_util.h",
-      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc",
-      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h",
-      "//chrome/renderer/extensions/extension_hooks_delegate.cc",
-      "//chrome/renderer/extensions/extension_hooks_delegate.h",
-      "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
-      "//chrome/renderer/extensions/tabs_hooks_delegate.h",
-    ]
-
-    if (enable_pdf_viewer) {
-      sources += [
-        "//chrome/browser/pdf/pdf_extension_util.cc",
-        "//chrome/browser/pdf/pdf_extension_util.h",
-        "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
-        "//chrome/renderer/pepper/chrome_pdf_print_client.h",
-      ]
-    }
-  }
 }

 source_set("plugins") {
@@ -282,9 +251,6 @@ source_set("plugins") {
    "//ppapi/proxy:ipc",
    "//services/device/public/mojom",
  ]
-  if (enable_pdf_viewer) {
-    deps += [ "//components/pdf/browser" ]
-  }
  if (enable_pepper_flash) {
    sources += [
      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc",
@@ -317,6 +283,8 @@ source_set("plugins") {
    sources += [
      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
      "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
@@ -325,15 +293,6 @@ source_set("plugins") {
      "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
    ]
  }
-  if (enable_pepper_flash || enable_pdf_viewer) {
-    sources += [
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
-    ]
-    if (enable_pdf_viewer) {
-      deps += [ "//components/pdf/renderer" ]
-    }
-  }
  deps += [
    "//components/strings",
    "//media:media_buildflags",
@@ -349,51 +308,45 @@ source_set("plugins") {
 # You may have to add new files here during the upgrade if //chrome/browser/spellchecker
 # gets more files
 source_set("chrome_spellchecker") {
-  sources = []
-  deps = []
-  libs = []
+  sources = [
+    "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
+    "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
+    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
+    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
+    "//chrome/browser/spellchecker/spellcheck_factory.cc",
+    "//chrome/browser/spellchecker/spellcheck_factory.h",
+    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
+    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
+    "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
+    "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
+    "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
+    "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
+    "//chrome/browser/spellchecker/spellcheck_service.cc",
+    "//chrome/browser/spellchecker/spellcheck_service.h",
+    "//chrome/common/pref_names.h",
+  ]

-  if (enable_builtin_spellchecker) {
+  if (has_spellcheck_panel) {
    sources += [
-      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
-      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
-      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
-      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_factory.cc",
-      "//chrome/browser/spellchecker/spellcheck_factory.h",
-      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
-      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
-      "//chrome/browser/spellchecker/spellcheck_service.cc",
-      "//chrome/browser/spellchecker/spellcheck_service.h",
-      "//chrome/common/pref_names.h",
-    ]
-
-    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",
+      "//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",
--- a/chromium_src/chrome/browser/certificate_manager_model.cc
+++ b/chromium_src/chrome/browser/certificate_manager_model.cc
@@ -36,7 +36,6 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
    // Linux has only a single persistent slot compared to ChromeOS's separate
    // public and private slot.
    // Redirect any slot usage to this persistent slot on Linux.
-    crypto::EnsureNSSInit();
    g_nss_cert_database = new net::NSSCertDatabase(
        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* public slot */,
        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* private slot */);
--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/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,10 +826,11 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
    return PROCESS_NONE;
  to_send.append(current_dir.value());

-  const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
-  for (const auto& arg : 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);
-    to_send.append(arg);
+    to_send.append(*it);
  }

  // Send the message
--- a/chromium_src/chrome/browser/process_singleton_win.cc
+++ b/chromium_src/chrome/browser/process_singleton_win.cc
@@ -197,7 +197,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
    return PROCESS_NONE;
  }

-  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
+  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, false)) {
    case chrome::NOTIFY_SUCCESS:
      return PROCESS_NOTIFIED;
    case chrome::NOTIFY_FAILED:
--- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
+++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
@@ -122,7 +122,8 @@ void GlobalMenuBarRegistrarX11::OnNameOwnerChanged(GObject* /* ignored */,
                                                   GParamSpec* /* ignored */) {
  // If the name owner changed, we need to reregister all the live xids with
  // the system.
-  for (auto xid : live_xids_) {
-    RegisterXID(xid);
+  for (std::set<unsigned long>::const_iterator it = live_xids_.begin();
+       it != live_xids_.end(); ++it) {
+    RegisterXID(*it);
  }
 }
--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -1,48 +1,48 @@
-import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron';
-import * as path from 'path';
-import * as url from 'url';
+import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron'
+import * as path from 'path'

-let mainWindow: BrowserWindow | null = null;
+let mainWindow: BrowserWindow | null = null

 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
-  app.quit();
-});
+  app.quit()
+})

 function decorateURL (url: string) {
  // safely add `?utm_source=default_app
-  const parsedUrl = new URL(url);
-  parsedUrl.searchParams.append('utm_source', 'default_app');
-  return parsedUrl.toString();
+  const parsedUrl = new URL(url)
+  parsedUrl.searchParams.append('utm_source', 'default_app')
+  return parsedUrl.toString()
 }

 // Find the shortest path to the electron binary
-const absoluteElectronPath = process.execPath;
-const relativeElectronPath = path.relative(process.cwd(), absoluteElectronPath);
+const absoluteElectronPath = process.execPath
+const relativeElectronPath = path.relative(process.cwd(), absoluteElectronPath)
 const electronPath = absoluteElectronPath.length < relativeElectronPath.length
  ? absoluteElectronPath
-  : relativeElectronPath;
+  : relativeElectronPath

-const indexPath = path.resolve(app.getAppPath(), 'index.html');
+const indexPath = path.resolve(app.getAppPath(), 'index.html')

 function isTrustedSender (webContents: Electron.WebContents) {
  if (webContents !== (mainWindow && mainWindow.webContents)) {
-    return false;
+    return false
  }

-  try {
-    return url.fileURLToPath(webContents.getURL()) === indexPath;
-  } catch {
-    return false;
-  }
+  const parsedUrl = new URL(webContents.getURL())
+  const urlPath = process.platform === 'win32'
+    // Strip the prefixed "/" that occurs on windows
+    ? path.resolve(parsedUrl.pathname.substr(1))
+    : parsedUrl.pathname
+  return parsedUrl.protocol === 'file:' && urlPath === indexPath
 }

 ipcMain.handle('bootstrap', (event) => {
-  return isTrustedSender(event.sender) ? electronPath : null;
-});
+  return isTrustedSender(event.sender) ? electronPath : null
+})

 async function createWindow () {
-  await app.whenReady();
+  await app.whenReady()

  const options: Electron.BrowserWindowConstructorOptions = {
    width: 900,
@@ -57,46 +57,46 @@ async function createWindow () {
    },
    useContentSize: true,
    show: false
-  };
-
-  if (process.platform === 'linux') {
-    options.icon = path.join(__dirname, 'icon.png');
  }

-  mainWindow = new BrowserWindow(options);
-  mainWindow.on('ready-to-show', () => mainWindow!.show());
+  if (process.platform === 'linux') {
+    options.icon = path.join(__dirname, 'icon.png')
+  }
+
+  mainWindow = new BrowserWindow(options)
+  mainWindow.on('ready-to-show', () => mainWindow!.show())

  mainWindow.webContents.on('new-window', (event, url) => {
-    event.preventDefault();
-    shell.openExternal(decorateURL(url));
-  });
+    event.preventDefault()
+    shell.openExternal(decorateURL(url))
+  })

  mainWindow.webContents.session.setPermissionRequestHandler((webContents, permission, done) => {
-    const parsedUrl = new URL(webContents.getURL());
+    const parsedUrl = new URL(webContents.getURL())

    const options: Electron.MessageBoxOptions = {
      title: 'Permission Request',
      message: `Allow '${parsedUrl.origin}' to access '${permission}'?`,
      buttons: ['OK', 'Cancel'],
      cancelId: 1
-    };
+    }

    dialog.showMessageBox(mainWindow!, options).then(({ response }) => {
-      done(response === 0);
-    });
-  });
+      done(response === 0)
+    })
+  })

-  return mainWindow;
+  return mainWindow
 }

 export const loadURL = async (appUrl: string) => {
-  mainWindow = await createWindow();
-  mainWindow.loadURL(appUrl);
-  mainWindow.focus();
-};
+  mainWindow = await createWindow()
+  mainWindow.loadURL(appUrl)
+  mainWindow.focus()
+}

 export const loadFile = async (appPath: string) => {
-  mainWindow = await createWindow();
-  mainWindow.loadFile(appPath);
-  mainWindow.focus();
-};
+  mainWindow = await createWindow()
+  mainWindow.loadFile(appPath)
+  mainWindow.focus()
+}
--- a/default_app/main.ts
+++ b/default_app/main.ts
@@ -1,8 +1,8 @@
-import { app, dialog } from 'electron';
+import { app, dialog } from 'electron'

-import * as fs from 'fs';
-import * as path from 'path';
-import * as url from 'url';
+import * as fs from 'fs'
+import * as path from 'path'
+import * as url from 'url'

 type DefaultAppOptions = {
  file: null | string;
@@ -14,10 +14,10 @@ type DefaultAppOptions = {
  modules: string[];
 }

-const Module = require('module');
+const Module = require('module')

 // Parse command line options.
-const argv = process.argv.slice(1);
+const argv = process.argv.slice(1)

 const option: DefaultAppOptions = {
  file: null,
@@ -27,50 +27,50 @@ const option: DefaultAppOptions = {
  interactive: false,
  abi: false,
  modules: []
-};
+}

-let nextArgIsRequire = false;
+let nextArgIsRequire = false

 for (const arg of argv) {
  if (nextArgIsRequire) {
-    option.modules.push(arg);
-    nextArgIsRequire = false;
-    continue;
+    option.modules.push(arg)
+    nextArgIsRequire = false
+    continue
  } else if (arg === '--version' || arg === '-v') {
-    option.version = true;
-    break;
+    option.version = true
+    break
  } else if (arg.match(/^--app=/)) {
-    option.file = arg.split('=')[1];
-    break;
+    option.file = arg.split('=')[1]
+    break
  } else if (arg === '--interactive' || arg === '-i' || arg === '-repl') {
-    option.interactive = true;
+    option.interactive = true
  } else if (arg === '--test-type=webdriver') {
-    option.webdriver = true;
+    option.webdriver = true
  } else if (arg === '--require' || arg === '-r') {
-    nextArgIsRequire = true;
-    continue;
+    nextArgIsRequire = true
+    continue
  } else if (arg === '--abi' || arg === '-a') {
-    option.abi = true;
-    continue;
+    option.abi = true
+    continue
  } else if (arg === '--no-help') {
-    option.noHelp = true;
-    continue;
+    option.noHelp = true
+    continue
  } else if (arg[0] === '-') {
-    continue;
+    continue
  } else {
-    option.file = arg;
-    break;
+    option.file = arg
+    break
  }
 }

 if (nextArgIsRequire) {
-  console.error('Invalid Usage: --require [file]\n\n"file" is required');
-  process.exit(1);
+  console.error('Invalid Usage: --require [file]\n\n"file" is required')
+  process.exit(1)
 }

 // Set up preload modules
 if (option.modules.length > 0) {
-  Module._preloadModules(option.modules);
+  Module._preloadModules(option.modules)
 }

 function loadApplicationPackage (packagePath: string) {
@@ -79,102 +79,102 @@ function loadApplicationPackage (packagePath: string) {
    configurable: false,
    enumerable: true,
    value: true
-  });
+  })

  try {
    // Override app name and version.
-    packagePath = path.resolve(packagePath);
-    const packageJsonPath = path.join(packagePath, 'package.json');
-    let appPath;
+    packagePath = path.resolve(packagePath)
+    const packageJsonPath = path.join(packagePath, 'package.json')
+    let appPath
    if (fs.existsSync(packageJsonPath)) {
-      let packageJson;
+      let packageJson
      try {
-        packageJson = require(packageJsonPath);
+        packageJson = require(packageJsonPath)
      } catch (e) {
-        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`);
-        return;
+        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`)
+        return
      }

      if (packageJson.version) {
-        app.setVersion(packageJson.version);
+        app.setVersion(packageJson.version)
      }
      if (packageJson.productName) {
-        app.name = packageJson.productName;
+        app.name = packageJson.productName
      } else if (packageJson.name) {
-        app.name = packageJson.name;
+        app.name = packageJson.name
      }
-      appPath = packagePath;
+      appPath = packagePath
    }

    try {
-      const filePath = Module._resolveFilename(packagePath, module, true);
-      app._setDefaultAppPaths(appPath || path.dirname(filePath));
+      const filePath = Module._resolveFilename(packagePath, module, true)
+      app._setDefaultAppPaths(appPath || path.dirname(filePath))
    } catch (e) {
-      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`);
-      return;
+      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`)
+      return
    }

    // Run the app.
-    Module._load(packagePath, module, true);
+    Module._load(packagePath, module, true)
  } catch (e) {
-    console.error('App threw an error during load');
-    console.error(e.stack || e);
-    throw e;
+    console.error('App threw an error during load')
+    console.error(e.stack || e)
+    throw e
  }
 }

 function showErrorMessage (message: string) {
-  app.focus();
-  dialog.showErrorBox('Error launching app', message);
-  process.exit(1);
+  app.focus()
+  dialog.showErrorBox('Error launching app', message)
+  process.exit(1)
 }

 async function loadApplicationByURL (appUrl: string) {
-  const { loadURL } = await import('./default_app');
-  loadURL(appUrl);
+  const { loadURL } = await import('./default_app')
+  loadURL(appUrl)
 }

 async function loadApplicationByFile (appPath: string) {
-  const { loadFile } = await import('./default_app');
-  loadFile(appPath);
+  const { loadFile } = await import('./default_app')
+  loadFile(appPath)
 }

 function startRepl () {
  if (process.platform === 'win32') {
-    console.error('Electron REPL not currently supported on Windows');
-    process.exit(1);
+    console.error('Electron REPL not currently supported on Windows')
+    process.exit(1)
  }

  // prevent quitting
-  app.on('window-all-closed', () => {});
+  app.on('window-all-closed', () => {})

-  const repl = require('repl');
+  const repl = require('repl')
  repl.start('> ').on('exit', () => {
-    process.exit(0);
-  });
+    process.exit(0)
+  })
 }

 // Start the specified app if there is one specified in command line, otherwise
 // start the default app.
 if (option.file && !option.webdriver) {
-  const file = option.file;
-  const protocol = url.parse(file).protocol;
-  const extension = path.extname(file);
+  const file = option.file
+  const protocol = url.parse(file).protocol
+  const extension = path.extname(file)
  if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
-    loadApplicationByURL(file);
+    loadApplicationByURL(file)
  } else if (extension === '.html' || extension === '.htm') {
-    loadApplicationByFile(path.resolve(file));
+    loadApplicationByFile(path.resolve(file))
  } else {
-    loadApplicationPackage(file);
+    loadApplicationPackage(file)
  }
 } else if (option.version) {
-  console.log('v' + process.versions.electron);
-  process.exit(0);
+  console.log('v' + process.versions.electron)
+  process.exit(0)
 } else if (option.abi) {
-  console.log(process.versions.modules);
-  process.exit(0);
+  console.log(process.versions.modules)
+  process.exit(0)
 } else if (option.interactive) {
-  startRepl();
+  startRepl()
 } else {
  if (!option.noHelp) {
    const welcomeMessage = `
@@ -192,10 +192,10 @@ Options:
  -i, --interactive     Open a REPL to the main process.
  -r, --require         Module to preload (option can be repeated).
  -v, --version         Print the version.
-  -a, --abi             Print the Node ABI version.`;
+  -a, --abi             Print the Node ABI version.`

-    console.log(welcomeMessage);
+    console.log(welcomeMessage)
  }

-  loadApplicationByFile('index.html');
+  loadApplicationByFile('index.html')
 }
--- a/default_app/preload.ts
+++ b/default_app/preload.ts
@@ -1,53 +1,53 @@
-import { ipcRenderer, contextBridge } from 'electron';
+import { ipcRenderer, contextBridge } from 'electron'

 async function getOcticonSvg (name: string) {
  try {
-    const response = await fetch(`octicon/${name}.svg`);
-    const div = document.createElement('div');
-    div.innerHTML = await response.text();
-    return div;
+    const response = await fetch(`octicon/${name}.svg`)
+    const div = document.createElement('div')
+    div.innerHTML = await response.text()
+    return div
  } catch {
-    return null;
+    return null
  }
 }

 async function loadSVG (element: HTMLSpanElement) {
  for (const cssClass of element.classList) {
    if (cssClass.startsWith('octicon-')) {
-      const icon = await getOcticonSvg(cssClass.substr(8));
+      const icon = await getOcticonSvg(cssClass.substr(8))
      if (icon) {
        for (const elemClass of element.classList) {
-          icon.classList.add(elemClass);
+          icon.classList.add(elemClass)
        }
-        element.before(icon);
-        element.remove();
-        break;
+        element.before(icon)
+        element.remove()
+        break
      }
    }
  }
 }

 async function initialize () {
-  const electronPath = await ipcRenderer.invoke('bootstrap');
+  const electronPath = await ipcRenderer.invoke('bootstrap')

  function replaceText (selector: string, text: string) {
-    const element = document.querySelector<HTMLElement>(selector);
+    const element = document.querySelector<HTMLElement>(selector)
    if (element) {
-      element.innerText = text;
+      element.innerText = text
    }
  }

-  replaceText('.electron-version', `Electron v${process.versions.electron}`);
-  replaceText('.chrome-version', `Chromium v${process.versions.chrome}`);
-  replaceText('.node-version', `Node v${process.versions.node}`);
-  replaceText('.v8-version', `v8 v${process.versions.v8}`);
-  replaceText('.command-example', `${electronPath} path-to-app`);
+  replaceText('.electron-version', `Electron v${process.versions.electron}`)
+  replaceText('.chrome-version', `Chromium v${process.versions.chrome}`)
+  replaceText('.node-version', `Node v${process.versions.node}`)
+  replaceText('.v8-version', `v8 v${process.versions.v8}`)
+  replaceText('.command-example', `${electronPath} path-to-app`)

  for (const element of document.querySelectorAll<HTMLSpanElement>('.octicon')) {
-    loadSVG(element);
+    loadSVG(element)
  }
 }

 contextBridge.exposeInMainWorld('electronDefaultApp', {
  initialize
-});
+})
--- a/docs-translations/README.md
+++ b/docs-translations/README.md
@@ -0,0 +1,33 @@
+## Docs Translations
+
+This directory once contained unstructured translations of Electron's 
+documentation, but has been deprecated in favor of a new translation process 
+using [Crowdin], a GitHub-friendly platform for collaborative translation.
+
+For more details, visit the [electron/i18n] repo.
+
+## Contributing
+
+If you're interested in helping translate Electron's docs, visit 
+[Crowdin] and log in with your GitHub account. And thanks!
+
+## Offline Docs
+
+If you miss having access to Electron's raw markdown files in your preferred
+language, don't fret! You can still get raw docs, they're just in a 
+different place now. See [electron/i18n/tree/master/content]
+
+To more easily view and browse offline docs in your language, clone the repo and use [vmd], 
+an Electron-based GitHub-styled markdown viewer:
+
+```sh
+npm i -g vmd
+git clone https://github.com/electron/i18n
+vmd electron-i18n/content/zh-CN
+```
+
+[crowdin.com/project/electron]: https://crowdin.com/project/electron
+[Crowdin]: https://crowdin.com/project/electron
+[electron/i18n]: https://github.com/electron/i18n#readme
+[electron/i18n/tree/master/content]: https://github.com/electron/i18n/tree/master/content
+[vmd]: http://ghub.io/vmd
--- a/docs/README.md
+++ b/docs/README.md
@@ -53,7 +53,6 @@ an issue:
  * [Native File Drag & Drop](tutorial/native-file-drag-drop.md)
  * [Offscreen Rendering](tutorial/offscreen-rendering.md)
  * [Supporting macOS Dark Mode](tutorial/mojave-dark-mode-guide.md)
-  * [Web embeds in Electron](tutorial/web-embeds.md)
 * [Accessibility](tutorial/accessibility.md)
  * [Spectron](tutorial/accessibility.md#spectron)
  * [Devtron](tutorial/accessibility.md#devtron)
@@ -112,8 +111,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * [Process Object](api/process.md)
 * [Supported Command Line Switches](api/command-line-switches.md)
 * [Environment Variables](api/environment-variables.md)
-* [Chrome Extensions Support](api/extensions.md)
-* [Breaking API Changes](breaking-changes.md)
+* [Breaking API Changes](api/breaking-changes.md)

 ### Custom DOM Elements:

--- a/docs/api/accelerator.md
+++ b/docs/api/accelerator.md
@@ -18,7 +18,7 @@ method, i.e.
 ```javascript
 const { app, globalShortcut } = require('electron')

-app.whenReady().then(() => {
+app.on('ready', () => {
  // Register a 'CommandOrControl+Y' shortcut listener.
  globalShortcut.register('CommandOrControl+Y', () => {
    // Do stuff when Y and either Command/Control is pressed.
@@ -54,7 +54,7 @@ The `Super` key is mapped to the `Windows` key on Windows and Linux and
 * `0` to `9`
 * `A` to `Z`
 * `F1` to `F24`
-* Punctuation like `~`, `!`, `@`, `#`, `$`, etc.
+* Punctuations like `~`, `!`, `@`, `#`, `$`, etc.
 * `Plus`
 * `Space`
 * `Tab`
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -32,14 +32,12 @@ In most cases, you should do everything in the `ready` event handler.

 Returns:

-* `event` Event
-* `launchInfo` Record<string, any> _macOS_
+* `launchInfo` unknown _macOS_

-Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
-holds the `userInfo` of the `NSUserNotification` that was used to open the
-application, if it was launched from Notification Center. You can also call
-`app.isReady()` to check if this event has already fired and `app.whenReady()`
-to get a Promise that is fulfilled when Electron is initialized.
+Emitted when Electron has finished initializing. On macOS, `launchInfo` holds
+the `userInfo` of the `NSUserNotification` that was used to open the application,
+if it was launched from Notification Center. You can call `app.isReady()` to
+check if this event has already fired.

 ### Event: 'window-all-closed'

@@ -76,7 +74,7 @@ Returns:
 * `event` Event

 Emitted when all windows have been closed and the application will quit.
-Calling `event.preventDefault()` will prevent the default behavior, which is
+Calling `event.preventDefault()` will prevent the default behaviour, which is
 terminating the application.

 See the description of the `window-all-closed` event for the differences between
@@ -205,7 +203,7 @@ Returns:
  [`NSUserActivity.activityType`][activity-type].
 * `userInfo` unknown - Contains app-specific state stored by the activity.

-Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActivity()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.
+Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActiviy()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.

 ### Event: 'new-window-for-tab' _macOS_

@@ -370,25 +368,6 @@ Returns:

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

-#### Event: 'render-process-gone'
-
-Returns:
-
-* `event` Event
-* `webContents` [WebContents](web-contents.md)
-* `details` Object
-  * `reason` String - The reason the render process is gone.  Possible values:
-    * `clean-exit` - Process exited with an exit code of zero
-    * `abnormal-exit` - Process exited with a non-zero exit code
-    * `killed` - Process was sent a SIGTERM or otherwise killed externally
-    * `crashed` - Process crashed
-    * `oom` - Process ran out of memory
-    * `launch-failed` - Process never successfully launched
-    * `integrity-failure` - Windows code integrity checks failed
-
-Emitted when the renderer process unexpectedly dissapears.  This is normally
-because it was crashed or killed.
-
 ### Event: 'accessibility-support-changed' _macOS_ _Windows_

 Returns:
@@ -566,7 +545,6 @@ app.exit(0)
 ### `app.isReady()`

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

 ### `app.whenReady()`

@@ -574,17 +552,11 @@ Returns `Promise<void>` - fulfilled when Electron is initialized.
 May be used as a convenient alternative to checking `app.isReady()`
 and subscribing to the `ready` event if the app is not ready yet.

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

 On Linux, focuses on the first visible window. On macOS, makes the application
 the active app. On Windows, focuses on the application's first window.

-You should seek to use the `steal` option as sparingly as possible.
-
 ### `app.hide()` _macOS_

 Hides all application windows without minimizing them.
@@ -628,7 +600,6 @@ Returns `String` - The current application directory.
  * `videos` Directory for a user's videos.
  * `logs` Directory for your app's log folder.
  * `pepperFlashSystemPlugin` Full path to the system version of the Pepper Flash plugin.
-  * `crashDumps` Directory where crash dumps are stored.

 Returns `String` - A path to a special directory or file associated with `name`. On
 failure, an `Error` is thrown.
@@ -686,6 +657,8 @@ to the npm modules spec. You should usually also specify a `productName`
 field, which is your application's full capitalized name, and which will be
 preferred over `name` by Electron.

+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.setName(name)`

 * `name` String
@@ -694,6 +667,8 @@ Overrides the current application's name.

 **Note:** This function overrides the name used internally by Electron; it does not affect the name that the OS uses.

+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.getLocale()`

 Returns `String` - The current application locale. Possible return values are documented [here](locales.md).
@@ -726,34 +701,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_

@@ -772,8 +747,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
@@ -781,7 +758,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.
+The API uses the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.

 ### `app.getApplicationNameForProtocol(url)`

@@ -958,7 +935,7 @@ if (!gotTheLock) {
  })

  // Create myWindow, load the rest of the app, etc...
-  app.whenReady().then(() => {
+  app.on('ready', () => {
  })
 }
 ```
@@ -1015,17 +992,6 @@ Updates the current activity if its type matches `type`, merging the entries fro

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

-### `app.setActivationPolicy(policy)` _macOS_
-
-* `policy` String - Can be 'regular', 'accessory', or 'prohibited'.
-
-Sets the activation policy for a given app.
-
-Activation policy types:
-* 'regular' - The application is an ordinary app that appears in the Dock and may have a user interface.
-* 'accessory' - The application doesn’t appear in the Dock and doesn’t have a menu bar, but it may be activated programmatically or by clicking on one of its windows.
-* 'prohibited' - The application doesn’t appear in the Dock and may not create windows or be activated.
-
 ### `app.importCertificate(options, callback)` _Linux_

 * `options` Object
@@ -1048,7 +1014,7 @@ This method can only be called before app is ready.

 By default, Chromium disables 3D APIs (e.g. WebGL) until restart on a per
 domain basis if the GPU processes crashes too frequently. This function
-disables that behavior.
+disables that behaviour.

 This method can only be called before app is ready.

@@ -1112,10 +1078,14 @@ On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher.
 **Note:** Unity launcher requires the existence of a `.desktop` file to work,
 for more information please read [Desktop Environment Integration][unity-requirement].

+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.getBadgeCount()` _Linux_ _macOS_

 Returns `Integer` - The current value displayed in the counter badge.

+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.isUnityRunning()` _Linux_

 Returns `Boolean` - Whether the current desktop environment is Unity launcher.
@@ -1190,6 +1160,8 @@ technologies, such as screen readers, has been detected. See
 https://www.chromium.org/developers/design-documents/accessibility for more
 details.

+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.setAccessibilitySupportEnabled(enabled)` _macOS_ _Windows_

 * `enabled` Boolean - Enable or disable [accessibility tree](https://developers.google.com/web/fundamentals/accessibility/semantics-builtin/the-accessibility-tree) rendering
@@ -1201,6 +1173,8 @@ This API must be called after the `ready` event is emitted.

 **Note:** Rendering accessibility tree can significantly affect the performance of your app. It should not be enabled by default.

+**[Deprecated](modernization/property-updates.md)**
+
 ### `app.showAboutPanel()`

 Show the app's about panel options. These options can be overridden with `app.setAboutPanelOptions(options)`.
@@ -1217,9 +1191,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()`

@@ -1260,7 +1233,7 @@ systems Application folder. Use in combination with `app.moveToApplicationsFolde
 ### `app.moveToApplicationsFolder([options])` _macOS_

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

 Returns `Boolean` - Whether the move was successful. Please note that if
@@ -1340,8 +1313,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
@@ -1374,7 +1345,7 @@ in your app's initialization to ensure that your overridden value is used.

 A `Boolean` which when `true` disables the overrides that Electron has in place
 to ensure renderer processes are restarted on every navigation.  The current
-default value for this property is `true`.
+default value for this property is `false`.

 The intention is for these overrides to become disabled by default and then at
 some point in the future this property will be removed.  This property impacts
--- a/docs/api/breaking-changes-ns.md
+++ b/docs/api/breaking-changes-ns.md
@@ -0,0 +1,61 @@
+# Breaking changes (NetworkService) (Draft)
+
+This document describes changes to Electron APIs after migrating network code
+to NetworkService API.
+
+We don't currently have an estimate of when we will enable `NetworkService` by
+default in Electron, but as Chromium is already removing non-`NetworkService`
+code, we might switch before Electron 10.
+
+The content of this document should be moved to `breaking-changes.md` once we have
+determined when to enable `NetworkService` in Electron.
+
+## Planned Breaking API Changes
+
+### `protocol.unregisterProtocol`
+### `protocol.uninterceptProtocol`
+
+The APIs are now synchronous and the optional callback is no longer needed.
+
+```javascript
+// Deprecated
+protocol.unregisterProtocol(scheme, () => { /* ... */ })
+// Replace with
+protocol.unregisterProtocol(scheme)
+```
+
+### `protocol.registerFileProtocol`
+### `protocol.registerBufferProtocol`
+### `protocol.registerStringProtocol`
+### `protocol.registerHttpProtocol`
+### `protocol.registerStreamProtocol`
+### `protocol.interceptFileProtocol`
+### `protocol.interceptStringProtocol`
+### `protocol.interceptBufferProtocol`
+### `protocol.interceptHttpProtocol`
+### `protocol.interceptStreamProtocol`
+
+The APIs are now synchronous and the optional callback is no longer needed.
+
+```javascript
+// Deprecated
+protocol.registerFileProtocol(scheme, handler, () => { /* ... */ })
+// Replace with
+protocol.registerFileProtocol(scheme, handler)
+```
+
+The registered or intercepted protocol does not have effect on current page
+until navigation happens.
+
+### `protocol.isProtocolHandled`
+
+This API is deprecated and users should use `protocol.isProtocolRegistered`
+and `protocol.isProtocolIntercepted` instead.
+
+```javascript
+// Deprecated
+protocol.isProtocolHandled(scheme).then(() => { /* ... */ })
+// Replace with
+const isRegistered = protocol.isProtocolRegistered(scheme)
+const isIntercepted = protocol.isProtocolIntercepted(scheme)
+```
--- a/docs/api/breaking-changes.md
+++ b/docs/api/breaking-changes.md
@@ -1,212 +1,14 @@
 # Breaking Changes

-Breaking changes will be documented here, and deprecation warnings added to JS code where possible, at least [one major version](tutorial/electron-versioning.md#semver) before the change is made.
+Breaking changes will be documented here, and deprecation warnings added to JS code where possible, at least [one major version](../tutorial/electron-versioning.md#semver) before the change is made.

-### Types of Breaking Changes
+## `FIXME` comments

-This document uses the following convention to categorize breaking changes:
-
- **API Changed:** An API was changed in such a way that code that has not been updated is guaranteed to throw an exception.
- **Behavior Changed:** The behavior of Electron has changed, but not in such a way that an exception will necessarily be thrown.
- **Default Changed:** Code depending on the old default may break, not necessarily throwing an exception. The old behavior can be restored by explicitly specifying the value.
- **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
- **Removed:** An API or feature was removed, and is no longer supported by Electron.
-
-## Planned Breaking API Changes (12.0)
-
-### Removed: `crashReporter` methods in the renderer process
-
-The following `crashReporter` methods are no longer available in the renderer
-process:
-
- `crashReporter.start`
- `crashReporter.getLastCrashReport`
- `crashReporter.getUploadedReports`
- `crashReporter.getUploadToServer`
- `crashReporter.setUploadToServer`
- `crashReporter.getCrashesDirectory`
-
-They should be called only from the main process.
-
-See [#23265](https://github.com/electron/electron/pull/23265) for more details.
-
-## Planned Breaking API Changes (11.0)
-
-## Planned Breaking API Changes (10.0)
-
-### Deprecated: `companyName` argument to `crashReporter.start()`
-
-The `companyName` argument to `crashReporter.start()`, which was previously
-required, is now optional, and further, is deprecated. To get the same
-behavior in a non-deprecated way, you can pass a `companyName` value in
-`globalExtra`.
-
-```js
-// Deprecated in Electron 10
-crashReporter.start({ companyName: 'Umbrella Corporation' })
-// Replace with
-crashReporter.start({ globalExtra: { _companyName: 'Umbrella Corporation' } })
-```
-
-### Deprecated: `crashReporter.getCrashesDirectory()`
-
-The `crashReporter.getCrashesDirectory` method has been deprecated. Usage
-should be replaced by `app.getPath('crashDumps')`.
-
-```js
-// Deprecated in Electron 10
-crashReporter.getCrashesDirectory()
-// Replace with
-app.getPath('crashDumps')
-```
-
-### Deprecated: `crashReporter` methods in the renderer process
-
-Calling the following `crashReporter` methods from the renderer process is
-deprecated:
-
- `crashReporter.start`
- `crashReporter.getLastCrashReport`
- `crashReporter.getUploadedReports`
- `crashReporter.getUploadToServer`
- `crashReporter.setUploadToServer`
- `crashReporter.getCrashesDirectory`
-
-The only non-deprecated methods remaining in the `crashReporter` module in the
-renderer are `addExtraParameter`, `removeExtraParameter` and `getParameters`.
-
-All above methods remain non-deprecated when called from the main process.
-
-See [#23265](https://github.com/electron/electron/pull/23265) for more details.
-
-### Removed: Browser Window Affinity
-
-The `affinity` option when constructing a new `BrowserWindow` will be removed
-as part of our plan to more closely align with Chromium's process model for security,
-performance and maintainability.
-
-For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).
-
-### Default Changed: `enableRemoteModule` defaults to `false`
-
-In Electron 9, using the remote module without explicitly enabling it via the
-`enableRemoteModule` WebPreferences option began emitting a warning. In
-Electron 10, the remote module is now disabled by default. To use the remote
-module, `enableRemoteModule: true` must be specified in WebPreferences:
-
-```js
-const w = new BrowserWindow({
-  webPreferences: {
-    enableRemoteModule: true
-  }
-})
-```
-
-We [recommend moving away from the remote
-module](https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31).
-
-### `protocol.unregisterProtocol`
-### `protocol.uninterceptProtocol`
-
-The APIs are now synchronous and the optional callback is no longer needed.
-
-```javascript
-// Deprecated
-protocol.unregisterProtocol(scheme, () => { /* ... */ })
-// Replace with
-protocol.unregisterProtocol(scheme)
-```
-
-### `protocol.registerFileProtocol`
-### `protocol.registerBufferProtocol`
-### `protocol.registerStringProtocol`
-### `protocol.registerHttpProtocol`
-### `protocol.registerStreamProtocol`
-### `protocol.interceptFileProtocol`
-### `protocol.interceptStringProtocol`
-### `protocol.interceptBufferProtocol`
-### `protocol.interceptHttpProtocol`
-### `protocol.interceptStreamProtocol`
-
-The APIs are now synchronous and the optional callback is no longer needed.
-
-```javascript
-// Deprecated
-protocol.registerFileProtocol(scheme, handler, () => { /* ... */ })
-// Replace with
-protocol.registerFileProtocol(scheme, handler)
-```
-
-The registered or intercepted protocol does not have effect on current page
-until navigation happens.
-
-### `protocol.isProtocolHandled`
-
-This API is deprecated and users should use `protocol.isProtocolRegistered`
-and `protocol.isProtocolIntercepted` instead.
-
-```javascript
-// Deprecated
-protocol.isProtocolHandled(scheme).then(() => { /* ... */ })
-// Replace with
-const isRegistered = protocol.isProtocolRegistered(scheme)
-const isIntercepted = protocol.isProtocolIntercepted(scheme)
-```
+The `FIXME` string is used in code comments to denote things that should be fixed for future releases. See https://github.com/electron/electron/search?q=fixme

 ## Planned Breaking API Changes (9.0)

-### Default Changed: Loading non-context-aware native modules in the renderer process is disabled by default
-
-As of Electron 9 we do not allow loading of non-context-aware native modules in
-the renderer process.  This is to improve security, performance and maintainability
-of Electron as a project.
-
-If this impacts you, you can temporarily set `app.allowRendererProcessReuse` to `false`
-to revert to the old behavior.  This flag will only be an option until Electron 11 so
-you should plan to update your native modules to be context aware.
-
-For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).
-
-### Deprecated: `BrowserWindow` extension APIs
-
-The following extension APIs have been deprecated:
-* `BrowserWindow.addExtension(path)`
-* `BrowserWindow.addDevToolsExtension(path)`
-* `BrowserWindow.removeExtension(name)`
-* `BrowserWindow.removeDevToolsExtension(name)`
-* `BrowserWindow.getExtensions()`
-* `BrowserWindow.getDevToolsExtensions()`
-
-Use the session APIs instead:
-* `ses.loadExtension(path)`
-* `ses.removeExtension(extension_id)`
-* `ses.getAllExtensions()`
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.addExtension(path)
-BrowserWindow.addDevToolsExtension(path)
-// Replace with
-session.defaultSession.loadExtension(path)
-```
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.removeExtension(name)
-BrowserWindow.removeDevToolsExtension(name)
-// Replace with
-session.defaultSession.removeExtension(extension_id)
-```
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.getExtensions()
-BrowserWindow.getDevToolsExtensions()
-// Replace with
-session.defaultSession.getAllExtensions()
-```
-
-### Removed: `<webview>.getWebContents()`
+### `<webview>.getWebContents()`

 This API, which was deprecated in Electron 8.0, is now removed.

@@ -218,38 +20,9 @@ const { remote } = require('electron')
 remote.webContents.fromId(webview.getWebContentsId())
 ```

-### Removed: `webFrame.setLayoutZoomLevelLimits()`
-
-Chromium has removed support for changing the layout zoom level limits, and it
-is beyond Electron's capacity to maintain it. The function was deprecated in
-Electron 8.x, and has been removed in Electron 9.x. The layout zoom level limits
-are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
-[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
-
-### Behavior Changed: Sending non-JS objects over IPC now throws an exception
-
-In Electron 8.0, IPC was changed to use the Structured Clone Algorithm,
-bringing significant performance improvements. To help ease the transition, the
-old IPC serialization algorithm was kept and used for some objects that aren't
-serializable with Structured Clone. In particular, DOM objects (e.g. `Element`,
-`Location` and `DOMMatrix`), Node.js objects backed by C++ classes (e.g.
-`process.env`, some members of `Stream`), and Electron objects backed by C++
-classes (e.g. `WebContents`, `BrowserWindow` and `WebFrame`) are not
-serializable with Structured Clone. Whenever the old algorithm was invoked, a
-deprecation warning was printed.
-
-In Electron 9.0, the old serialization algorithm has been removed, and sending
-such non-serializable objects will now throw an "object could not be cloned"
-error.
-
-### API Changed: `shell.openItem` is now `shell.openPath`
-
-The `shell.openItem` API has been replaced with an asynchronous `shell.openPath` API.
-You can see the original API proposal and reasoning [here](https://github.com/electron/governance/blob/master/wg-api/spec-documents/shell-openitem.md).
-
 ## Planned Breaking API Changes (8.0)

-### Behavior Changed: Values sent over IPC are now serialized with Structured Clone Algorithm
+### Values sent over IPC are now serialized with Structured Clone Algorithm

 The algorithm used to serialize objects sent over IPC (through
 `ipcRenderer.send`, `ipcRenderer.sendSync`, `WebContents.send` and related
@@ -300,7 +73,7 @@ these kinds of objects will throw a 'could not be cloned' error.

 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm

-### Deprecated: `<webview>.getWebContents()`
+### `<webview>.getWebContents()`

 This API is implemented using the `remote` module, which has both performance
 and security implications. Therefore its usage should be explicit.
@@ -319,7 +92,7 @@ However, it is recommended to avoid using the `remote` module altogether.
 // main
 const { ipcMain, webContents } = require('electron')

-const getGuestForWebContents = (webContentsId, contents) => {
+const getGuestForWebContents = function (webContentsId, contents) {
  const guest = webContents.fromId(webContentsId)
  if (!guest) {
    throw new Error(`Invalid webContentsId: ${webContentsId}`)
@@ -341,63 +114,9 @@ const { ipcRenderer } = require('electron')
 ipcRenderer.invoke('openDevTools', webview.getWebContentsId())
 ```

-### Deprecated: `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).
-
-### Deprecated events in `systemPreferences`
-
-The following `systemPreferences` events have been deprecated:
-* `inverted-color-scheme-changed`
-* `high-contrast-color-scheme-changed`
-
-Use the new `updated` event on the `nativeTheme` module instead.
-
-```js
-// Deprecated
-systemPreferences.on('inverted-color-scheme-changed', () => { /* ... */ })
-systemPreferences.on('high-contrast-color-scheme-changed', () => { /* ... */ })
-
-// Replace with
-nativeTheme.on('updated', () => { /* ... */ })
-```
-
-### Deprecated: methods in `systemPreferences`
-
-The following `systemPreferences` methods have been deprecated:
-* `systemPreferences.isDarkMode()`
-* `systemPreferences.isInvertedColorScheme()`
-* `systemPreferences.isHighContrastColorScheme()`
-
-Use the following `nativeTheme` properties instead:
-* `nativeTheme.shouldUseDarkColors`
-* `nativeTheme.shouldUseInvertedColorScheme`
-* `nativeTheme.shouldUseHighContrastColors`
-
-```js
-// Deprecated
-systemPreferences.isDarkMode()
-// Replace with
-nativeTheme.shouldUseDarkColors
-
-// Deprecated
-systemPreferences.isInvertedColorScheme()
-// Replace with
-nativeTheme.shouldUseInvertedColorScheme
-
-// Deprecated
-systemPreferences.isHighContrastColorScheme()
-// Replace with
-nativeTheme.shouldUseHighContrastColors
-```
-
 ## Planned Breaking API Changes (7.0)

-### Deprecated: Atom.io Node Headers URL
+### Node Headers URL

 This is the URL specified as `disturl` in a `.npmrc` file or as the `--dist-url`
 command line flag when building native Node modules.  Both will be supported for
@@ -407,7 +126,7 @@ Deprecated: https://atom.io/download/electron

 Replace with: https://electronjs.org/headers

-### API Changed: `session.clearAuthCache()` no longer accepts options
+### `session.clearAuthCache(options)`

 The `session.clearAuthCache` API no longer accepts options for what to clear, and instead unconditionally clears the whole cache.

@@ -418,25 +137,25 @@ session.clearAuthCache({ type: 'password' })
 session.clearAuthCache()
 ```

-### API Changed: `powerMonitor.querySystemIdleState` is now `powerMonitor.getSystemIdleState`
+### `powerMonitor.querySystemIdleState`

 ```js
 // Removed in Electron 7.0
 powerMonitor.querySystemIdleState(threshold, callback)
 // Replace with synchronous API
-const idleState = powerMonitor.getSystemIdleState(threshold)
+const idleState = getSystemIdleState(threshold)
 ```

-### API Changed: `powerMonitor.querySystemIdleTime` is now `powerMonitor.getSystemIdleState`
+### `powerMonitor.querySystemIdleTime`

 ```js
 // Removed in Electron 7.0
 powerMonitor.querySystemIdleTime(callback)
 // Replace with synchronous API
-const idleTime = powerMonitor.getSystemIdleTime()
+const idleTime = getSystemIdleTime()
 ```

-### API Changed: `webFrame.setIsolatedWorldInfo` replaces separate methods
+### webFrame Isolated World APIs

 ```js
 // Removed in Electron 7.0
@@ -453,11 +172,11 @@ webFrame.setIsolatedWorldInfo(
  })
 ```

-### Removed: `marked` property on `getBlinkMemoryInfo`
+### Removal of deprecated `marked` property on getBlinkMemoryInfo

 This property was removed in Chromium 77, and as such is no longer available.

-### Behavior Changed: `webkitdirectory` attribute for `<input type="file"/>` now lists directory contents
+### `webkitdirectory` attribute for `<input type="file"/>`

 The `webkitdirectory` property on HTML file inputs allows them to select folders.
 Previous versions of Electron had an incorrect implementation where the `event.target.files`
@@ -490,10 +209,9 @@ In Electron 7, this now returns a `FileList` with a `File` object for:
 Note that `webkitdirectory` no longer exposes the path to the selected folder.
 If you require the path to the selected folder rather than the folder contents,
 see the `dialog.showOpenDialog` API ([link](https://github.com/electron/electron/blob/master/docs/api/dialog.md#dialogshowopendialogbrowserwindow-options)).
-
 ## Planned Breaking API Changes (6.0)

-### API Changed: `win.setMenu(null)` is now `win.removeMenu()`
+### `win.setMenu(null)`

 ```js
 // Deprecated
@@ -502,7 +220,7 @@ win.setMenu(null)
 win.removeMenu()
 ```

-### API Changed: `contentTracing.getTraceBufferUsage()` is now a promise
+### `contentTracing.getTraceBufferUsage()`

 ```js
 // Deprecated
@@ -515,7 +233,7 @@ contentTracing.getTraceBufferUsage().then(infoObject => {
 })
 ```

-### API Changed: `electron.screen` in the renderer process should be accessed via `remote`
+### `electron.screen` in renderer process

 ```js
 // Deprecated
@@ -524,7 +242,7 @@ require('electron').screen
 require('electron').remote.screen
 ```

-### API Changed: `require()`ing node builtins in sandboxed renderers no longer implicitly loads the `remote` version
+### `require` in sandboxed renderers

 ```js
 // Deprecated
@@ -548,25 +266,25 @@ require('path')
 require('electron').remote.require('path')
 ```

-### Deprecated: `powerMonitor.querySystemIdleState` replaced with `powerMonitor.getSystemIdleState`
+### `powerMonitor.querySystemIdleState`

 ```js
 // Deprecated
 powerMonitor.querySystemIdleState(threshold, callback)
 // Replace with synchronous API
-const idleState = powerMonitor.getSystemIdleState(threshold)
+const idleState = getSystemIdleState(threshold)
 ```

-### Deprecated: `powerMonitor.querySystemIdleTime` replaced with `powerMonitor.getSystemIdleTime`
+### `powerMonitor.querySystemIdleTime`

 ```js
 // Deprecated
 powerMonitor.querySystemIdleTime(callback)
 // Replace with synchronous API
-const idleTime = powerMonitor.getSystemIdleTime()
+const idleTime = getSystemIdleTime()
 ```

-### Deprecated: `app.enableMixedSandbox()` is no longer needed
+### `app.enableMixedSandbox`

 ```js
 // Deprecated
@@ -575,7 +293,7 @@ app.enableMixedSandbox()

 Mixed-sandbox mode is now enabled by default.

-### Deprecated: `Tray.setHighlightMode`
+### `Tray`

 Under macOS Catalina our former Tray implementation breaks.
 Apple's native substitute doesn't support changing the highlighting behavior.
@@ -588,7 +306,7 @@ tray.setHighlightMode(mode)

 ## Planned Breaking API Changes (5.0)

-### Default Changed: `nodeIntegration` and `webviewTag` default to false, `contextIsolation` defaults to true
+### `new BrowserWindow({ webPreferences })`

 The following `webPreferences` option default values are deprecated in favor of the new defaults listed below.

@@ -608,16 +326,16 @@ const w = new BrowserWindow({
 })
 ```

-### Behavior Changed: `nodeIntegration` in child windows opened via `nativeWindowOpen`
+### `nativeWindowOpen`

-Child windows opened with the `nativeWindowOpen` option will always have Node.js integration disabled, unless `nodeIntegrationInSubFrames` is `true`.
+Child windows opened with the `nativeWindowOpen` option will always have Node.js integration disabled, unless `nodeIntegrationInSubFrames` is `true.

-### API Changed: Registering privileged schemes must now be done before app ready
+### Privileged Schemes Registration

-Renderer process APIs `webFrame.registerURLSchemeAsPrivileged` and `webFrame.registerURLSchemeAsBypassingCSP` as well as browser process API `protocol.registerStandardSchemes` have been removed.
+Renderer process APIs `webFrame.setRegisterURLSchemeAsPrivileged` and `webFrame.registerURLSchemeAsBypassingCSP` as well as browser process API `protocol.registerStandardSchemes` have been removed.
 A new API, `protocol.registerSchemesAsPrivileged` has been added and should be used for registering custom schemes with the required privileges. Custom schemes are required to be registered before app ready.

-### Deprecated: `webFrame.setIsolatedWorld*` replaced with `webFrame.setIsolatedWorldInfo`
+### webFrame Isolated World APIs

 ```js
 // Deprecated
@@ -634,7 +352,7 @@ webFrame.setIsolatedWorldInfo(
  })
 ```

-### API Changed: `webFrame.setSpellCheckProvider` now takes an asynchronous callback
+## `webFrame.setSpellCheckProvider`
 The `spellCheck` callback is now asynchronous, and `autoCorrectWord` parameter has been removed.
 ```js
 // Deprecated
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -15,9 +15,12 @@ relative to its owning window. It is meant to be an alternative to the
 // In the main process.
 const { BrowserView, BrowserWindow } = require('electron')

-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
+win.on('closed', () => {
+  win = null
+})

-const view = new BrowserView()
+let view = new BrowserView()
 win.setBrowserView(view)
 view.setBounds({ x: 0, y: 0, width: 300, height: 300 })
 view.webContents.loadURL('https://electronjs.org')
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -11,7 +11,10 @@ const { BrowserWindow } = require('electron')
 // Or use `remote` from the renderer process.
 // const { BrowserWindow } = require('electron').remote

-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
+win.on('closed', () => {
+  win = null
+})

 // Load a remote URL
 win.loadURL('https://github.com')
@@ -177,7 +180,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
  * `simpleFullscreen` Boolean (optional) - Use pre-Lion fullscreen on macOS. Default is `false`.
  * `skipTaskbar` Boolean (optional) - Whether to show the window in taskbar. Default is
    `false`.
-  * `kiosk` Boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
+  * `kiosk` Boolean (optional) - The kiosk mode. Default is `false`.
  * `title` String (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
  * `icon` ([NativeImage](native-image.md) | String) (optional) - The window icon. On Windows it is
    recommended to use `ICO` icons to get best visual effects, you can also
@@ -207,7 +210,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
  * `opacity` Number (optional) - Set the initial opacity of the window, between 0.0 (fully
    transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
  * `darkTheme` Boolean (optional) - Forces using dark theme for the window, only works on
-    some GTK desktop environments. Default is `false`.
+    some GTK+3 desktop environments. Default is `false`.
  * `transparent` Boolean (optional) - Makes the window [transparent](frameless-window.md#transparent-window).
    Default is `false`. On Windows, does not work unless the window is frameless.
  * `type` String (optional) - The type of window, default is normal window. See more about
@@ -226,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`.
@@ -270,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
@@ -289,7 +293,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      between the web pages even when you specified different values for them,
      including but not limited to `preload`, `sandbox` and `nodeIntegration`.
      So it is suggested to use exact same `webPreferences` for web pages with
-      the same `affinity`. _Deprecated_
+      the same `affinity`. _This property is experimental_
    * `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents
      `300%`. Default is `1.0`.
    * `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`.
@@ -348,9 +352,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      You can access this context in the dev tools by selecting the
      'Electron Isolated Context' entry in the combo box at the top of the
      Console tab.
-    * `worldSafeExecuteJavaScript` Boolean (optional) - If true, values returned from `webFrame.executeJavaScript` will be sanitized to ensure JS values
-      can't unsafely cross between worlds when using `contextIsolation`.  The default
-      is `false`. In Electron 12, the default will be changed to `true`. _Deprecated_
    * `nativeWindowOpen` Boolean (optional) - Whether to use native
      `window.open()`. Defaults to `false`. Child windows will always have node
      integration disabled unless `nodeIntegrationInSubFrames` is true. **Note:** This option is currently
@@ -372,8 +373,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      consecutive dialog protection is triggered. If not defined the default
      message would be used, note that currently the default message is in
      English and not localized.
-    * `disableDialogs` Boolean (optional) - Whether to disable dialogs
-      completely. Overrides `safeDialogs`. Default is `false`.
    * `navigateOnDragDrop` Boolean (optional) - Whether dragging and dropping a
      file or link onto the page causes a navigation. Default is `false`.
    * `autoplayPolicy` String (optional) - Autoplay policy to apply to
@@ -388,15 +387,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      visible to users.
    * `spellcheck` Boolean (optional) - Whether to enable the builtin spellchecker.
      Default is `true`.
-    * `enableWebSQL` Boolean (optional) - Whether to enable the [WebSQL api](https://www.w3.org/TR/webdatabase/).
-      Default is `true`.
-    * `v8CacheOptions` String (optional) - Enforces the v8 code caching policy
-      used by blink. Accepted values are
-      * `none` - Disables code caching
-      * `code` - Heuristic based code caching
-      * `bypassHeatCheck` - Bypass code caching heuristics but with lazy compilation
-      * `bypassHeatCheckAndEagerCompile` - Same as above except compilation is eager.
-      Default policy is `code`.

 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -635,12 +625,6 @@ Returns:

 Emitted on 3-finger swipe. Possible directions are `up`, `right`, `down`, `left`.

-The method underlying this event is built to handle older macOS-style trackpad swiping,
-where the content on the screen doesn't move with the swipe. Most macOS trackpads are not
-configured to allow this kind of swiping anymore, so in order for it to emit properly the
-'Swipe between pages' preference in `System Preferences > Trackpad > More Gestures` must be
-set to 'Swipe with two or three fingers'.
-
 #### Event: 'rotate-gesture' _macOS_

 Returns:
@@ -697,7 +681,7 @@ Returns `BrowserWindow | null` - The window that owns the given `browserView`. I

 Returns `BrowserWindow` - The window with the given `id`.

-#### `BrowserWindow.addExtension(path)` _Deprecated_
+#### `BrowserWindow.addExtension(path)`

 * `path` String

@@ -708,10 +692,7 @@ The method will also not return if the extension's manifest is missing or incomp
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-**Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath).
-
-#### `BrowserWindow.removeExtension(name)` _Deprecated_
+#### `BrowserWindow.removeExtension(name)`

 * `name` String

@@ -720,10 +701,7 @@ Remove a Chrome extension by name.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-**Note:** This method is deprecated. Instead, use
-[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
-
-#### `BrowserWindow.getExtensions()` _Deprecated_
+#### `BrowserWindow.getExtensions()`

 Returns `Record<String, ExtensionInfo>` - The keys are the extension names and each value is
 an Object containing `name` and `version` properties.
@@ -731,10 +709,7 @@ an Object containing `name` and `version` properties.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-**Note:** This method is deprecated. Instead, use
-[`ses.getAllExtensions()`](session.md#sesgetallextensions).
-
-#### `BrowserWindow.addDevToolsExtension(path)` _Deprecated_
+#### `BrowserWindow.addDevToolsExtension(path)`

 * `path` String

@@ -750,10 +725,7 @@ The method will also not return if the extension's manifest is missing or incomp
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-**Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath).
-
-#### `BrowserWindow.removeDevToolsExtension(name)` _Deprecated_
+#### `BrowserWindow.removeDevToolsExtension(name)`

 * `name` String

@@ -762,10 +734,7 @@ Remove a DevTools extension by name.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-**Note:** This method is deprecated. Instead, use
-[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
-
-#### `BrowserWindow.getDevToolsExtensions()` _Deprecated_
+#### `BrowserWindow.getDevToolsExtensions()`

 Returns `Record<string, ExtensionInfo>` - The keys are the extension names and each value is
 an Object containing `name` and `version` properties.
@@ -782,9 +751,6 @@ console.log(installed)
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-**Note:** This method is deprecated. Instead, use
-[`ses.getAllExtensions()`](session.md#sesgetallextensions).
-
 ### Instance Properties

 Objects created with `new BrowserWindow` have the following properties:
@@ -815,51 +781,6 @@ A `Boolean` property that determines whether the window menu bar should hide its
 If the menu bar is already visible, setting this property to `true` won't
 hide it immediately.

-#### `win.simpleFullScreen`
-
-A `Boolean` property that determines whether the window is in simple (pre-Lion) fullscreen mode.
-
-#### `win.fullScreen`
-
-A `Boolean` property that determines whether the window is in fullscreen mode.
-
-#### `win.visibleOnAllWorkspaces`
-
-A `Boolean` property that determines whether the window is visible on all workspaces.
-
-**Note:** Always returns false on Windows.
-
-#### `win.shadow`
-
-A `Boolean` property that determines whether the window has a shadow.
-
-#### `win.menuBarVisible` _Windows_ _Linux_
-
-A `Boolean` property that determines whether the menu bar should be visible.
-
-**Note:** If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
-
-####  `win.kiosk`
-
-A `Boolean` property that determines whether the window is in kiosk mode.
-
-#### `win.documentEdited` _macOS_
-
-A `Boolean` property that specifies whether the window’s document has been edited.
-
-The icon in title bar will become gray when set to `true`.
-
-#### `win.representedFilename` _macOS_
-
-A `String` property that determines the pathname of the file the window represents,
-and the icon of the file will show in window's title bar.
-
-#### `win.title`
-
-A `String` property that determines the title of the native window.
-
-**Note:** The title of the web page can be different from the title of the native window.
-
 #### `win.minimizable`

 A `Boolean` property that determines whether the window can be manually minimized by user.
@@ -1015,7 +936,7 @@ Returns `Boolean` - Whether the window is in fullscreen mode.

 Enters or leaves simple fullscreen mode.

-Simple fullscreen mode emulates the native fullscreen behavior found in versions of macOS prior to Lion (10.7).
+Simple fullscreen mode emulates the native fullscreen behavior found in versions of Mac OS X prior to Lion (10.7).

 #### `win.isSimpleFullScreen()` _macOS_

@@ -1042,10 +963,13 @@ Perhaps there are 15 pixels of controls on the left edge, 25 pixels of controls
 on the right edge and 50 pixels of controls below the player. In order to
 maintain a 16:9 aspect ratio (standard aspect ratio for HD @1920x1080) within
 the player itself we would call this function with arguments of 16/9 and
-{ width: 40, height: 50 }. The second argument doesn't care where the extra width and height
+[ 40, 50 ]. The second argument doesn't care where the extra width and height
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.

+Calling this function with a value of `0` will remove any previously set aspect
+ratios.
+
 #### `win.setBackgroundColor(backgroundColor)`

 * `backgroundColor` String - Window's background color as a hexadecimal value,
@@ -1095,11 +1019,6 @@ console.log(win.getBounds())

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

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

 * `bounds` [Rectangle](structures/rectangle.md)
@@ -1126,7 +1045,7 @@ Disable or enable the window.

 #### `win.isEnabled()`

-Returns `Boolean` - whether the window is enabled.
+Returns Boolean - whether the window is enabled.

 #### `win.setSize(width, height[, animate])`

@@ -1178,11 +1097,15 @@ Returns `Integer[]` - Contains the window's maximum width and height.

 * `resizable` Boolean

-Sets whether the window can be manually resized by the user.
+Sets whether the window can be manually resized by user.
+
+**[Deprecated](modernization/property-updates.md)**

 #### `win.isResizable()`

-Returns `Boolean` - Whether the window can be manually resized by the user.
+Returns `Boolean` - Whether the window can be manually resized by user.
+
+**[Deprecated](modernization/property-updates.md)**

 #### `win.setMovable(movable)` _macOS_ _Windows_

@@ -1190,29 +1113,41 @@ Returns `Boolean` - Whether the window can be manually resized by the user.

 Sets whether the window can be moved by user. On Linux does nothing.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.isMovable()` _macOS_ _Windows_

 Returns `Boolean` - Whether the window can be moved by user.

 On Linux always returns `true`.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMinimizable(minimizable)` _macOS_ _Windows_

 * `minimizable` Boolean

-Sets whether the window can be manually minimized by user. On Linux does nothing.
+Sets whether the window can be manually minimized by user. On Linux does
+nothing.
+
+**[Deprecated](modernization/property-updates.md)**

 #### `win.isMinimizable()` _macOS_ _Windows_

-Returns `Boolean` - Whether the window can be manually minimized by the user.
+Returns `Boolean` - Whether the window can be manually minimized by user

 On Linux always returns `true`.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMaximizable(maximizable)` _macOS_ _Windows_

 * `maximizable` Boolean

-Sets whether the window can be manually maximized by user. On Linux does nothing.
+Sets whether the window can be manually maximized by user. On Linux does
+nothing.
+
+**[Deprecated](modernization/property-updates.md)**

 #### `win.isMaximizable()` _macOS_ _Windows_

@@ -1220,15 +1155,23 @@ Returns `Boolean` - Whether the window can be manually maximized by user.

 On Linux always returns `true`.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setFullScreenable(fullscreenable)`

 * `fullscreenable` Boolean

-Sets whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+Sets whether the maximize/zoom window button toggles fullscreen mode or
+maximizes the window.
+
+**[Deprecated](modernization/property-updates.md)**

 #### `win.isFullScreenable()`

-Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen mode or
+maximizes the window.
+
+**[Deprecated](modernization/property-updates.md)**

 #### `win.setClosable(closable)` _macOS_ _Windows_

@@ -1236,12 +1179,16 @@ Returns `Boolean` - Whether the maximize/zoom window button toggles fullscreen m

 Sets whether the window can be manually closed by user. On Linux does nothing.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.isClosable()` _macOS_ _Windows_

 Returns `Boolean` - Whether the window can be manually closed by user.

 On Linux always returns `true`.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setAlwaysOnTop(flag[, level][, relativeLevel])`

 * `flag` Boolean
@@ -1339,7 +1286,7 @@ Makes the window not show in the taskbar.

 * `flag` Boolean

-Enters or leaves kiosk mode.
+Enters or leaves the kiosk mode.

 #### `win.isKiosk()`

@@ -1653,17 +1600,23 @@ This cannot be called when `titleBarStyle` is set to `customButtonsOnHover`.
 Sets whether the window menu bar should hide itself automatically. Once set the
 menu bar will only show when users press the single `Alt` key.

-If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't hide it immediately.
+If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't
+hide it immediately.
+
+**[Deprecated](modernization/property-updates.md)**

 #### `win.isMenuBarAutoHide()`

 Returns `Boolean` - Whether menu bar automatically hides itself.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `win.setMenuBarVisibility(visible)` _Windows_ _Linux_

 * `visible` Boolean

-Sets whether the menu bar should be visible. If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
+Sets whether the menu bar should be visible. If the menu bar is auto-hide, users
+can still bring up the menu bar by pressing the single `Alt` key.

 #### `win.isMenuBarVisible()`

@@ -1782,17 +1735,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
--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -22,9 +22,6 @@ which the request is associated.
  with which the request is associated. Defaults to the empty string. The
 `session` option prevails on `partition`. Thus if a `session` is explicitly
 specified, `partition` is ignored.
-  * `useSessionCookies` Boolean (optional) - Whether to send cookies with this
-    request from the provided session.  This will make the `net` request's
-    cookie behavior match a `fetch` request. Default is `false`.
  * `protocol` String (optional) - The protocol scheme in the form 'scheme:'.
 Currently supported values are 'http:' or 'https:'. Defaults to 'http:'.
  * `host` String (optional) - The server host provided as a concatenation of
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -11,7 +11,7 @@ const { app } = require('electron')
 app.commandLine.appendSwitch('remote-debugging-port', '8315')
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1')

-app.whenReady().then(() => {
+app.on('ready', () => {
  // Your code here
 })
 ```
@@ -28,10 +28,6 @@ Disables the disk cache for HTTP requests.

 Disable HTTP/2 and SPDY/3.1 protocols.

-### --disable-ntlm-v2
-
-Disables NTLM v2 for posix platforms, no effect elsewhere.
-
 ## --lang

 Set a custom locale.
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -13,7 +13,7 @@ module is emitted.
 ```javascript
 const { app, contentTracing } = require('electron')

-app.whenReady().then(() => {
+app.on('ready', () => {
  (async () => {
    await contentTracing.startRecording({
      include_categories: ['*']
@@ -38,9 +38,6 @@ Get a set of category groups. The category groups can change as new code paths
 are reached. See also the [list of built-in tracing
 categories](https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h).

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

 * `options` ([TraceConfig](structures/trace-config.md) | [TraceCategoriesAndOptions](structures/trace-categories-and-options.md))
--- a/docs/api/context-bridge.md
+++ b/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.
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -4,13 +4,18 @@

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

-The following is an example of setting up Electron to automatically submit
-crash reports to a remote server:
+The following is an example of automatically submitting a crash report to a
+remote server:

 ```javascript
 const { crashReporter } = require('electron')

-crashReporter.start({ submitURL: 'https://your-domain.com/url-to-submit' })
+crashReporter.start({
+  productName: 'YourName',
+  companyName: 'YourCompany',
+  submitURL: 'https://your-domain.com/url-to-submit',
+  uploadToServer: true
+})
 ```

 For setting up a server to accept and process crash reports, you can use
@@ -25,19 +30,11 @@ Or use a 3rd party hosted solution:
 * [Sentry](https://docs.sentry.io/clients/electron)
 * [BugSplat](https://www.bugsplat.com/docs/platforms/electron)

-Crash reports are stored temporarily before being uploaded in a directory
-underneath the app's user data directory (called 'Crashpad' on Windows and Mac,
-or 'Crash Reports' on Linux). You can override this directory by calling
-`app.setPath('crashDumps', '/path/to/crashes')` before starting the crash
-reporter.
-
-On Windows and macOS, Electron uses
-[crashpad](https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md)
-to monitor and report crashes. On Linux, Electron uses
-[breakpad](https://chromium.googlesource.com/breakpad/breakpad/+/master/). This
-is an implementation detail driven by Chromium, and it may change in future. In
-particular, crashpad is newer and will likely eventually replace breakpad on
-all platforms.
+Crash reports are saved locally in an application-specific temp directory folder.
+For a `productName` of `YourName`, crash reports will be stored in a folder
+named `YourName Crashes` inside the temp directory. You can customize this temp
+directory location for your app by calling the `app.setPath('temp', '/my/custom/temp')`
+API before starting the crash reporter.

 ## Methods

@@ -46,68 +43,40 @@ The `crashReporter` module has the following methods:
 ### `crashReporter.start(options)`

 * `options` Object
+  * `companyName` String
  * `submitURL` String - URL that crash reports will be sent to as POST.
  * `productName` String (optional) - Defaults to `app.name`.
-  * `companyName` String (optional) _Deprecated_ - Deprecated alias for
-    `{ globalExtra: { _companyName: ... } }`.
-  * `uploadToServer` Boolean (optional) - Whether crash reports should be sent
-    to the server. If false, crash reports will be collected and stored in the
-    crashes directory, but not uploaded. Default is `true`.
-  * `ignoreSystemCrashHandler` Boolean (optional) - If true, crashes generated
-    in the main process will not be forwarded to the system crash handler.
-    Default is `false`.
-  * `rateLimit` Boolean (optional) _macOS_ _Windows_ - If true, limit the
-    number of crashes uploaded to 1/hour. Default is `false`.
-  * `compress` Boolean (optional) _macOS_ _Windows_ - If true, crash reports
-    will be compressed and uploaded with `Content-Encoding: gzip`. Not all
-    collection servers support compressed payloads. Default is `false`.
-  * `extra` Record<String, String> (optional) - Extra string key/value
-    annotations that will be sent along with crash reports that are generated
-    in the main process. Only string values are supported. Crashes generated in
-    child processes will not contain these extra
-    parameters to crash reports generated from child processes, call
-    [`addExtraParameter`](#crashreporteraddextraparameterkey-value) from the
-    child process.
-  * `globalExtra` Record<String, String> (optional) - Extra string key/value
-    annotations that will be sent along with any crash reports generated in any
-    process. These annotations cannot be changed once the crash reporter has
-    been started. If a key is present in both the global extra parameters and
-    the process-specific extra parameters, then the global one will take
-    precedence. By default, `productName` and the app version are included, as
-    well as the Electron version.
+  * `uploadToServer` Boolean (optional) - Whether crash reports should be sent to the server. Default is `true`.
+  * `ignoreSystemCrashHandler` Boolean (optional) - Default is `false`.
+  * `extra` Record<String, String> (optional) - An object you can define that will be sent along with the
+    report. Only string properties are sent correctly. Nested objects are not
+    supported. When using Windows, the property names and values must be fewer than 64 characters.
+  * `crashesDirectory` String (optional) - Directory to store the crash reports temporarily (only used when the crash reporter is started via `process.crashReporter.start`).

-This method must be called before using any other `crashReporter` APIs. Once
-initialized this way, the crashpad handler collects crashes from all
-subsequently created processes. The crash reporter cannot be disabled once
-started.
+You are required to call this method before using any other `crashReporter` APIs
+and in each process (main/renderer) from which you want to collect crash reports.
+You can pass different options to `crashReporter.start` when calling from different processes.

-This method should be called as early as possible in app startup, preferably
-before `app.on('ready')`. If the crash reporter is not initialized at the time
-a renderer process is created, then that renderer process will not be monitored
-by the crash reporter.
+**Note** Child processes created via the `child_process` module will not have access to the Electron modules.
+Therefore, to collect crash reports from them, use `process.crashReporter.start` instead. Pass the same options as above
+along with an additional one called `crashesDirectory` that should point to a directory to store the crash
+reports temporarily. You can test this out by calling `process.crash()` to crash the child process.

-**Note:** You can test out the crash reporter by generating a crash using
-`process.crash()`.
+**Note:** If you need send additional/updated `extra` parameters after your
+first call `start` you can call `addExtraParameter` on macOS or call `start`
+again with the new/updated `extra` parameters on Linux and Windows.

-**Note:** If you need to send additional/updated `extra` parameters after your
-first call `start` you can call `addExtraParameter`.
-
-**Note:** Parameters passed in `extra`, `globalExtra` or set with
-`addExtraParameter` have limits on the length of the keys and values. Key names
-must be at most 39 bytes long, and values must be no longer than 127 bytes.
-Keys with names longer than the maximum will be silently ignored. Key values
-longer than the maximum length will be truncated.
-
-**Note:** Calling this method from the renderer process is deprecated.
+**Note:** On macOS and windows, Electron uses a new `crashpad` client for crash collection and reporting.
+If you want to enable crash reporting, initializing `crashpad` from the main process using `crashReporter.start` is required
+regardless of which process you want to collect crashes from. Once initialized this way, the crashpad handler collects
+crashes from all processes. You still have to call `crashReporter.start` from the renderer or child process, otherwise crashes from
+them will get reported without `companyName`, `productName` or any of the `extra` information.

 ### `crashReporter.getLastCrashReport()`

-Returns [`CrashReport`](structures/crash-report.md) - The date and ID of the
-last crash report. Only crash reports that have been uploaded will be returned;
-even if a crash report is present on disk it will not be returned until it is
-uploaded. In the case that there are no uploaded reports, `null` is returned.
+Returns [`CrashReport`](structures/crash-report.md):

-**Note:** Calling this method from the renderer process is deprecated.
+Returns the date and ID of the last crash report. Only crash reports that have been uploaded will be returned; even if a crash report is present on disk it will not be returned until it is uploaded. In the case that there are no uploaded reports, `null` is returned.

 ### `crashReporter.getUploadedReports()`

@@ -116,67 +85,43 @@ Returns [`CrashReport[]`](structures/crash-report.md):
 Returns all uploaded crash reports. Each report contains the date and uploaded
 ID.

-**Note:** Calling this method from the renderer process is deprecated.
-
 ### `crashReporter.getUploadToServer()`

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

-**Note:** Calling this method from the renderer process is deprecated.
+**Note:** This API can only be called from the main process.

 ### `crashReporter.setUploadToServer(uploadToServer)`

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

 This would normally be controlled by user preferences. This has no effect if
 called before `start` is called.

-**Note:** Calling this method from the renderer process is deprecated.
+**Note:** This API can only be called from the main process.

-### `crashReporter.getCrashesDirectory()` _Deprecated_
+### `crashReporter.addExtraParameter(key, value)` _macOS_ _Windows_

-Returns `String` - The directory where crashes are temporarily stored before being uploaded.
+* `key` String - Parameter key, must be less than 64 characters long.
+* `value` String - Parameter value, must be less than 64 characters long.

-**Note:** This method is deprecated, use `app.getPath('crashDumps')` instead.
+Set an extra parameter to be sent with the crash report. The values
+specified here will be sent in addition to any values set via the `extra` option when `start` was called. This API is only available on macOS and windows, if you need to add/update extra parameters on Linux after your first call to `start` you can call `start` again with the updated `extra` options.

-### `crashReporter.addExtraParameter(key, value)`
+### `crashReporter.removeExtraParameter(key)` _macOS_ _Windows_

-* `key` String - Parameter key, must be no longer than 39 bytes.
-* `value` String - Parameter value, must be no longer than 127 bytes.
+* `key` String - Parameter key, must be less than 64 characters long.

-Set an extra parameter to be sent with the crash report. The values specified
-here will be sent in addition to any values set via the `extra` option when
-`start` was called.
-
-Parameters added in this fashion (or via the `extra` parameter to
-`crashReporter.start`) are specific to the calling process. Adding extra
-parameters in the main process will not cause those parameters to be sent along
-with crashes from renderer or other child processes. Similarly, adding extra
-parameters in a renderer process will not result in those parameters being sent
-with crashes that occur in other renderer processes or in the main process.
-
-**Note:** Parameters have limits on the length of the keys and values. Key
-names must be no longer than 39 bytes, and values must be no longer than 20320
-bytes. Keys with names longer than the maximum will be silently ignored. Key
-values longer than the maximum length will be truncated.
-
-**Note:** On linux values that are longer than 127 bytes will be chunked into
-multiple keys, each 127 bytes in length.  E.g. `addExtraParameter('foo', 'a'.repeat(130))`
-will result in two chunked keys `foo__1` and `foo__2`, the first will contain
-the first 127 bytes and the second will contain the remaining 3 bytes.  On
-your crash reporting backend you should stitch together keys in this format.
-
-### `crashReporter.removeExtraParameter(key)`
-
-* `key` String - Parameter key, must be no longer than 39 bytes.
-
-Remove a extra parameter from the current set of parameters. Future crashes
-will not include this parameter.
+Remove a extra parameter from the current set of parameters so that it will not be sent with the crash report.

 ### `crashReporter.getParameters()`

-Returns `Record<String, String>` - The current 'extra' parameters of the crash reporter.
+See all of the current parameters being passed to the crash reporter.
+
+### `crashReporter.getCrashesDirectory()`
+
+Returns `String` - The directory where crashes are temporarily stored before being uploaded.

 ## Crash Report Payload

--- a/docs/api/debugger.md
+++ b/docs/api/debugger.md
@@ -52,8 +52,6 @@ Returns:
 * `method` String - Method name.
 * `params` any - Event parameters defined by the 'parameters'
   attribute in the remote debugging protocol.
-* `sessionId` String - Unique identifier of attached debugging session,
-   will match the value sent from `debugger.sendCommand`.

 Emitted whenever the debugging target issues an instrumentation event.

@@ -76,16 +74,11 @@ Returns `Boolean` - Whether a debugger is attached to the `webContents`.

 Detaches the debugger from the `webContents`.

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

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

 Returns `Promise<any>` - A promise that resolves with the response defined by
 the 'returns' attribute of the command description in the remote debugging protocol
--- a/docs/api/dialog.md
+++ b/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.

@@ -269,7 +269,6 @@ Shows a message box, it will block the process until the message box is closed.
 It returns the index of the clicked button.

 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
-If `browserWindow` is not shown dialog will not be attached to it. In such case It will be displayed as independed window.

 ### `dialog.showMessageBox([browserWindow, ]options)`

@@ -351,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
--- a/docs/api/download-item.md
+++ b/docs/api/download-item.md
@@ -82,12 +82,16 @@ The API is only available in session's `will-download` callback function.
 If user doesn't set the save path via the API, Electron will use the original
 routine to determine the save path; this usually prompts a save dialog.

+**[Deprecated](modernization/property-updates.md): use the `savePath` property instead.**
+
 #### `downloadItem.getSavePath()`

 Returns `String` - The save path of the download item. This will be either the path
 set via `downloadItem.setSavePath(path)` or the path selected from the shown
 save dialog.

+**[Deprecated](modernization/property-updates.md): use the `savePath` property instead.**
+
 #### `downloadItem.setSaveDialogOptions(options)`

 * `options` SaveDialogOptions - Set the save file dialog options. This object has the same
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -48,28 +48,20 @@ Unsupported options are:

 ```sh
 --max-http-header-size
--http-parser
 ```

 ### `GOOGLE_API_KEY`

-Geolocation support in Electron requires the use of Google Cloud Platform's
-geolocation webservice. To enable this feature, acquire a
-[Google API key](https://developers.google.com/maps/documentation/geolocation/get-api-key)
-and place the following code in your main process file, before opening any
-browser windows that will make geolocation requests:
+You can provide an API key for making requests to Google's geocoding webservice. To do this, place the following code in your main process
+file, before opening any browser windows that will make geocoding requests:

 ```javascript
 process.env.GOOGLE_API_KEY = 'YOUR_KEY_HERE'
 ```

-By default, a newly generated Google API key may not be allowed to make geolocation requests.
-To enable the geolocation webservice for your project, enable it through the
-[API library](https://console.cloud.google.com/apis/library).
-
-N.B. You will need to add a
-[Billing Account](https://cloud.google.com/billing/docs/how-to/payment-methods#add_a_payment_method)
-to the project associated to the API key for the geolocation webservice to work.
+For instructions on how to acquire a Google API key, visit [this page](https://developers.google.com/maps/documentation/javascript/get-api-key).
+By default, a newly generated Google API key may not be allowed to make
+geocoding requests. To enable geocoding requests, visit [this page](https://developers.google.com/maps/documentation/geocoding/get-api-key).

 ### `ELECTRON_NO_ASAR`

@@ -135,14 +127,3 @@ the one downloaded by `npm install`. Usage:
 ```sh
 export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Testing
 ```
-
-## Set By Electron
-
-Electron sets some variables in your environment at runtime.
-
-### `ORIGINAL_XDG_CURRENT_DESKTOP`
-
-This variable is set to the value of `XDG_CURRENT_DESKTOP` that your application
-originally launched with.  Electron sometimes modifies the value of `XDG_CURRENT_DESKTOP`
-to affect other logic within Chromium so if you want access to the _original_ value
-you should look up this environment variable instead.
--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -1,116 +0,0 @@
-# Chrome Extension Support
-
-Electron supports a subset of the [Chrome Extensions
-API][chrome-extensions-api-index], primarily to support DevTools extensions and
-Chromium-internal extensions, but it also happens to support some other
-extension capabilities.
-
-[chrome-extensions-api-index]: https://developer.chrome.com/extensions/api_index
-
-> **Note:** Electron does not support arbitrary Chrome extensions from the
-> store, and it is a **non-goal** of the Electron project to be perfectly
-> compatible with Chrome's implementation of Extensions.
-
-## Loading extensions
-
-Electron only supports loading unpacked extensions (i.e., `.crx` files do not
-work). Extensions are installed per-`session`. To load an extension, call
-[`ses.loadExtension`](session.md#sesloadextensionpath):
-
-```js
-const { session } = require('electron')
-
-session.loadExtension('path/to/unpacked/extension').then(({ id }) => {
-  // ...
-})
-```
-
-Loaded extensions will not be automatically remembered across exits; if you do
-not call `loadExtension` when the app runs, the extension will not be loaded.
-
-Note that loading extensions is only supported in persistent sessions.
-Attempting to load an extension into an in-memory session will throw an error.
-
-See the [`session`](session.md) documentation for more information about
-loading, unloading, and querying active extensions.
-
-## Supported Extensions APIs
-
-We support the following extensions APIs, with some caveats. Other APIs may
-additionally be supported, but support for any APIs not listed here is
-provisional and may be removed.
-
-### `chrome.devtools.inspectedWindow`
-
-All features of this API are supported.
-
-### `chrome.devtools.network`
-
-All features of this API are supported.
-
-### `chrome.devtools.panels`
-
-All features of this API are supported.
-
-### `chrome.extension`
-
-The following properties of `chrome.extension` are supported:
-
- `chrome.extension.lastError`
-
-The following methods of `chrome.extension` are supported:
-
- `chrome.extension.getURL`
- `chrome.extension.getBackgroundPage`
-
-### `chrome.runtime`
-
-The following properties of `chrome.runtime` are supported:
-
- `chrome.runtime.lastError`
- `chrome.runtime.id`
-
-The following methods of `chrome.runtime` are supported:
-
- `chrome.runtime.getBackgroundPage`
- `chrome.runtime.getManifest`
- `chrome.runtime.getURL`
- `chrome.runtime.connect`
- `chrome.runtime.sendMessage`
-
-The following events of `chrome.runtime` are supported:
-
- `chrome.runtime.onStartup`
- `chrome.runtime.onInstalled`
- `chrome.runtime.onSuspend`
- `chrome.runtime.onSuspendCanceled`
- `chrome.runtime.onConnect`
- `chrome.runtime.onMessage`
-
-### `chrome.storage`
-
-Only `chrome.storage.local` is supported; `chrome.storage.sync` and
-`chrome.storage.managed` are not.
-
-### `chrome.tabs`
-
-The following methods of `chrome.tabs` are supported:
-
- `chrome.tabs.sendMessage`
- `chrome.tabs.executeScript`
-
-> **Note:** In Chrome, passing `-1` as a tab ID signifies the "currently active
-> tab". Since Electron has no such concept, passing `-1` as a tab ID is not
-> supported and will raise an error.
-
-### `chrome.management`
-
-The following methods of `chrome.management` are supported:
-
- `chrome.management.getAll`
- `chrome.management.get`
- `chrome.management.getSelf`
- `chrome.management.getPermissionWarningsById`
- `chrome.management.getPermissionWarningsByManifest`
- `chrome.management.onEnabled`
- `chrome.management.onDisabled`
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -52,7 +52,7 @@ win.show()
 Uses custom drawn close, and miniaturize buttons that display
 when hovering in the top left of the window. The fullscreen button
 is not available due to restrictions of frameless windows as they
-interface with Apple's macOS window masks. These custom buttons prevent
+interface with Apple's MacOS window masks. These custom buttons prevent
 issues with mouse events that occur with the standard window toolbar buttons.
 This option is only applicable for frameless windows.

@@ -158,7 +158,7 @@ buttons in titlebar non-draggable.

 ## Text selection

-In a frameless window the dragging behavior may conflict with selecting text.
+In a frameless window the dragging behaviour may conflict with selecting text.
 For example, when you drag the titlebar you may accidentally select the text on
 the titlebar. To prevent this, you need to disable text selection within a
 draggable area like this:
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -15,7 +15,7 @@ event of the app module is emitted.
 ```javascript
 const { app, globalShortcut } = require('electron')

-app.whenReady().then(() => {
+app.on('ready', () => {
  // Register a 'CommandOrControl+X' shortcut listener.
  const ret = globalShortcut.register('CommandOrControl+X', () => {
    console.log('CommandOrControl+X is pressed')
--- a/docs/api/in-app-purchase.md
+++ b/docs/api/in-app-purchase.md
@@ -40,17 +40,11 @@ Retrieves the product descriptions.

 ### `inAppPurchase.canMakePayments()`

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

 ### `inAppPurchase.getReceiptURL()`

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

 ### `inAppPurchase.finishAllTransactions()`

--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -91,7 +91,7 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`

 * `channel` String
-* `listener` Function<Promise\<void> | any>
+* `listener` Function<Promise<void> | any>
  * `event` IpcMainInvokeEvent
  * `...args` any[]

@@ -123,7 +123,7 @@ WebContents is the source of the invoke request.
 ### `ipcMain.handleOnce(channel, listener)`

 * `channel` String
-* `listener` Function<Promise\<void> | any>
+* `listener` Function<Promise<void> | any>
  * `event` IpcMainInvokeEvent
  * `...args` any[]

--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -57,7 +57,7 @@ Removes all listeners, or those of the specified `channel`.

 Send an asynchronous message to the main process via `channel`, along with
 arguments. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

@@ -68,10 +68,6 @@ throw an exception.
 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.

-If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
-
-If you want to receive a single response from the main process, like the result of a method call, consider using [`ipcRenderer.invoke`](#ipcrendererinvokechannel-args).
-
 ### `ipcRenderer.invoke(channel, ...args)`

 * `channel` String
@@ -81,7 +77,7 @@ Returns `Promise<any>` - Resolves with the response from the main process.

 Send a message to the main process via `channel` and expect a result
 asynchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

@@ -106,10 +102,6 @@ ipcMain.handle('some-name', async (event, someArgument) => {
 })
 ```

-If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
-
-If you do not need a respons to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).
-
 ### `ipcRenderer.sendSync(channel, ...args)`

 * `channel` String
@@ -119,7 +111,7 @@ Returns `any` - The value sent back by the [`ipcMain`](ipc-main.md) handler.

 Send a message to the main process via `channel` and expect a result
 synchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

@@ -135,35 +127,6 @@ and replies by setting `event.returnValue`.
 > last resort. It's much better to use the asynchronous version,
 > [`invoke()`](ipc-renderer.md#ipcrendererinvokechannel-args).

-### `ipcRenderer.postMessage(channel, message, [transfer])`
-
-* `channel` String
-* `message` any
-* `transfer` MessagePort[] (optional)
-
-Send a message to the main process, optionally transferring ownership of zero
-or more [`MessagePort`][] objects.
-
-The transferred `MessagePort` objects will be available in the main process as
-[`MessagePortMain`](message-port-main.md) objects by accessing the `ports`
-property of the emitted event.
-
-For example:
-```js
-// Renderer process
-const { port1, port2 } = new MessageChannel()
-ipcRenderer.postMessage('port', { message: 'hello' }, [port1])
-
-// Main process
-ipcMain.on('port', (e, msg) => {
-  const [port] = e.ports
-  // ...
-})
-```
-
-For more information on using `MessagePort` and `MessageChannel`, see the [MDN
-documentation](https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel).
-
 ### `ipcRenderer.sendTo(webContentsId, channel, ...args)`

 * `webContentsId` Number
@@ -187,5 +150,4 @@ in the [`ipc-renderer-event`](structures/ipc-renderer-event.md) structure docs.

 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-[`window.postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
-[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
+[`postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -12,9 +12,9 @@ See [`Menu`](menu.md) for examples.
  * `click` Function (optional) - Will be called with
    `click(menuItem, browserWindow, event)` when the menu item is clicked.
    * `menuItem` MenuItem
-    * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
+    * `browserWindow` [BrowserWindow](browser-window.md)
    * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `close`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
    `click` property will be ignored. See [roles](#roles).
  * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
    `radio`.
@@ -69,7 +69,6 @@ a `type`.
 The `role` property can have following values:

 * `undo`
-* `about` - Trigger a native about panel (custom message box on Window, which does not provide its own).
 * `redo`
 * `cut`
 * `copy`
@@ -95,6 +94,7 @@ The `role` property can have following values:
 The following additional roles are available on _macOS_:

 * `appMenu` - Whole default "App" menu (About, Services, etc.)
+* `about` - Map to the `orderFrontStandardAboutPanel` action.
 * `hide` - Map to the `hide` action.
 * `hideOthers` - Map to the `hideOtherApplications` action.
 * `unhide` - Map to the `unhideAllApplications` action.
@@ -117,7 +117,7 @@ When specifying a `role` on macOS, `label` and `accelerator` are the only
 options that will affect the menu item. All other options will be ignored.
 Lowercase `role`, e.g. `toggledevtools`, is still supported.

-**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on macOS.
+**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on MacOS.

 ### Instance Properties

@@ -130,7 +130,8 @@ dynamically changed.

 #### `menuItem.label`

-A `String` indicating the item's visible label.
+A `String` indicating the item's visible label, this property can be
+dynamically changed.

 #### `menuItem.click`

@@ -151,7 +152,7 @@ A `String` indicating the type of the item. Can be `normal`, `separator`, `subme

 #### `menuItem.role`

-A `String` (optional) indicating the item's role, if set. Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu`
+A `String` (optional) indicating the item's role, if set. Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `close`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu`

 #### `menuItem.accelerator`

@@ -164,7 +165,7 @@ item's icon, if set.

 #### `menuItem.sublabel`

-A `String` indicating the item's sublabel.
+A `String` indicating the item's sublabel, this property can be dynamically changed.

 #### `menuItem.toolTip` _macOS_

@@ -196,9 +197,7 @@ You can add a `click` function for additional behavior.
 #### `menuItem.registerAccelerator`

 A `Boolean` indicating if the accelerator should be registered with the
-system or just displayed.
-
-This property can be dynamically changed.
+system or just displayed, this property can be dynamically changed.

 #### `menuItem.commandId`

--- a/docs/api/message-channel-main.md
+++ b/docs/api/message-channel-main.md
@@ -1,30 +0,0 @@
-# MessageChannelMain
-
-`MessageChannelMain` is the main-process-side equivalent of the DOM
-[`MessageChannel`][] object. Its singular function is to create a pair of
-connected [`MessagePortMain`](message-port-main.md) objects.
-
-See the [Channel Messaging API][] documentation for more information on using
-channel messaging.
-
-## Class: MessageChannelMain
-
-Example:
-```js
-const { port1, port2 } = new MessageChannelMain()
-w.webContents.postMessage('port', null, [port2])
-port1.postMessage({ some: 'message' })
-```
-
-### Instance Properties
-
-#### `channel.port1`
-
-A [`MessagePortMain`](message-port-main.md) property.
-
-#### `channel.port2`
-
-A [`MessagePortMain`](message-port-main.md) property.
-
-[`MessageChannel`]: https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel
-[Channel Messaging API]: https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API
--- a/docs/api/message-port-main.md
+++ b/docs/api/message-port-main.md
@@ -1,49 +0,0 @@
-# MessagePortMain
-
-`MessagePortMain` is the main-process-side equivalent of the DOM
-[`MessagePort`][] object. It behaves similarly to the DOM version, with the
-exception that it uses the Node.js `EventEmitter` event system, instead of the
-DOM `EventTarget` system. This means you should use `port.on('message', ...)`
-to listen for events, instead of `port.onmessage = ...` or
-`port.addEventListener('message', ...)`
-
-See the [Channel Messaging API][] documentation for more information on using
-channel messaging.
-
-`MessagePortMain` is an [EventEmitter][event-emitter].
-
-## Class: MessagePortMain
-
-### Instance Methods
-
-#### `port.postMessage(message, [transfer])`
-
-* `message` any
-* `transfer` MessagePortMain[] (optional)
-
-Sends a message from the port, and optionally, transfers ownership of objects
-to other browsing contexts.
-
-#### `port.start()`
-
-Starts the sending of messages queued on the port. Messages will be queued
-until this method is called.
-
-#### `port.close()`
-
-Disconnects the port, so it is no longer active.
-
-### Instance Events
-
-#### Event: 'message'
-
-Returns:
-
-* `messageEvent` Object
-  * `data` any
-  * `ports` MessagePortMain[]
-
-Emitted when a MessagePortMain object receives a message.
-
-[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
-[Channel Messaging API]: https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API
--- a/docs/api/modernization/property-updates.md
+++ b/docs/api/modernization/property-updates.md
@@ -5,7 +5,14 @@ The Electron team is currently undergoing an initiative to convert separate gett
 ## Candidates

 * `BrowserWindow`
+  * `fullscreen`
+  * `simpleFullscreen`
+  * `alwaysOnTop`
+  * `title`
+  * `documentEdited`
+  * `hasShadow`
  * `menubarVisible`
+  * `visibleOnAllWorkspaces`
 * `crashReporter` module
  * `uploadToServer`
 * `webFrame` modules
@@ -38,3 +45,9 @@ The Electron team is currently undergoing an initiative to convert separate gett
  * `isMacTemplateImage`
 * `SystemPreferences` module
  * `appLevelAppearance`
+* `webContents` module
+  * `audioMuted`
+  * `frameRate`
+  * `userAgent`
+  * `zoomFactor`
+  * `zoomLevel`
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -276,10 +276,14 @@ Returns [`Size`](structures/size.md)

 Marks the image as a template image.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `image.isTemplateImage()`

 Returns `Boolean` - Whether the image is a template image.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `image.crop(rect)`

 * `rect` [Rectangle](structures/rectangle.md) - The area of the image to crop.
--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -27,7 +27,7 @@ should use `themeSource` below.

 ### `nativeTheme.themeSource`

-A `String` property that can be `system`, `light` or `dark`.  It is used to override and supersede
+A `String` property that can be `system`, `light` or `dark`.  It is used to override and supercede
 the value that Chromium has chosen to use internally.

 Setting this property to `system` will remove the override and
--- a/docs/api/net-log.md
+++ b/docs/api/net-log.md
@@ -7,7 +7,7 @@ Process: [Main](../glossary.md#main-process)
 ```javascript
 const { netLog } = require('electron')

-app.whenReady().then(async () => {
+app.on('ready', async () => {
  await netLog.startLogging('/path/to/net-log')
  // After some network events
  const path = await netLog.stopLogging()
--- a/docs/api/net.md
+++ b/docs/api/net.md
@@ -28,7 +28,7 @@ Example usage:

 ```javascript
 const { app } = require('electron')
-app.whenReady().then(() => {
+app.on('ready', () => {
  const { net } = require('electron')
  const request = net.request('https://github.com')
  request.on('response', (response) => {
--- a/docs/api/power-monitor.md
+++ b/docs/api/power-monitor.md
@@ -13,7 +13,7 @@ For example:
 ```javascript
 const { app, powerMonitor } = require('electron')

-app.whenReady().then(() => {
+app.on('ready', () => {
  powerMonitor.on('suspend', () => {
    console.log('The system is going to sleep')
  })
@@ -24,19 +24,19 @@ app.whenReady().then(() => {

 The `powerMonitor` module emits the following events:

-### Event: 'suspend' _macOS_ _Windows_
+### Event: 'suspend'

 Emitted when the system is suspending.

-### Event: 'resume' _macOS_ _Windows_
+### Event: 'resume'

 Emitted when system is resuming.

-### Event: 'on-ac' _macOS_ _Windows_
+### Event: 'on-ac' _Windows_

 Emitted when the system changes to AC power.

-### Event: 'on-battery' _macOS_  _Windows_
+### Event: 'on-battery' _Windows_

 Emitted when system changes to battery power.

--- a/docs/api/protocol-ns.md
+++ b/docs/api/protocol-ns.md
@@ -20,7 +20,7 @@ An example of implementing a protocol that has the same effect as the
 const { app, protocol } = require('electron')
 const path = require('path')

-app.whenReady().then(() => {
+app.on('ready', () => {
  protocol.registerFileProtocol('atom', (request, callback) => {
    const url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
@@ -47,7 +47,7 @@ to register it to that session explicitly.
 const { session, app, protocol } = require('electron')
 const path = require('path')

-app.whenReady().then(() => {
+app.on('ready', () => {
  const partition = 'persist:example'
  const ses = session.fromPartition(partition)

--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -11,7 +11,7 @@ An example of implementing a protocol that has the same effect as the
 const { app, protocol } = require('electron')
 const path = require('path')

-app.whenReady().then(() => {
+app.on('ready', () => {
  protocol.registerFileProtocol('atom', (request, callback) => {
    const url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
@@ -34,7 +34,7 @@ To have your custom protocol work in combination with a custom session, you need
 const { session, app, protocol } = require('electron')
 const path = require('path')

-app.whenReady().then(() => {
+app.on('ready', () => {
  const partition = 'persist:example'
  const ses = session.fromPartition(partition)

--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -163,7 +163,7 @@ project/
 ```js
 // main process: main/index.js
 const { app } = require('electron')
-app.whenReady().then(() => { /* ... */ })
+app.on('ready', () => { /* ... */ })
 ```

 ```js
--- a/docs/api/sandbox-option.md
+++ b/docs/api/sandbox-option.md
@@ -39,7 +39,7 @@ To create a sandboxed window, pass `sandbox: true` to `webPreferences`:

 ```js
 let win
-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow({
    webPreferences: {
      sandbox: true
@@ -51,7 +51,7 @@ app.whenReady().then(() => {

 In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
 only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
-within this new window `window.open` follows the native behavior (by default Electron creates a [`BrowserWindow`](browser-window.md)
+within this new window `window.open` follows the native behaviour (by default Electron creates a [`BrowserWindow`](browser-window.md)
 and returns a proxy to this via `window.open`).

 [`app.enableSandbox`](app.md#appenablesandbox-experimental) can be used to force `sandbox: true` for all `BrowserWindow` instances.
@@ -59,7 +59,7 @@ and returns a proxy to this via `window.open`).
 ```js
 let win
 app.enableSandbox()
-app.whenReady().then(() => {
+app.on('ready', () => {
  // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
  win = new BrowserWindow()
  win.loadURL('http://google.com')
@@ -73,7 +73,7 @@ Here's an example:

 ```js
 let win
-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow({
    webPreferences: {
      sandbox: true,
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -18,7 +18,7 @@ An example of creating a window that fills the whole screen:
 const { app, BrowserWindow, screen } = require('electron')

 let win
-app.whenReady().then(() => {
+app.on('ready', () => {
  const { width, height } = screen.getPrimaryDisplay().workAreaSize
  win = new BrowserWindow({ width, height })
  win.loadURL('https://github.com')
@@ -32,7 +32,7 @@ const { app, BrowserWindow, screen } = require('electron')

 let win

-app.whenReady().then(() => {
+app.on('ready', () => {
  let displays = screen.getAllDisplays()
  let externalDisplay = displays.find((display) => {
    return display.bounds.x !== 0 || display.bounds.y !== 0
--- a/docs/api/service-workers.md
+++ b/docs/api/service-workers.md
@@ -1,62 +0,0 @@
-## Class: ServiceWorkers
-
-> Query and receive events from a sessions active service workers.
-
-Process: [Main](../glossary.md#main-process)
-
-Instances of the `ServiceWorkers` class are accessed by using `serviceWorkers` property of
-a `Session`.
-
-For example:
-
-```javascript
-const { session } = require('electron')
-
-// Get all service workers.
-console.log(session.defaultSession.serviceWorkers.getAllRunning())
-
-// Handle logs and get service worker info
-session.defaultSession.serviceWorkers.on('console-message', (event, messageDetails) => {
-  console.log(
-    'Got service worker message',
-    messageDetails,
-    'from',
-    session.defaultSession.serviceWorkers.getFromVersionID(messageDetails.versionId)
-  )
-})
-```
-
-### Instance Events
-
-The following events are available on instances of `ServiceWorkers`:
-
-#### Event: 'console-message'
-
-Returns:
-
-* `event` Event
-* `messageDetails` Object - Information about the console message
-  * `message` String - The actual console message
-  * `versionId` Number - The version ID of the service worker that sent the log message
-  * `source` String - The type of source for this message.  Can be `javascript`, `xml`, `network`, `console-api`, `storage`, `app-cache`, `rendering`, `security`, `deprecation`, `worker`, `violation`, `intervention`, `recommendation` or `other`.
-  * `level` Number - The log level, from 0 to 3.  In order it matches `verbose`, `info`, `warning` and `error`.
-  * `sourceUrl` String - The URL the message came from
-  * `lineNumber` Number - The line number of the source that triggered this console message
-
-Emitted when a service worker logs something to the console.
-
-### Instance Methods
-
-The following methods are available on instances of `ServiceWorkers`:
-
-#### `serviceWorkers.getAllRunning()`
-
-Returns `Record<Number, ServiceWorkerInfo>` - A [ServiceWorkerInfo](structures/service-worker-info.md) object where the keys are the service worker version ID and the values are the information about that service worker.
-
-#### `serviceWorkers.getFromVersionID(versionId)`
-
-* `versionId` Number
-
-Returns [`ServiceWorkerInfo`](structures/service-worker-info.md) - Information about this service worker
-
-If the service worker does not exist or is not running this method will throw an exception.
--- a/docs/api/session.md
+++ b/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`:
@@ -165,10 +126,9 @@ Clears the session’s HTTP cache.
    `scheme://host:port`.
  * `storages` String[] (optional) - The types of storages to clear, can contain:
    `appcache`, `cookies`, `filesystem`, `indexdb`, `localstorage`,
-    `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
-    specified, clear all storage types.
+    `shadercache`, `websql`, `serviceworkers`, `cachestorage`.
  * `quotas` String[] (optional) - The types of quotas to clear, can contain:
-    `temporary`, `persistent`, `syncable`. If not specified, clear all quotas.
+    `temporary`, `persistent`, `syncable`.

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

@@ -311,7 +271,6 @@ the original network configuration.
  * `request` Object
    * `hostname` String
    * `certificate` [Certificate](structures/certificate.md)
-    * `validatedCertificate` [Certificate](structures/certificate.md)
    * `verificationResult` String - Verification result from chromium.
    * `errorCode` Integer - Error code.
  * `callback` Function
@@ -376,7 +335,7 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents

 #### `ses.setPermissionCheckHandler(handler)`

-* `handler` Function\<Boolean> | null
+* `handler` Function<Boolean> | null
  * `webContents` [WebContents](web-contents.md) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
  * `permission` String - Enum of 'media'.
  * `requestingOrigin` String - The origin URL of the permission check
@@ -522,97 +481,18 @@ setting with the current OS locale.  This setting is persisted across restarts.
 By default Electron will download hunspell dictionaries from the Chromium CDN.  If you want to override this
 behavior you can use this API to point the dictionary downloader at your own hosted version of the hunspell
 dictionaries.  We publish a `hunspell_dictionaries.zip` file with each release which contains the files you need
-to host here, the file server must be **case insensitive** you must upload each file twice, once with the case it
-has in the ZIP file and once with the filename as all lower case.
-
-If the files present in `hunspell_dictionaries.zip` are available at `https://example.com/dictionaries/language-code.bdic`
-then you should call this api with `ses.setSpellCheckerDictionaryDownloadURL('https://example.com/dictionaries/')`.  Please
-note the trailing slash.  The URL to the dictionaries is formed as `${url}${filename}`.
+to host here.

 **Note:** On macOS the OS spellchecker is used and therefore we do not download any dictionary files.  This API is a no-op on macOS.

-#### `ses.listWordsInSpellCheckerDictionary()`
-
-Returns `Promise<String[]>` - An array of all words in app's custom dictionary.
-Resolves when the full dictionary is loaded from disk.
-
 #### `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. This API
-will not work on non-persistent (in-memory) sessions.
+Returns `Boolean` - Whether the word was successfully written to the custom dictionary.

 **Note:** On macOS and Windows 10 this word will be written to the OS custom dictionary as well

-#### `ses.removeWordFromSpellCheckerDictionary(word)`
-
-* `word` String - The word you want to remove from the dictionary
-
-Returns `Boolean` - Whether the word was successfully removed from the custom dictionary. This API
-will not work on non-persistent (in-memory) sessions.
-
-**Note:** On macOS and Windows 10 this word will be removed from the OS custom dictionary as well
-
-#### `ses.loadExtension(path)`
-
-* `path` String - Path to a directory containing an unpacked Chrome extension
-
-Returns `Promise<Extension>` - resolves when the extension is loaded.
-
-This method will raise an exception if the extension could not be loaded. If
-there are warnings when installing the extension (e.g. if the extension
-requests an API that Electron does not support) then they will be logged to the
-console.
-
-Note that Electron does not support the full range of Chrome extensions APIs.
-
-Note that in previous versions of Electron, extensions that were loaded would
-be remembered for future runs of the application. This is no longer the case:
-`loadExtension` must be called on every boot of your app if you want the
-extension to be loaded.
-
-```js
-const { app, session } = require('electron')
-const path = require('path')
-
-app.on('ready', async () => {
-  await session.defaultSession.loadExtension(path.join(__dirname, 'react-devtools'))
-  // Note that in order to use the React DevTools extension, you'll need to
-  // download and unzip a copy of the extension.
-})
-```
-
-This API does not support loading packed (.crx) extensions.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `ses.removeExtension(extensionId)`
-
-* `extensionId` String - ID of extension to remove
-
-Unloads an extension.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `ses.getExtension(extensionId)`
-
-* `extensionId` String - ID of extension to query
-
-Returns `Extension` | `null` - The loaded extension with the given ID.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `ses.getAllExtensions()`
-
-Returns `Extension[]` - A list of all loaded extensions.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
 ### Instance Properties

 The following properties are available on instances of `Session`:
@@ -626,10 +506,6 @@ code to the `setSpellCheckerLanaguages` API that isn't in this array will result

 A [`Cookies`](cookies.md) object for this session.

-#### `ses.serviceWorkers` _Readonly_
-
-A [`ServiceWorkers`](service-workers.md) object for this session.
-
 #### `ses.webRequest` _Readonly_

 A [`WebRequest`](web-request.md) object for this session.
@@ -642,12 +518,12 @@ A [`Protocol`](protocol.md) object for this session.
 const { app, session } = require('electron')
 const path = require('path')

-app.whenReady().then(() => {
+app.on('ready', function () {
  const protocol = session.fromPartition('some-partition').protocol
-  protocol.registerFileProtocol('atom', (request, callback) => {
-    let url = request.url.substr(7)
+  protocol.registerFileProtocol('atom', function (request, callback) {
+    var url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
-  }, (error) => {
+  }, function (error) {
    if (error) console.error('Failed to register protocol')
  })
 })
@@ -660,7 +536,7 @@ A [`NetLog`](net-log.md) object for this session.
 ```javascript
 const { app, session } = require('electron')

-app.whenReady().then(async () => {
+app.on('ready', async function () {
  const netLog = session.fromPartition('some-partition').netLog
  netLog.startLogging('/path/to/net-log')
  // After some network events
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -28,7 +28,10 @@ Show the given file in a file manager. If possible, select the file.

 * `path` String

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

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

--- a/docs/api/structures/extension.md
+++ b/docs/api/structures/extension.md
@@ -1,8 +0,0 @@
-# Extension Object
-
-* `id` String
-* `manifest` any - Copy of the [extension's manifest data](https://developer.chrome.com/extensions/manifest).
-* `name` String
-* `path` String - The extension's file path.
-* `version` String
-* `url` String - The extension's `chrome-extension://` URL.
--- a/docs/api/structures/ipc-main-event.md
+++ b/docs/api/structures/ipc-main-event.md
@@ -1,10 +1,8 @@
 # IpcMainEvent Object extends `Event`

-* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `returnValue` any - Set this to the value to be returned in a synchronous message
 * `sender` WebContents - Returns the `webContents` that sent the message
-* `ports` MessagePortMain[] - A list of MessagePorts that were transferred with this message
 * `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
  * `channel` String
  * `...args` any[]
--- a/docs/api/structures/ipc-main-invoke-event.md
+++ b/docs/api/structures/ipc-main-invoke-event.md
@@ -1,5 +1,4 @@
 # IpcMainInvokeEvent Object extends `Event`

-* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `sender` WebContents - Returns the `webContents` that sent the message
--- a/docs/api/structures/ipc-renderer-event.md
+++ b/docs/api/structures/ipc-renderer-event.md
@@ -2,6 +2,5 @@

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

 [ipc-renderer-sendto]: #ipcrenderersendtowindowid-channel--arg1-arg2-
--- a/docs/api/structures/new-window-event.md
+++ b/docs/api/structures/new-window-event.md
@@ -1,4 +0,0 @@
-# NewWindowEvent Object extends `Event`
-
-* `newGuest` BrowserWindow (optional)
-
--- a/docs/api/structures/product.md
+++ b/docs/api/structures/product.md
@@ -7,5 +7,4 @@
 * `contentLengths` Number[] - The total size of the content, in bytes.
 * `price` Number - The cost of the product in the local currency.
 * `formattedPrice` String - The locale formatted price of the product.
-* `currencyCode` String - 3 character code presenting a product's currency based on the ISO 4217 standard.
 * `isDownloadable` Boolean - A Boolean value that indicates whether the App Store has downloadable content for this product. `true` if at least one file has been associated with the product.
--- a/docs/api/structures/service-worker-info.md
+++ b/docs/api/structures/service-worker-info.md
@@ -1,5 +0,0 @@
-# ServiceWorkerInfo Object
-
-* `scriptUrl` String - The full URL to the script that this service worker runs
-* `scope` String - The base URL that this service worker is active for.
-* `renderProcessId` Number - The virtual ID of the process that this service worker is running in.  This is not an OS level PID.  This aligns with the ID set used for `webContents.getProcessId()`.
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -22,7 +22,7 @@ The main process script is like a normal Node.js script:
 const { app, BrowserWindow } = require('electron')
 let win = null

-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow({ width: 800, height: 600 })
  win.loadURL('https://github.com')
 })
@@ -56,7 +56,7 @@ const { app, BrowserWindow } = require('electron')

 let win

-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow()
  win.loadURL('https://github.com')
 })
@@ -71,7 +71,7 @@ const { app, BrowserWindow } = electron

 let win

-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow()
  win.loadURL('https://github.com')
 })
@@ -85,7 +85,7 @@ const app = electron.app
 const BrowserWindow = electron.BrowserWindow
 let win

-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow()
  win.loadURL('https://github.com')
 })
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -326,7 +326,7 @@ This API is only available on macOS 10.14 Mojave or newer.
    * `window-frame-text` - The text in the window's titlebar area.

 Returns `String` - The system color setting in RGB hexadecimal form (`#ABCDEF`).
-See the [Windows docs][windows-colors] and the [macOS docs][macos-colors] for more details.
+See the [Windows docs][windows-colors] and the [MacOS docs][macos-colors] for more details.

 The following colors are only available on macOS 10.14: `find-highlight`, `selected-content-background`, `separator`, `unemphasized-selected-content-background`, `unemphasized-selected-text-background`, and `unemphasized-selected-text`.

@@ -360,7 +360,7 @@ Returns `Boolean` - `true` if an inverted color scheme (a high contrast color sc

 Returns `Boolean` - `true` if a high contrast theme is active, `false` otherwise.

-**Deprecated:** Should use the new [`nativeTheme.shouldUseHighContrastColors`](native-theme.md#nativethemeshouldusehighcontrastcolors-macos-windows-readonly) API.
+**Depreacted:** Should use the new [`nativeTheme.shouldUseHighContrastColors`](native-theme.md#nativethemeshouldusehighcontrastcolors-macos-windows-readonly) API.

 ### `systemPreferences.getEffectiveAppearance()` _macOS_

@@ -369,6 +369,16 @@ Returns `String` - Can be `dark`, `light` or `unknown`.
 Gets the macOS appearance setting that is currently applied to your application,
 maps to [NSApplication.effectiveAppearance](https://developer.apple.com/documentation/appkit/nsapplication/2967171-effectiveappearance?language=objc)

+Please note that until Electron is built targeting the 10.14 SDK, your application's
+`effectiveAppearance` will default to 'light' and won't inherit the OS preference. In
+the interim in order for your application to inherit the OS preference you must set the
+`NSRequiresAquaSystemAppearance` key in your apps `Info.plist` to `false`.  If you are
+using `electron-packager` or `electron-forge` just set the `enableDarwinDarkMode`
+packager option to `true`.  See the [Electron Packager API](https://github.com/electron/electron-packager/blob/master/docs/api.md#darwindarkmodesupport)
+for more details.
+
+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.getAppLevelAppearance()` _macOS_ _Deprecated_

 Returns `String` | `null` - Can be `dark`, `light` or `unknown`.
@@ -377,6 +387,8 @@ Gets the macOS appearance setting that you have declared you want for
 your application, maps to [NSApplication.appearance](https://developer.apple.com/documentation/appkit/nsapplication/2967170-appearance?language=objc).
 You can use the `setAppLevelAppearance` API to set this value.

+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.setAppLevelAppearance(appearance)` _macOS_ _Deprecated_

 * `appearance` String | null - Can be `dark` or `light`
@@ -384,12 +396,16 @@ You can use the `setAppLevelAppearance` API to set this value.
 Sets the appearance setting for your application, this should override the
 system default and override the value of `getEffectiveAppearance`.

+**[Deprecated](modernization/property-updates.md)**
+
 ### `systemPreferences.canPromptTouchID()` _macOS_

 Returns `Boolean` - whether or not this device has the ability to use Touch ID.

 **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
@@ -416,7 +432,7 @@ This API itself will not protect your user data; rather, it is a mechanism to al

 Returns `Boolean` - `true` if the current process is a trusted accessibility client and `false` if it is not.

-### `systemPreferences.getMediaAccessStatus(mediaType)` _Windows_ _macOS_
+### `systemPreferences.getMediaAccessStatus(mediaType)` _macOS_

 * `mediaType` String - Can be `microphone`, `camera` or `screen`.

@@ -426,9 +442,6 @@ This user consent was not required on macOS 10.13 High Sierra or lower so this m
 macOS 10.14 Mojave or higher requires consent for `microphone` and `camera` access.
 macOS 10.15 Catalina or higher requires consent for `screen` access.

-Windows 10 has a global setting controlling `microphone` and `camera` access for all win32 applications.
-It will always return `granted` for `screen` and for all media types on older versions of Windows.
-
 ### `systemPreferences.askForMediaAccess(mediaType)` _macOS_

 * `mediaType` String - the type of media being requested; can be `microphone`, `camera`.
@@ -467,3 +480,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.
--- a/docs/api/touch-bar.md
+++ b/docs/api/touch-bar.md
@@ -166,7 +166,7 @@ const touchBar = new TouchBar({

 let window

-app.whenReady().then(() => {
+app.once('ready', () => {
  window = new BrowserWindow({
    frame: false,
    titleBarStyle: 'hiddenInset',
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -10,7 +10,7 @@ Process: [Main](../glossary.md#main-process)
 const { app, Menu, Tray } = require('electron')

 let tray = null
-app.whenReady().then(() => {
+app.on('ready', () => {
  tray = new Tray('/path/to/my/icon')
  const contextMenu = Menu.buildFromTemplate([
    { label: 'Item1', type: 'radio' },
@@ -38,7 +38,7 @@ __Platform limitations:__
 const { app, Menu, Tray } = require('electron')

 let appIcon = null
-app.whenReady().then(() => {
+app.on('ready', () => {
  appIcon = new Tray('/path/to/my/icon')
  const contextMenu = Menu.buildFromTemplate([
    { label: 'Item1', type: 'radio' },
@@ -58,10 +58,9 @@ If you want to keep exact same behaviors on all platforms, you should not
 rely on the `click` event and always attach a context menu to the tray icon.


-### `new Tray(image, [guid])`
+### `new Tray(image)`

 * `image` ([NativeImage](native-image.md) | String)
-* `guid` String (optional) _Windows_ - Assigns a GUID to the tray icon. If the executable is signed and the signature contains an organization in the subject line then the GUID is permanently associated with that signature. OS level settings like the position of the tray icon in the system tray will persist even if the path to the executable changes. If the executable is not code-signed then the GUID is permanently associated with the path to the executable. Changing the path to the executable will break the creation of the tray icon and a new GUID must be used. However, it is highly recommended to use the GUID parameter only in conjunction with code-signed executable. If an App defines multiple tray icons then each icon must use a separate GUID.

 Creates a new tray icon associated with the `image`.

@@ -144,26 +143,6 @@ Emitted when a drag operation exits the tray icon.

 Emitted when a drag operation ends on the tray or ends at another location.

-#### Event: 'mouse-up' _macOS_
-
-Returns:
-
-* `event` [KeyboardEvent](structures/keyboard-event.md)
-* `position` [Point](structures/point.md) - The position of the event.
-
-Emitted when the mouse is released from clicking the tray icon.
-
-Note: This will not be emitted if you have set a context menu for your Tray using `tray.setContextMenu`, as a result of macOS-level constraints.
-
-#### Event: 'mouse-down' _macOS_
-
-Returns:
-
-* `event` [KeyboardEvent](structures/keyboard-event.md)
-* `position` [Point](structures/point.md) - The position of the event.
-
-Emitted when the mouse clicks the tray icon.
-
 #### Event: 'mouse-enter' _macOS_

 Returns:
@@ -278,10 +257,6 @@ be shown instead of the tray icon's context menu.

 The `position` is only available on Windows, and it is (0, 0) by default.

-#### `tray.closeContextMenu()` _macOS_ _Windows_
-
-Closes an open context menu, as set by `tray.setContextMenu()`.
-
 #### `tray.setContextMenu(menu)`

 * `menu` Menu | null
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -138,7 +138,7 @@ Emitted when page receives favicon urls.

 Returns:

-* `event` NewWindowEvent
+* `event` Event
 * `url` String
 * `frameName` String
 * `disposition` String - Can be `default`, `foreground-tab`, `background-tab`,
@@ -325,7 +325,7 @@ win.webContents.on('will-prevent-unload', (event) => {
 })
 ```

-#### Event: 'crashed' _Deprecated_
+#### Event: 'crashed'

 Returns:

@@ -334,29 +334,6 @@ Returns:

 Emitted when the renderer process crashes or is killed.

-**Deprecated:** This event is superceded by the `render-process-gone` event
-which contains more information about why the render process dissapeared. It
-isn't always because it crashed.  The `killed` boolean can be replaced by
-checking `reason === 'killed'` when you switch to that event.
-
-#### Event: 'render-process-gone'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `reason` String - The reason the render process is gone.  Possible values:
-    * `clean-exit` - Process exited with an exit code of zero
-    * `abnormal-exit` - Process exited with a non-zero exit code
-    * `killed` - Process was sent a SIGTERM or otherwise killed externally
-    * `crashed` - Process crashed
-    * `oom` - Process ran out of memory
-    * `launch-failed` - Process never successfully launched
-    * `integrity-failure` - Windows code integrity checks failed
-
-Emitted when the renderer process unexpectedly dissapears.  This is normally
-because it was crashed or killed.
-
 #### Event: 'unresponsive'

 Emitted when the web page becomes unresponsive.
@@ -389,7 +366,6 @@ Returns:
  * `key` String - Equivalent to [KeyboardEvent.key][keyboardevent].
  * `code` String - Equivalent to [KeyboardEvent.code][keyboardevent].
  * `isAutoRepeat` Boolean - Equivalent to [KeyboardEvent.repeat][keyboardevent].
-  * `isComposing` Boolean - Equivalent to [KeyboardEvent.isComposing][keyboardevent].
  * `shift` Boolean - Equivalent to [KeyboardEvent.shiftKey][keyboardevent].
  * `control` Boolean - Equivalent to [KeyboardEvent.controlKey][keyboardevent].
  * `alt` Boolean - Equivalent to [KeyboardEvent.altKey][keyboardevent].
@@ -648,7 +624,7 @@ const { app, BrowserWindow } = require('electron')
 let win = null
 app.commandLine.appendSwitch('enable-experimental-web-platform-features')

-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow({ width: 800, height: 600 })
  win.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
    event.preventDefault()
@@ -895,10 +871,10 @@ Returns `String` - The URL of the current web page.
 ```javascript
 const { BrowserWindow } = require('electron')
 let win = new BrowserWindow({ width: 800, height: 600 })
-win.loadURL('http://github.com').then(() => {
-  const currentURL = win.webContents.getURL()
-  console.log(currentURL)
-})
+win.loadURL('http://github.com')
+
+let currentURL = win.webContents.getURL()
+console.log(currentURL)
 ```

 #### `contents.getTitle()`
@@ -991,10 +967,14 @@ Returns `Boolean` - Whether the renderer process has crashed.

 Overrides the user agent for this web page.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.getUserAgent()`

 Returns `String` - The user agent for this web page.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.insertCSS(css[, options])`

 * `css` String
@@ -1007,7 +987,7 @@ Injects CSS into the current web page and returns a unique key for the inserted
 stylesheet.

 ```js
-contents.on('did-finish-load', () => {
+contents.on('did-finish-load', function () {
  contents.insertCSS('html, body { background-color: #f00; }')
 })
 ```
@@ -1022,7 +1002,7 @@ Removes the inserted CSS from the current web page. The stylesheet is identified
 by its key, which is returned from `contents.insertCSS(css)`.

 ```js
-contents.on('did-finish-load', async () => {
+contents.on('did-finish-load', async function () {
  const key = await contents.insertCSS('html, body { background-color: #f00; }')
  contents.removeInsertedCSS(key)
 })
@@ -1074,27 +1054,33 @@ Ignore application menu shortcuts while this web contents is focused.

 Mute the audio on the current web page.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.isAudioMuted()`

 Returns `Boolean` - Whether this page has been muted.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.isCurrentlyAudible()`

 Returns `Boolean` - Whether audio is currently playing.

 #### `contents.setZoomFactor(factor)`

-* `factor` Double - Zoom factor; default is 1.0.
+* `factor` Number - Zoom factor.

 Changes the zoom factor to the specified factor. Zoom factor is
 zoom percent divided by 100, so 300% = 3.0.

-The factor must be greater than 0.0.
+**[Deprecated](modernization/property-updates.md)**

 #### `contents.getZoomFactor()`

 Returns `Number` - the current zoom factor.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.setZoomLevel(level)`

 * `level` Number - Zoom level.
@@ -1104,10 +1090,14 @@ increment above or below represents zooming 20% larger or smaller to default
 limits of 300% and 50% of original size, respectively. The formula for this is
 `scale := 1.2 ^ level`.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.getZoomLevel()`

 Returns `Number` - the current zoom level.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.setVisualZoomLevelLimits(minimumLevel, maximumLevel)`

 * `minimumLevel` Number
@@ -1123,6 +1113,15 @@ Sets the maximum and minimum pinch-to-zoom level.
 > contents.setVisualZoomLevelLimits(1, 3)
 > ```

+#### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Returns `Promise<void>`
+
+Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
+
 #### `contents.undo()`

 Executes the editing command `undo` in web page.
@@ -1235,34 +1234,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])`

@@ -1270,7 +1246,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`.
@@ -1283,22 +1259,16 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
  * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
  * `collate` Boolean (optional) - Whether the web page should be collated.
  * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the start page.
-    * `to` Number - the end page.
+  * `pageRanges` Record<string, number> (optional) - The page range to print. Should have two keys: `from` and `to`.
  * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
-  * `dpi` Record<string, number> (optional)
+  * `dpi` Object (optional)
    * `horizontal` Number (optional) - The horizontal dpi.
    * `vertical` Number (optional) - The vertical dpi.
  * `header` String (optional) - String to be printed as page header.
  * `footer` String (optional) - String to be printed as page footer.
-  * `pageSize` String | Size (optional) - Specify page size of the printed document. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
 * `callback` Function (optional)
  * `success` Boolean - Indicates success of the print call.
-  * `failureReason` String - Error description called back if the print fails.
-
-When a custom `pageSize` is passed, Chromium attempts to validate platform specific minumum values for `width_microns` and `height_microns`. Width and height must both be minimum 353 microns but may be higher on some operating systems.
+  * `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.
@@ -1317,20 +1287,14 @@ win.webContents.print(options, (success, errorType) => {
 #### `contents.printToPDF(options)`

 * `options` Object
-  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
-    * `title` String - The title for the PDF header.
-    * `url` String - the url for the PDF footer.
-  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.
  * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
    default margin, 1 for no margin, and 2 for minimum margin.
-  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the first page to print.
-    * `to` Number - the last page to print (inclusive).
  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width` in microns.
+    `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
+    and `width` in microns.
  * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
  * `printSelectionOnly` Boolean (optional) - Whether to print selection only.
+  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.

 Returns `Promise<Buffer>` - Resolves with the generated PDF data.

@@ -1346,9 +1310,7 @@ By default, an empty `options` will be regarded as:
  marginsType: 0,
  printBackground: false,
  printSelectionOnly: false,
-  landscape: false,
-  pageSize: 'A4',
-  scaleFactor: 100
+  landscape: false
 }
 ```

@@ -1365,13 +1327,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)
  })
 })
 ```
@@ -1457,7 +1418,7 @@ const { app, BrowserWindow } = require('electron')
 let win = null
 let devtools = null

-app.whenReady().then(() => {
+app.once('ready', () => {
  win = new BrowserWindow()
  devtools = new BrowserWindow()
  win.loadURL('https://github.com')
@@ -1546,7 +1507,7 @@ An example of sending messages from the main process to the renderer process:
 const { app, BrowserWindow } = require('electron')
 let win = null

-app.whenReady().then(() => {
+app.on('ready', () => {
  win = new BrowserWindow({ width: 800, height: 600 })
  win.loadURL(`file://${__dirname}/index.html`)
  win.webContents.on('did-finish-load', () => {
@@ -1570,9 +1531,7 @@ app.whenReady().then(() => {

 #### `contents.sendToFrame(frameId, channel, ...args)`

-* `frameId` Integer | [number, number] - the ID of the frame to send to, or a
-  pair of `[processId, frameId]` if the frame is in a different process to the
-  main frame.
+* `frameId` Integer
 * `channel` String
 * `...args` any[]

@@ -1606,32 +1565,6 @@ ipcMain.on('ping', (event) => {
 })
 ```

-#### `contents.postMessage(channel, message, [transfer])`
-
-* `channel` String
-* `message` any
-* `transfer` MessagePortMain[] (optional)
-
-Send a message to the renderer process, optionally transferring ownership of
-zero or more [`MessagePortMain`][] objects.
-
-The transferred `MessagePortMain` objects will be available in the renderer
-process by accessing the `ports` property of the emitted event. When they
-arrive in the renderer, they will be native DOM `MessagePort` objects.
-
-For example:
-```js
-// Main process
-const { port1, port2 } = new MessageChannelMain()
-webContents.postMessage('port', { message: 'hello' }, [port1])
-
-// Renderer process
-ipcRenderer.on('port', (e, msg) => {
-  const [port] = e.ports
-  // ...
-})
-```
-
 #### `contents.enableDeviceEmulation(parameters)`

 * `parameters` Object
@@ -1748,10 +1681,14 @@ Returns `Boolean` - If *offscreen rendering* is enabled returns whether it is cu
 If *offscreen rendering* is enabled sets the frame rate to the specified number.
 Only values between 1 and 60 are accepted.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.getFrameRate()`

 Returns `Integer` - If *offscreen rendering* is enabled returns the current frame rate.

+**[Deprecated](modernization/property-updates.md)**
+
 #### `contents.invalidate()`

 Schedules a full repaint of the window this web contents is in.
@@ -1857,7 +1794,7 @@ A [`WebContents`](web-contents.md) instance that might own this `WebContents`.

 #### `contents.devToolsWebContents` _Readonly_

-A `WebContents | null` property that represents the of DevTools `WebContents` associated with a given `WebContents`.
+A `WebContents` of DevTools for this `WebContents`.

 **Note:** Users should never store this object because it may become `null`
 when the DevTools has been closed.
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -22,13 +22,11 @@ The `WebFrame` class has the following instance methods:

 ### `webFrame.setZoomFactor(factor)`

-* `factor` Double - Zoom factor; default is 1.0.
+* `factor` Number - Zoom factor.

 Changes the zoom factor to the specified factor. Zoom factor is
 zoom percent divided by 100, so 300% = 3.0.

-The factor must be greater than 0.0.
-
 ### `webFrame.getZoomFactor()`

 Returns `Number` - The current zoom factor.
@@ -58,6 +56,13 @@ Sets the maximum and minimum pinch-to-zoom level.
 > webFrame.setVisualZoomLevelLimits(1, 3)
 > ```

+### `webFrame.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
+
 ### `webFrame.setSpellCheckProvider(language, provider)`

 * `language` String
@@ -124,20 +129,13 @@ by its key, which is returned from `webFrame.insertCSS(css)`.

 Inserts `text` to the focused element.

-### `webFrame.executeJavaScript(code[, userGesture, callback])`
+### `webFrame.executeJavaScript(code[, userGesture])`

 * `code` String
 * `userGesture` Boolean (optional) - Default is `false`.
-* `callback` Function (optional) - Called after script has been executed. Unless
-  the frame is suspended (e.g. showing a modal alert), execution will be
-  synchronous and the callback will be invoked before the method returns. For
-  compatibility with an older version of this method, the error parameter is
-  second.
-  * `result` Any
-  * `error` Error

-Returns `Promise<any>` - A promise that resolves with the result of the executed
-code or is rejected if execution throws or results in a rejected promise.
+Returns `Promise<any>` - A promise that resolves with the result of the executed code
+or is rejected if the result of the code is a rejected promise.

 Evaluates `code` in page.

@@ -145,31 +143,17 @@ In the browser window some HTML APIs like `requestFullScreen` can only be
 invoked by a gesture from the user. Setting `userGesture` to `true` will remove
 this limitation.

-### `webFrame.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture, callback])`
+### `webFrame.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture])`

-* `worldId` Integer - The ID of the world to run the javascript
-            in, `0` is the default main world (where content runs), `999` is the
-            world used by Electron's `contextIsolation` feature. Accepts values
-            in the range 1..536870911.
+* `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electrons `contextIsolation` feature.  You can provide any integer here.
 * `scripts` [WebSource[]](structures/web-source.md)
 * `userGesture` Boolean (optional) - Default is `false`.
-* `callback` Function (optional) - Called after script has been executed. Unless
-  the frame is suspended (e.g. showing a modal alert), execution will be
-  synchronous and the callback will be invoked before the method returns.  For
-  compatibility with an older version of this method, the error parameter is
-  second.
-  * `result` Any
-  * `error` Error

-Returns `Promise<any>` - A promise that resolves with the result of the executed
-code or is rejected if execution could not start.
+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.

-Note that when the execution of script fails, the returned promise will not
-reject and the `result` would be `undefined`. This is because Chromium does not
-dispatch errors of isolated worlds to foreign worlds.
-
 ### `webFrame.setIsolatedWorldInfo(worldId, info)`
 * `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electrons `contextIsolation` feature. Chrome extensions reserve the range of IDs in `[1 << 20, 1 << 29)`. You can provide any integer here.
 * `info` Object
--- a/docs/api/web-request.md
+++ b/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.
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -545,32 +545,9 @@ Stops any `findInPage` request for the `webview` with the provided `action`.

 * `options` Object (optional)
  * `silent` Boolean (optional) - Don't ask user for print settings. Default is `false`.
-  * `printBackground` Boolean (optional) - Prints the background color and image of
+  * `printBackground` Boolean (optional) - Also 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'.
-  * `color` Boolean (optional) - Set whether the printed web page will be in color or grayscale. Default is `true`.
-  * `margins` Object (optional)
-    * `marginType` String (optional) - Can be `default`, `none`, `printableArea`, or `custom`. If `custom` is chosen, you will also need to specify `top`, `bottom`, `left`, and `right`.
-    * `top` Number (optional) - The top margin of the printed web page, in pixels.
-    * `bottom` Number (optional) - The bottom margin of the printed web page, in pixels.
-    * `left` Number (optional) - The left margin of the printed web page, in pixels.
-    * `right` Number (optional) - The right margin of the printed web page, in pixels.
-  * `landscape` Boolean (optional) - Whether the web page should be printed in landscape mode. Default is `false`.
-  * `scaleFactor` Number (optional) - The scale factor of the web page.
-  * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
-  * `collate` Boolean (optional) - Whether the web page should be collated.
-  * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the start page.
-    * `to` Number - the end page.
-  * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
-  * `dpi` Record<string, number> (optional)
-    * `horizontal` Number (optional) - The horizontal dpi.
-    * `vertical` Number (optional) - The vertical dpi.
-  * `header` String (optional) - String to be printed as page header.
-  * `footer` String (optional) - String to be printed as page footer.
-  * `pageSize` String | Size (optional) - Specify page size of the printed document. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
+  * `deviceName` String (optional) - Set the printer device name to use. Default is `''`.

 Returns `Promise<void>`

@@ -579,21 +556,14 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
 ### `<webview>.printToPDF(options)`

 * `options` Object
-  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
-    * `title` String - The title for the PDF header.
-    * `url` String - the url for the PDF footer.
-  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.
  * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
    default margin, 1 for no margin, and 2 for minimum margin.
-    and `width` in microns.
-  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the first page to print.
-    * `to` Number - the last page to print (inclusive).
  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
+    `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
+    and `width` in microns.
  * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
  * `printSelectionOnly` Boolean (optional) - Whether to print selection only.
+  * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.

 Returns `Promise<Uint8Array>` - Resolves with the generated PDF data.

@@ -665,6 +635,15 @@ Returns `Promise<void>`

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

+### `<webview>.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Returns `Promise<void>`
+
+Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
+
 ### `<webview>.showDefinitionForSelection()` _macOS_

 Shows pop-up dictionary that searches the selected word on the page.
--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -186,12 +186,12 @@ $ gn gen out/Testing-x86 --args='... target_cpu = "x86"'

 Not all combinations of source and target CPU/OS are supported by Chromium.

-| Host        | Target        | Status               |
-|-------------|---------------|----------------------|
-| Windows x64 | Windows arm64 | Experimental         |
-| Windows x64 | Windows x86   | Automatically tested |
-| Linux x64   | Linux x86     | Automatically tested |
-
+<table>
+<tr><th>Host</th><th>Target</th><th>Status</th></tr>
+<tr><td>Windows x64</td><td>Windows arm64</td><td>Experimental</td>
+<tr><td>Windows x64</td><td>Windows x86</td><td>Automatically tested</td></tr>
+<tr><td>Linux x64</td><td>Linux x86</td><td>Automatically tested</td></tr>
+</table>

 If you test other combinations and find them to work, please update this document :)

@@ -265,7 +265,8 @@ New-ItemProperty -Path "HKLM:\System\CurrentControlSet\Services\Lanmanworkstatio

 ### Stale locks in the git cache
 If `gclient sync` is interrupted while using the git cache, it will leave
-the cache locked. To remove the lock, pass the `--ignore_locks` argument to `gclient sync`.
+the cache locked. To remove the lock, pass the `--break_repo_locks` argument to
+`gclient sync`.

 ### I'm being asked for a username/password for chromium-internal.googlesource.com
 If you see a prompt for `Username for 'https://chrome-internal.googlesource.com':` when running `gclient sync` on Windows, it's probably because the `DEPOT_TOOLS_WIN_TOOLCHAIN` environment variable is not set to 0. Open `Control Panel` → `System and Security` → `System` → `Advanced system settings` and add a system variable
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -25,7 +25,7 @@ Follow the guidelines below for building Electron on Linux.
  Doing so permits installing Node on your own home directory as a standard user.
  Or try repositories such as [NodeSource](https://nodesource.com/blog/nodejs-v012-iojs-and-the-nodesource-linux-repositories).
 * [clang](https://clang.llvm.org/get_started.html) 3.4 or later.
-* Development headers of GTK 3 and libnotify.
+* Development headers of GTK+ and libnotify.

 On Ubuntu, install the following libraries:

--- a/docs/development/build-instructions-macos.md
+++ b/docs/development/build-instructions-macos.md
@@ -42,7 +42,7 @@ $ pip install pyobjc
 If you're developing Electron and don't plan to redistribute your
 custom Electron build, you may skip this section.

-Official Electron builds are built with [Xcode 11.1](https://download.developer.apple.com/Developer_Tools/Xcode_11.1/Xcode_11.1.xip), and the macOS 10.15 SDK. Building with a newer SDK works too, but the releases currently use the 10.15 SDK.
+Official Electron builds are built with [Xcode 9.4.1](http://adcdownload.apple.com/Developer_Tools/Xcode_9.4.1/Xcode_9.4.1.xip), and the MacOS 10.13 SDK.  Building with a newer SDK works too, but the releases currently use the 10.13 SDK.

 ## Building Electron

--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -11,8 +11,9 @@ Follow the guidelines below for building Electron on Windows.
  components are required.
  * If your Visual Studio is installed in a directory other than the default, you'll need to
  set a few environment variables to point the toolchains to your installation path.
-    * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`, replacing `2019` and `Community` with your installed versions and replacing `DRIVE:` with the drive that Visual Studio is on. Often, this will be `C:`.
-    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`, replacing `DRIVE:` with the drive that Windows Kits is on. Often, this will be `C:`.
+    * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`
+       (replace `2019` and `Community` with your installed versions)
+    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`
 * [Python 2.7.10 or higher](http://www.python.org/download/releases/2.7/)
  * Contrary to the `depot_tools` setup instructions linked below, you will need
  to use your locally installed Python with at least version 2.7.10 (with
--- a/docs/development/build-system-overview.md
+++ b/docs/development/build-system-overview.md
@@ -57,7 +57,7 @@ you're currently working on using Mocha's
 `.only` to any `describe` or `it` function call:

 ```js
-describe.only('some feature', () => {
+describe.only('some feature', function () {
  // ... only tests in this block will be run
 })
 ```
--- a/docs/development/debugging-instructions-macos.md
+++ b/docs/development/debugging-instructions-macos.md
@@ -20,14 +20,9 @@ you prefer a graphical interface.
  tail calls, and other compiler optimizations.

 * **Xcode**: In addition to Xcode, also install the Xcode command line tools.
-  They include LLDB, the default debugger in Xcode on macOS. It supports
+  They include LLDB, the default debugger in Xcode on Mac OS X. It supports
  debugging C, Objective-C and C++ on the desktop and iOS devices and simulator.

-* **.lldbinit**: Create or edit `~/.lldbinit` to allow Chromium code to be properly source-mapped.
-   ```text
-   command script import ~/electron/src/tools/lldb/lldbinit.py
-   ```
-
 ## Attaching to and Debugging Electron

 To start a debugging session, open up Terminal and start `lldb`, passing a non-release
@@ -110,8 +105,6 @@ Process 25244 stopped
   122 	  return badge_count_;
 ```

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

 1. By opening the issue for discussion: If you believe that you have found
   a new bug in Electron, you should report it by creating a new issue in
-   the [`electron/electron` issue tracker](https://github.com/electron/electron/issues).
+   the `electron/electron` issue tracker.
 2. By helping to triage the issue: You can do this either by providing
   assistive details (a reproducible test case that demonstrates a bug) or by
   providing suggestions to address the issue.
@@ -30,9 +30,7 @@ contributing, and more. Please use the issue tracker for bugs only!

 ## Submitting a Bug Report

-To submit a bug report:
-
-When opening a new issue in the [`electron/electron` issue tracker](https://github.com/electron/electron/issues/new/choose), users
+When opening a new issue in the `electron/electron` issue tracker, users
 will be presented with a template that should be filled in.

 ```markdown
--- a/docs/development/pull-requests.md
+++ b/docs/development/pull-requests.md
@@ -35,7 +35,7 @@ $ git fetch upstream

 Build steps and dependencies differ slightly depending on your operating system.
 See these detailed guides on building Electron locally:
-* [Building on macOS](https://electronjs.org/docs/development/build-instructions-macos)
+* [Building on MacOS](https://electronjs.org/docs/development/build-instructions-macos)
 * [Building on Linux](https://electronjs.org/docs/development/build-instructions-linux)
 * [Building on Windows](https://electronjs.org/docs/development/build-instructions-windows)

@@ -221,12 +221,11 @@ seem unfamiliar, refer to this

 #### Approval and Request Changes Workflow

-All pull requests require approval from a
-[Code Owner](https://github.com/electron/electron/blob/master/.github/CODEOWNERS)
-of the area you modified in order to land. Whenever a maintainer reviews a pull
-request they may request changes. These may be small, such as fixing a typo, or
-may involve substantive changes. Such requests are intended to be helpful, but
-at times may come across as abrupt or unhelpful, especially if they do not include
+All pull requests require approval from a [Code Owner](https://github.com/orgs/electron/teams/code-owners) of the area you
+modified in order to land. Whenever a maintainer reviews a pull request they
+may request changes. These may be small, such as fixing a typo, or may involve
+substantive changes. Such requests are intended to be helpful, but at times
+may come across as abrupt or unhelpful, especially if they do not include
 concrete suggestions on *how* to change them.

 Try not to be discouraged. If you feel that a review is unfair, say so or seek
@@ -255,6 +254,7 @@ platforms or for so-called "flaky" tests to fail ("be red"). Each CI
 failure must be manually inspected to determine the cause.

 CI starts automatically when you open a pull request, but only
-core maintainers can restart a CI run. If you believe CI is giving a
-false negative, ask a maintainer to restart the tests.
+[Releasers](https://github.com/orgs/electron/teams/releasers/members)
+can restart a CI run. If you believe CI is giving a false negative,
+ask a Releaser to restart the tests.

--- a/docs/development/setting-up-symbol-server.md
+++ b/docs/development/setting-up-symbol-server.md
@@ -43,8 +43,8 @@ SRV*c:\code\symbols\*https://msdl.microsoft.com/download/symbols;SRV*c:\code\sym

 ## Using the symbol server in Visual Studio

-![Tools -> Options](https://mdn.mozillademos.org/files/733/symbol-server-vc8express-menu.jpg)
-![Symbols Settings](https://mdn.mozillademos.org/files/2497/2005_options.gif)
+<img src='https://mdn.mozillademos.org/files/733/symbol-server-vc8express-menu.jpg'>
+<img src='https://mdn.mozillademos.org/files/2497/2005_options.gif'>

 ## Troubleshooting: Symbols will not load

--- a/docs/development/source-code-directory-structure.md
+++ b/docs/development/source-code-directory-structure.md
@@ -11,48 +11,7 @@ to understand the source code better.

 ```diff
 Electron
-├── build/ - Build configuration files needed to build with GN.
-├── buildflags/ - Determines the set of features that can be conditionally built.
-├── chromium_src/ - Source code copied from Chromium that isn't part of the content layer.
-├── default_app/ - A default app run when Electron is started without
-|                  providing a consumer app.
-├── docs/ - Electron's documentation.
-|   ├── api/ - Documentation for Electron's externally-facing modules and APIs.
-|   ├── development/ - Documentation to aid in developing for and with Electron.
-|   ├── fiddles/ - A set of code snippets one can run in Electron Fiddle.
-|   ├── images/ - Images used in documentation.
-|   └── tutorial/ - Tutorial documents for various aspects of Electron.
-├── lib/ - JavaScript/TypeScript source code.
-|   ├── browser/ - Main process initialization code.
-|   |   ├── api/ - API implementation for main process modules.
-|   |   └── remote/ - Code related to the remote module as it is
-|   |                 used in the main process.
-|   ├── common/ - Relating to logic needed by both main and renderer processes.
-|   |   └── api/ - API implementation for modules that can be used in
-|   |              both the main and renderer processes
-|   ├── isolated_renderer/ - Handles creation of isolated renderer processes when
-|   |                        contextIsolation is enabled.
-|   ├── renderer/ - Renderer process initialization code.
-|   |   ├── api/ - API implementation for renderer process modules.
-|   |   ├── extension/ - Code related to use of Chrome Extensions
-|   |   |                in Electron's renderer process.
-|   |   ├── remote/ - Logic that handes use of the remote module in
-|   |   |             the main process.
-|   |   └── web-view/ - Logic that handles the use of webviews in the
-|   |                   renderer process.
-|   ├── sandboxed_renderer/ - Logic that handles creation of sandboxed renderer
-|   |   |                     processes.
-|   |   └── api/ - API implementation for sandboxed renderer processes.
-|   └── worker/ - Logic that handles proper functionality of Node.js
-|                 environments in Web Workers.
-├── patches/ - Patches applied on top of Electron's core dependencies
-|   |          in order to handle differences between our use cases and
-|   |          default functionality.
-|   ├── boringssl/ - Patches applied to Google's fork of OpenSSL, BoringSSL.
-|   ├── chromium/ - Patches applied to Chromium.
-|   ├── node/ - Patches applied on top of Node.js.
-|   └── v8/ - Patches applied on top of Google's V8 engine.
-├── shell/ - C++ source code.
+├── atom/ - C++ source code.
 |   ├── app/ - System entry code.
 |   ├── browser/ - The frontend including the main window, UI, and all of the
 |   |   |          main process things. This talks to the renderer to manage web
@@ -72,36 +31,51 @@ Electron
 |       |         message loop into Chromium's message loop.
 |       └── api/ - The implementation of common APIs, and foundations of
 |                  Electron's built-in modules.
-├── spec/ - Components of Electron's test suite run in the renderer process.
-├── spec-main/ - Components of Electron's test suite run in the main process.
+├── chromium_src/ - Source code copied from Chromium. See below.
+├── default_app/ - The default page to show when Electron is started without
+|                  providing an app.
+├── docs/ - Documentations.
+├── lib/ - JavaScript source code.
+|   ├── browser/ - Javascript main process initialization code.
+|   |   └── api/ - Javascript API implementation.
+|   ├── common/ - JavaScript used by both the main and renderer processes
+|   |   └── api/ - Javascript API implementation.
+|   └── renderer/ - Javascript renderer process initialization code.
+|       └── api/ - Javascript API implementation.
+├── native_mate/ - A fork of Chromium's gin library that makes it easier to marshal
+|                  types between C++ and JavaScript.
+├── spec/ - Automatic tests.
 └── BUILD.gn - Building rules of Electron.
 ```

+## `/chromium_src`
+
+The files in `/chromium_src` tend to be pieces of Chromium that aren't part of
+the content layer. For example to implement Pepper API, we need some wiring
+similar to what official Chrome does. We could have built the relevant
+sources as a part of [libcc](../glossary.md#libchromiumcontent) but most
+often we don't require all the features (some tend to be proprietary,
+analytics stuff) so we took parts of the code. These could have easily
+been patches in libcc, but at the time when these were written the goal of
+libcc was to maintain very minimal patches and chromium_src changes tend to be
+big ones. Also, note that these patches can never be upstreamed unlike other
+libcc patches we maintain now.
+
 ## Structure of Other Directories

-* **.circleci** - Config file for CI with CircleCI.
-* **.github** - GitHub-specific config files including issues templates and CODEOWNERS.
+* **script** - Scripts used for development purpose like building, packaging,
+  testing, etc.
+* **tools** - Helper scripts used by GN files, unlike `script`, scripts put
+  here should never be invoked by users directly.
+* **vendor** - Source code of third party dependencies, we didn't use
+  `third_party` as name because it would confuse it with the same directory in
+  Chromium's source code tree.
+* **node_modules** - Third party node modules used for building.
+* **out** - Temporary output directory of `ninja`.
 * **dist** - Temporary directory created by `script/create-dist.py` script
  when creating a distribution.
 * **external_binaries** - Downloaded binaries of third-party frameworks which
  do not support building with `gn`.
-* **node_modules** - Third party node modules used for building.
-* **npm** - Logic for installation of Electron via npm.
-* **out** - Temporary output directory of `ninja`.
-* **script** - Scripts used for development purpose like building, packaging,
-  testing, etc.
-```diff
-script/ - The set of all scripts Electron runs for a variety of purposes.
-├── codesign/ - Fakes codesigning for Electron apps; used for testing.
-├── lib/ - Miscellaneous python utility scripts.
-└── release/ - Scripts run during Electron's release process.
-    ├── notes/ - Generates release notes for new Electron versions.
-    └── uploaders/ - Uploads various release-related files during release.
-```
-* **tools** - Helper scripts used by GN files.
-  * Scripts put here should never be invoked by users directly, unlike those in `script`.
-* **typings** - TypeScript typings for Electron's internal code.
-* **vendor** - Source code for some third party dependencies, including `boto` and `requests`.

 ## Keeping Git Submodules Up to Date

--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -11,7 +11,6 @@ as well as unit and integration tests. To learn more about Electron's
 coding style, please see the [coding-style](coding-style.md) document.

 ## Linting
-
 To ensure that your JavaScript is in compliance with the Electron coding
 style, run `npm run lint-js`, which will run `standard` against both
 Electron itself as well as the unit tests. If you are using an editor
@@ -45,29 +44,11 @@ would run `npm run test -- -g ipc`.
 [standard-addons]: https://standardjs.com/#are-there-text-editor-plugins

 ### Testing on Windows 10 devices
-
-#### Extra steps to run the unit test:
-
-1. Visual Studio 2019 must be installed.
-2. Node headers have to be compiled for your configuration.
-   ```powershell
-   ninja -C out\Testing third_party\electron_node:headers
-   ```
-3. The electron.lib has to be copied as node.lib.
-   ```powershell
-   cd out\Testing
-   mkdir gen\node_headers\Release
-   copy electron.lib gen\node_headers\Release\node.lib
-   ```
-
-#### Missing fonts
-
 [Some Windows 10 devices](https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list) do not ship with the Meiryo font installed, which may cause a font fallback test to fail. To install Meiryo:
 1. Push the Windows key and search for _Manage optional features_.
-2. Click _Add a feature_.
-3. Select _Japanese Supplemental Fonts_ and click _Install_.
+1. Click _Add a feature_.
+1. Select _Japanese Supplemental Fonts_ and click _Install_.

-#### Pixel measurements

 Some tests which rely on precise pixel measurements may not work correctly on
 devices with Hi-DPI screen settings due to floating point precision errors.
@@ -75,4 +56,4 @@ To run these tests correctly, make sure the device is set to 100% scaling.

 To configure display scaling:
 1. Push the Windows key and search for _Display settings_.
-2. Under _Scale and layout_, make sure that the device is set to 100%.
+1. Under _Scale and layout_, make sure that the device is set to 100%.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Samuel Attard	f05f1ea820	build: the win32 tests should build ia32 native modules	2019-11-29 23:48:24 -08:00
Samuel Attard	7b26847157	build: windows zip manifest is ia32 not x86	2019-11-29 18:23:46 -08:00
Samuel Attard	466967c686	build: do not run electron hooks on the checkout-and-save-cache step group	2019-11-29 12:10:09 -08:00
Samuel Attard	2be256c5fd	build: ensure we use the bash find on windows	2019-11-29 12:04:20 -08:00
Samuel Attard	cdbf50973e	build: ensure the Release directory exists before copying the lib file	2019-11-29 11:21:00 -08:00
Samuel Attard	2b848eb781	build: copy the node.lib file for the tests	2019-11-29 01:54:57 -08:00
Samuel Attard	69585bc75e	build: wipe large files on windows two	2019-11-29 01:38:49 -08:00
Samuel Attard	f6ace9c345	build: do not try and start xfvb on windows	2019-11-29 01:21:58 -08:00
Samuel Attard	149768e3dd	build: windows 32 bit on circle	2019-11-29 00:34:02 -08:00
Samuel Attard	0f0103d8ad	build: run windows tests	2019-11-29 00:30:57 -08:00
Samuel Attard	99f837b841	build: re-enable sccache	2019-11-28 18:23:08 -08:00
Samuel Attard	5a61a3e2ee	build: support checking windows manifest on circle	2019-11-28 16:10:48 -08:00
Samuel Attard	0cf46dfb46	build: disable sccache	2019-11-28 14:46:52 -08:00
Samuel Attard	2ed95fa5d8	build: use vpython for the ninja summary	2019-11-28 14:29:38 -08:00
Samuel Attard	812b9ccc44	build: enable sccache on windows circle	2019-11-28 02:34:48 -08:00
Samuel Attard	96026e1b74	Force the .exe suffix for ninja calls	2019-11-28 01:11:38 -08:00
Samuel Attard	52998c6b61	build: put depot_tools first on windows	2019-11-28 00:51:22 -08:00
Samuel Attard	ddf5d7f5b7	build: experiment with circleci windows support	2019-11-27 18:37:18 -08:00