Bump v12.0.0-nightly.20200923

* docs: add more info about downloadItem.setSavePath api

add more info about downloadItem.setSavePath api

* Update docs/api/download-item.md

^_^

Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>

Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>

.circleci/config.yml

@@ -69,7 +69,7 @@ parameters:
 # Build machines configs.
 docker-image: &docker-image
   docker:
-    - image: electron.azurecr.io/build:4cec2c5ab66765caa724e37bae2bffb9b29722a5
+    - image: electronjs/build:d09fd95029bd8c1c73069888231b29688ef385ed
 
 machine-linux-medium: &machine-linux-medium
   <<: *docker-image
@@ -107,7 +107,6 @@ env-release-build: &env-release-build
   STRIP_BINARIES: true
   GENERATE_SYMBOLS: true
   CHECK_DIST_MANIFEST: '1'
-  IS_RELEASE: true
 
 env-headless-testing: &env-headless-testing
   DISPLAY: ':99.0'
@@ -257,34 +256,23 @@ step-gclient-sync: &step-gclient-sync
           "$CIRCLE_REPOSITORY_URL"
 
         ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
-        if [ "$IS_RELEASE" != "true" ]; then
-          # Re-export all the patches to check if there were changes.
-          python src/electron/script/export_all_patches.py src/electron/patches/config.json
-          cd src/electron
-          git update-index --refresh || true
-          if ! git diff-index --quiet HEAD --; then
-            # There are changes to the patches. Make a git commit with the updated patches
-            git add patches
-            GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="electron@github.com" git commit -m "update patches" --author="Electron Bot <electron@github.com>"
-            # Export it
-            mkdir -p ../../patches
-            git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
-            if (node ./script/push-patch.js 2> /dev/null > /dev/null); then
-              echo
-              echo "======================================================================"
-              echo "Changes to the patches when applying, we have auto-pushed the diff to the current branch"
-              echo "A new CI job will kick off shortly"
-              echo "======================================================================"
-              exit 1
-            else
-              echo
-              echo "======================================================================"
-              echo "There were changes to the patches when applying."
-              echo "Check the CI artifacts for a patch you can apply to fix it."
-              echo "======================================================================"
-              exit 1
-            fi
-          fi
+        # Re-export all the patches to check if there were changes.
+        python src/electron/script/export_all_patches.py src/electron/patches/config.json
+        cd src/electron
+        git update-index --refresh || true
+        if ! git diff-index --quiet HEAD --; then
+          # There are changes to the patches. Make a git commit with the updated patches
+          git add patches
+          GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="anonymous@electronjs.org" git commit -m "update patches" --author="Electron Bot <anonymous@electronjs.org>"
+          # Export it
+          mkdir -p ../../patches
+          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
+          echo
+          echo "======================================================================"
+          echo "There were changes to the patches when applying."
+          echo "Check the CI artifacts for a patch you can apply to fix it."
+          echo "======================================================================"
+          exit 1
         fi
       fi
 
@@ -584,9 +572,6 @@ step-electron-dist-build: &step-electron-dist-build
             if [ x"$MAS_BUILD" == x"true" ]; then
               target_os=mac_mas
             fi
-            if [ "$TARGET_ARCH" == "arm64" ]; then
-              target_cpu=arm64
-            fi
           elif [ "`uname`" == "Linux" ]; then
             target_os=linux
             if [ x"$TARGET_ARCH" == x ]; then
@@ -674,10 +659,10 @@ step-electron-publish: &step-electron-publish
       cd src/electron
       if [ "$UPLOAD_TO_S3" == "1" ]; then
         echo 'Uploading Electron release distribution to S3'
-        script/release/uploaders/upload.py --verbose --upload_to_s3
+        script/release/uploaders/upload.py --upload_to_s3
       else
         echo 'Uploading Electron release distribution to Github releases'
-        script/release/uploaders/upload.py --verbose
+        script/release/uploaders/upload.py
       fi
 
 step-persist-data-for-tests: &step-persist-data-for-tests
@@ -779,20 +764,14 @@ step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
 
 step-show-sccache-stats: &step-show-sccache-stats
   run:
-    shell: /bin/bash
     name: Check sccache/goma stats after build
     command: |
       if [ "$SCCACHE_PATH" != "" ]; then
         $SCCACHE_PATH -s
       fi
       if [ "$USE_GOMA" == "true" ]; then
-        set +e
-        set +o pipefail
         $LOCAL_GOMA_DIR/goma_ctl.py stat
-        $LOCAL_GOMA_DIR/diagnose_goma_log.py
-        true
       fi
-    when: always
 
 step-mksnapshot-build: &step-mksnapshot-build
   run:
@@ -1820,7 +1799,7 @@ jobs:
 
   # Layer 2: Builds.
   linux-x64-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1900,7 +1879,7 @@ jobs:
           checkout: false
 
   linux-ia32-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
     environment:
       <<: *env-global
       <<: *env-ia32

.github/CODEOWNERS

@@ -10,3 +10,12 @@ DEPS                                    @electron/wg-upgrades
 # Releases WG
 /npm/                                   @electron/wg-releases
 /script/release                         @electron/wg-releases
+
+# Security WG
+/lib/browser/rpc-server.ts              @electron/wg-security
+
+# Remote Change Disliker
+/lib/browser/remote/                    @nornagon
+/lib/renderer/remote/                   @nornagon
+/lib/renderer/api/remote.ts             @nornagon
+/docs/api/remote.md                     @nornagon

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,6 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] relevant documentation is changed or added
 - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
 - [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).
-- [ ] This is **NOT A BREAKING CHANGE**. Breaking changes may not be merged to master until 11-x-y is branched.
 
 #### Release Notes
 

BUILD.gn

@@ -325,6 +325,7 @@ source_set("electron_lib") {
     "//base/allocator:buildflags",
     "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
+    "//chrome/services/printing/public/mojom",
     "//components/certificate_transparency",
     "//components/language/core/browser",
     "//components/net_log",
@@ -371,7 +372,6 @@ source_set("electron_lib") {
     "//third_party/libyuv",
     "//third_party/webrtc_overrides:webrtc_component",
     "//third_party/widevine/cdm:headers",
-    "//third_party/zlib/google:zip",
     "//ui/base/idle",
     "//ui/events:dom_keycode_converter",
     "//ui/gl",
@@ -405,26 +405,44 @@ source_set("electron_lib") {
     defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
   }
 
+  extra_source_filters = []
+  if (!is_linux) {
+    extra_source_filters += [
+      "*\bx/*",
+      "*_x11.h",
+      "*_x11.cc",
+      "*_gtk.h",
+      "*_gtk.cc",
+      "*\blibrary_loaders/*",
+    ]
+  }
+  if (!is_win) {
+    extra_source_filters += [
+      "*\bwin_*.h",
+      "*\bwin_*.cc",
+    ]
+  }
+  if (!is_posix) {
+    extra_source_filters += [
+      "*_posix.cc",
+      "*_posix.h",
+    ]
+  }
+  if (is_mac) {
+    extra_source_filters += [
+      "*_views.cc",
+      "*_views.h",
+      "*\bviews/*",
+    ]
+  }
   if (!is_mas_build) {
     deps += [ "//components/crash/core/app" ]
   }
 
+  set_sources_assignment_filter(
+      sources_assignment_filter + extra_source_filters)
   sources = filenames.lib_sources
-  if (is_win) {
-    sources += filenames.lib_sources_win
-  }
-  if (is_mac) {
-    sources += filenames.lib_sources_mac
-  }
-  if (is_posix) {
-    sources += filenames.lib_sources_posix
-  }
-  if (is_linux) {
-    sources += filenames.lib_sources_linux
-  }
-  if (!is_mac) {
-    sources += filenames.lib_sources_views
-  }
+  set_sources_assignment_filter(sources_assignment_filter)
 
   if (is_component_build) {
     defines += [ "NODE_SHARED_MODE" ]
@@ -571,6 +589,7 @@ source_set("electron_lib") {
     sources += [
       "shell/browser/osr/osr_host_display_client.cc",
       "shell/browser/osr/osr_host_display_client.h",
+      "shell/browser/osr/osr_host_display_client_mac.mm",
       "shell/browser/osr/osr_render_widget_host_view.cc",
       "shell/browser/osr/osr_render_widget_host_view.h",
       "shell/browser/osr/osr_video_consumer.cc",
@@ -579,13 +598,8 @@ source_set("electron_lib") {
       "shell/browser/osr/osr_view_proxy.h",
       "shell/browser/osr/osr_web_contents_view.cc",
       "shell/browser/osr/osr_web_contents_view.h",
+      "shell/browser/osr/osr_web_contents_view_mac.mm",
     ]
-    if (is_mac) {
-      sources += [
-        "shell/browser/osr/osr_host_display_client_mac.mm",
-        "shell/browser/osr/osr_web_contents_view_mac.mm",
-      ]
-    }
     deps += [
       "//components/viz/service",
       "//services/viz/public/mojom",
@@ -620,10 +634,7 @@ source_set("electron_lib") {
       "shell/renderer/printing/print_render_frame_helper_delegate.cc",
       "shell/renderer/printing/print_render_frame_helper_delegate.h",
     ]
-    deps += [
-      "//chrome/services/printing/public/mojom",
-      "//components/printing/common:mojo_interfaces",
-    ]
+    deps += [ "//components/printing/common:mojo_interfaces" ]
   }
 
   if (enable_electron_extensions) {
@@ -633,6 +644,7 @@ source_set("electron_lib") {
       "shell/common/extensions/api",
       "shell/common/extensions/api:extensions_features",
       "//chrome/browser/resources:component_extension_resources",
+      "//components/update_client:update_client",
       "//components/zoom",
       "//extensions/browser",
       "//extensions/browser:core_api_provider",
@@ -661,14 +673,6 @@ source_set("electron_lib") {
       "shell/browser/electron_pdf_web_contents_helper_client.h",
     ]
   }
-
-  if (is_win && enable_win_dark_mode_window_ui) {
-    sources += [
-      "shell/browser/win/dark_mode.cc",
-      "shell/browser/win/dark_mode.h",
-    ]
-    libs += [ "uxtheme.lib" ]
-  }
 }
 
 electron_paks("packed_resources") {
@@ -694,10 +698,10 @@ if (is_mac) {
   action("fake_v8_context_snapshot_generator") {
     script = "build/fake_v8_context_snapshot_generator.py"
     args = [
-      rebase_path("$root_out_dir/$v8_context_snapshot_filename"),
-      rebase_path("$root_out_dir/fake/$v8_context_snapshot_filename"),
+      rebase_path("$root_out_dir/v8_context_snapshot.bin"),
+      rebase_path("$root_out_dir/fake/v8_context_snapshot.bin"),
     ]
-    outputs = [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
+    outputs = [ "$root_out_dir/fake/v8_context_snapshot.bin" ]
   }
 
   bundle_data("electron_framework_resources") {
@@ -711,10 +715,10 @@ if (is_mac) {
       public_deps += [ "//v8" ]
       if (use_v8_context_snapshot) {
         if (use_prebuilt_v8_context_snapshot) {
-          sources += [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
+          sources += [ "$root_out_dir/fake/v8_context_snapshot.bin" ]
           public_deps += [ ":fake_v8_context_snapshot_generator" ]
         } else {
-          sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
+          sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
           public_deps += [ "//tools/v8_context_snapshot" ]
         }
       } else {

DEPS

@@ -14,13 +14,13 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '87.0.4280.67',
+    'b943d006a33ec5bc1743792d64724693eb357083',
   'node_version':
-    'v12.18.3',
+    'v14.11.0',
   'nan_version':
     '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
   'squirrel.mac_version':
-    'a3a5b3f03b824441c014893b18f99a103b2603e9',
+    '44468f858ce0d25c27bd5e674abfa104e0119738',
 
   'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
   'pyyaml_version': '3.12',

ELECTRON_VERSION

@@ -1 +1 @@
-11.0.2
+12.0.0-nightly.20200923

appveyor.yml

@@ -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
         }
       }
@@ -101,11 +99,6 @@ build_script:
           } else {
             # update external binaries
             python src/electron/script/update-external-binaries.py
-            # update angle
-            cd src\third_party\angle
-            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
-            git fetch
-            cd ..\..\..
           }
         } else {    
           # file does not exist, gclient sync, then zip
@@ -121,16 +114,14 @@ build_script:
       if ($env:SAVE_GCLIENT_SRC -eq 'true') {
         # archive current source for future use 
         # only run on x64/woa to avoid contention saving
-        $(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
-        if ($LASTEXITCODE -ne 0) {
+        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
           Write-warning "Could not save source to shared drive; continuing anyway"
         }
-        # build time generation of file gen/angle/angle_commit.h depends on
-        # third_party/angle/.git
+        # build time generation of file gen/angle/commit.h depends on
+        # third_party/angle/.git/HEAD.
         # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
-        $(7z a $zipfile src\third_party\angle\.git)
-        if ($LASTEXITCODE -ne 0) {
-          Write-warning "Failed to add third_party\angle\.git; continuing anyway"
+        if ($(7z a $zipfile src\third_party\angle\.git\HEAD;$LASTEXITCODE -ne 0)) {
+          Write-warning "Failed to add third_party\angle\.git\HEAD; continuing anyway"
         }
       }
   - ps: >-
@@ -214,8 +205,7 @@ test_script:
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging)
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - echo "About to verify mksnapshot"
@@ -229,10 +219,10 @@ deploy_script:
       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

azure-pipelines-woa.yml

@@ -63,8 +63,7 @@ steps:
     set npm_config_nodedir=%cd%\out\Default\gen\node_headers
     set npm_config_arch=arm64
     cd electron
-    # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion
+    node script/yarn test -- --enable-logging --verbose
   displayName: 'Run Electron tests'
   env:
     ELECTRON_OUT_DIR: Default

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 = 85
+node_module_version = 82
 
 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0

build/profile_toolchain.py

@@ -11,7 +11,6 @@ import find_depot_tools
 from vs_toolchain import \
     SetEnvironmentAndGetRuntimeDllDirs, \
     SetEnvironmentAndGetSDKDir, \
-    GetVisualStudioVersion, \
     NormalizePath
 
 sys.path.append("%s/win_toolchain" % find_depot_tools.add_depot_tools_to_path())

build/run-in-dir.py

@@ -1,6 +1,5 @@
 import sys
 import os
-import subprocess
 
 def main(argv):
   cwd = argv[1]

build/zip.py

@@ -13,30 +13,27 @@ EXTENSIONS_TO_SKIP = [
 ]
 
 PATHS_TO_SKIP = [
-  # Skip because it is an output of //ui/gl that we don't need.
-  'angledata',
-  # Skip because these are outputs that we don't need.
-  './libVkICD_mock_',
-  # Skip because these are outputs that we don't need.
-  './VkICD_mock_',
-  # Skip because its an output of create_bundle from //build/config/mac/rules.gni
+  'angledata', #Skipping because it is an output of //ui/gl that we don't need
+  './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',
-  # Refs https://chromium-review.googlesource.com/c/angle/angle/+/2425197.
-  # Remove this when Angle themselves remove the file: https://issuetracker.google.com/issues/168736059
-  'gen/angle/angle_commit.h',
+
   # //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',
-  # Skip because these are outputs that we don't need.
-  'resources/inspector',
+
+  'resources/inspector', #Skipping because these are outputs that we don't need
 ]
 
 def skip_path(dep, dist_zip, target_cpu):

buildflags/BUILD.gn

@@ -21,7 +21,6 @@ buildflag_header("buildflags") {
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
     "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
     "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
-    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }

buildflags/buildflags.gni

@@ -36,7 +36,4 @@ declare_args() {
 
   # Enable Spellchecker support
   enable_builtin_spellchecker = true
-
-  # Undocumented Windows dark mode API
-  enable_win_dark_mode_window_ui = false
 }

chromium_src/BUILD.gn

@@ -26,10 +26,18 @@ static_library("chrome") {
     "//chrome/browser/devtools/devtools_file_system_indexer.h",
     "//chrome/browser/extensions/global_shortcut_listener.cc",
     "//chrome/browser/extensions/global_shortcut_listener.h",
+    "//chrome/browser/extensions/global_shortcut_listener_mac.h",
+    "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
+    "//chrome/browser/extensions/global_shortcut_listener_win.cc",
+    "//chrome/browser/extensions/global_shortcut_listener_win.h",
     "//chrome/browser/icon_loader.cc",
     "//chrome/browser/icon_loader.h",
+    "//chrome/browser/icon_loader_mac.mm",
+    "//chrome/browser/icon_loader_win.cc",
     "//chrome/browser/icon_manager.cc",
     "//chrome/browser/icon_manager.h",
+    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
+    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
     "//chrome/browser/net/proxy_config_monitor.cc",
@@ -49,32 +57,14 @@ static_library("chrome") {
     "//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/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",
   ]
 
-  if (is_mac) {
-    sources += [
-      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
-      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
-      "//chrome/browser/icon_loader_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
-    ]
-  }
-
-  if (is_win) {
-    sources += [
-      "//chrome/browser/extensions/global_shortcut_listener_win.cc",
-      "//chrome/browser/extensions/global_shortcut_listener_win.h",
-      "//chrome/browser/icon_loader_win.cc",
-      "//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",
-    ]
-  }
-
   public_deps = [
     "//chrome/common",
     "//chrome/common:version_header",
@@ -276,17 +266,6 @@ static_library("chrome") {
       ]
     }
   }
-
-  if (!is_mas_build) {
-    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.h" ]
-    if (is_mac) {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_mac.cc" ]
-    } else if (is_win) {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_win.cc" ]
-    } else {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.cc" ]
-    }
-  }
 }
 
 source_set("plugins") {

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -826,9 +826,10 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
   to_send.append(current_dir.value());
 
   const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
-  for (const auto& arg : 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

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 x11::Window
   // with the system.
-  for (const auto& window : live_windows_) {
-    RegisterXWindow(window);
+  for (std::set<x11::Window>::const_iterator it = live_windows_.begin();
+       it != live_windows_.end(); ++it) {
+    RegisterXWindow(*it);
   }
 }

docs/README.md

@@ -56,7 +56,7 @@ an issue:
 * [Accessibility](tutorial/accessibility.md)
   * [Spectron](tutorial/accessibility.md#spectron)
   * [Devtron](tutorial/accessibility.md#devtron)
-  * [Enabling Accessibility](tutorial/accessibility.md#enabling-accessibility)
+  * [Manually Enabling Accessibility Features](tutorial/accessibility.md#manually-enabling-accessibility-features)
 * [Testing and Debugging](tutorial/application-debugging.md)
   * [Debugging the Main Process](tutorial/debugging-main-process.md)
   * [Debugging the Main Process with Visual Studio Code](tutorial/debugging-main-process-vscode.md)

docs/api/app.md

@@ -32,8 +32,7 @@ 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
@@ -403,7 +402,7 @@ Returns:
     * `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
+    * `launch-failure` - Process never successfully launched
     * `integrity-failure` - Windows code integrity checks failed
 
 Emitted when the renderer process unexpectedly disappears.  This is normally
@@ -429,7 +428,7 @@ Returns:
     * `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
+    * `launch-failure` - Process never successfully launched
     * `integrity-failure` - Windows code integrity checks failed
   * `exitCode` Number - The exit code for the process
       (e.g. status from waitpid if on posix, from GetExitCodeProcess on Windows).
@@ -502,7 +501,7 @@ Returns:
 Emitted when `desktopCapturer.getSources()` is called in the renderer process of `webContents`.
 Calling `event.preventDefault()` will make it return empty sources.
 
-### Event: 'remote-require'
+### Event: 'remote-require' _Deprecated_
 
 Returns:
 
@@ -514,7 +513,7 @@ Emitted when `remote.require()` is called in the renderer process of `webContent
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-### Event: 'remote-get-global'
+### Event: 'remote-get-global' _Deprecated_
 
 Returns:
 
@@ -526,7 +525,7 @@ Emitted when `remote.getGlobal()` is called in the renderer process of `webConte
 Calling `event.preventDefault()` will prevent the global from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-### Event: 'remote-get-builtin'
+### Event: 'remote-get-builtin' _Deprecated_
 
 Returns:
 
@@ -538,7 +537,7 @@ Emitted when `remote.getBuiltin()` is called in the renderer process of `webCont
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-### Event: 'remote-get-current-window'
+### Event: 'remote-get-current-window' _Deprecated_
 
 Returns:
 
@@ -549,7 +548,7 @@ Emitted when `remote.getCurrentWindow()` is called in the renderer process of `w
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-### Event: 'remote-get-current-web-contents'
+### Event: 'remote-get-current-web-contents' _Deprecated_
 
 Returns:
 
@@ -1341,7 +1340,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
@@ -1485,12 +1484,3 @@ which native modules you can use in the renderer process.  For more information
 on the direction Electron is going with renderer process restarts and usage of
 native modules in the renderer process please check out this
 [Tracking Issue](https://github.com/electron/electron/issues/18397).
-
-### `app.runningUnderRosettaTranslation` _macOS_ _Readonly_
-
-A `Boolean` which when `true` indicates that the app is currently running
-under the [Rosetta Translator Environment](https://en.wikipedia.org/wiki/Rosetta_(software)).
-
-You can use this property to prompt users to download the arm64 version of
-your application when they are running the x64 version under Rosetta
-incorrectly.

docs/api/browser-window.md

@@ -8,9 +8,6 @@ Process: [Main](../glossary.md#main-process)
 // In the main process.
 const { BrowserWindow } = require('electron')
 
-// Or use `remote` from the renderer process.
-// const { BrowserWindow } = require('electron').remote
-
 const win = new BrowserWindow({ width: 800, height: 600 })
 
 // Load a remote URL
@@ -541,12 +538,6 @@ Note that this is only emitted when the window is being resized manually. Resizi
 
 Emitted after the window has been resized.
 
-#### Event: 'resized' _macOS_ _Windows_
-
-Emitted once when the window has finished being resized.
-
-This is usually emitted when the window has been resized manually. On macOS, resizing the window with `setBounds`/`setSize` and setting the `animate` parameter to `true` will also emit this event once resizing has finished.
-
 #### Event: 'will-move' _macOS_ _Windows_
 
 Returns:
@@ -562,12 +553,12 @@ Note that this is only emitted when the window is being resized manually. Resizi
 
 Emitted when the window is being moved to a new position.
 
-#### Event: 'moved' _macOS_ _Windows_
+__Note__: On macOS this event is an alias of `moved`.
+
+#### Event: 'moved' _macOS_
 
 Emitted once when the window is moved to a new position.
 
-__Note__: On macOS this event is an alias of `move`.
-
 #### Event: 'enter-full-screen'
 
 Emitted when the window enters a full-screen state.
@@ -676,20 +667,6 @@ Emitted when the window has closed a sheet.
 
 Emitted when the native new tab button is clicked.
 
-#### Event: 'system-context-menu' _Windows_
-
-Returns:
-
-* `event` Event
-* `point` [Point](structures/point.md) - The screen coordinates the context menu was triggered at
-
-Emitted when the system context menu is triggered on the window, this is
-normally only triggered when the user right clicks on the non-client area
-of your window.  This is the window titlebar or any area you have declared
-as `-webkit-app-region: drag` in a frameless window.
-
-Calling `event.preventDefault()` will prevent the menu from being displayed.
-
 ### Static Methods
 
 The `BrowserWindow` class has the following static methods:
@@ -1369,6 +1346,17 @@ Enters or leaves kiosk mode.
 
 Returns `Boolean` - Whether the window is in kiosk mode.
 
+#### `win.isTabletMode()` _Windows_
+
+Returns `Boolean` - Whether the window is in Windows 10 tablet mode.
+
+Since Windows 10 users can [use their PC as tablet](https://support.microsoft.com/en-us/help/17210/windows-10-use-your-pc-like-a-tablet),
+under this mode apps can choose to optimize their UI for tablets, such as
+enlarging the titlebar and hiding titlebar buttons.
+
+This API returns whether the window is in tablet mode, and the `resize` event
+can be be used to listen to changes to tablet mode.
+
 #### `win.getMediaSourceId()`
 
 Returns `String` - Window id in the format of DesktopCapturerSource's id. For example "window:1234:0".

docs/api/command-line-switches.md

@@ -198,14 +198,6 @@ logging level for all code in the source files under a `foo/bar` directory.
 
 This switch only works when `--enable-logging` is also passed.
 
-### --force_high_performance_gpu
-
-Force using discrete GPU when there are multiple GPUs available.
-
-### --force_low_power_gpu
-
-Force using integrated GPU when there are multiple GPUs available.
-
 ## Node.js Flags
 
 Electron supports some of the [CLI flags][node-cli] supported by Node.js.

docs/api/crash-reporter.md

@@ -59,7 +59,7 @@ The `crashReporter` module has the following methods:
   * `rateLimit` Boolean (optional) _macOS_ _Windows_ - If true, limit the
     number of crashes uploaded to 1/hour. Default is `false`.
   * `compress` Boolean (optional) - If true, crash reports will be compressed
-    and uploaded with `Content-Encoding: gzip`. Default is `false`.
+    and uploaded with `Content-Encoding: gzip`. Default is `true`.
   * `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

docs/api/dialog.md

@@ -11,14 +11,6 @@ const { dialog } = require('electron')
 console.log(dialog.showOpenDialog({ properties: ['openFile', 'multiSelections'] }))
 ```
 
-The Dialog is opened from Electron's main thread. If you want to use the dialog
-object from a renderer process, remember to access it using the remote:
-
-```javascript
-const { dialog } = require('electron').remote
-console.log(dialog)
-```
-
 ## Methods
 
 The `dialog` module has the following methods:
@@ -314,7 +306,7 @@ Returns `Promise<Object>` - resolves with a promise containing the following pro
   * `checkboxChecked` Boolean - The checked state of the checkbox if
   `checkboxLabel` was set. Otherwise `false`.
 
-Shows a message box, it will block the process until the message box is closed.
+Shows a message box.
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
 

docs/api/download-item.md

@@ -79,6 +79,7 @@ The `downloadItem` object has the following methods:
 * `path` String - Set the save file path of the download item.
 
 The API is only available in session's `will-download` callback function.
+If `path` doesn't exist, Electron will try to make the directory recursively.
 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.
 

docs/api/extensions.md

@@ -74,6 +74,7 @@ The following methods of `chrome.runtime` are supported:
 
 - `chrome.runtime.getBackgroundPage`
 - `chrome.runtime.getManifest`
+- `chrome.runtime.getPlatformInfo`
 - `chrome.runtime.getURL`
 - `chrome.runtime.connect`
 - `chrome.runtime.sendMessage`

docs/api/frameless-window.md

@@ -112,13 +112,19 @@ optional parameter can be used to forward mouse move messages to the web page,
 allowing events such as `mouseleave` to be emitted:
 
 ```javascript
-const win = require('electron').remote.getCurrentWindow()
+const { ipcRenderer } = require('electron')
 const el = document.getElementById('clickThroughElement')
 el.addEventListener('mouseenter', () => {
-  win.setIgnoreMouseEvents(true, { forward: true })
+  ipcRenderer.send('set-ignore-mouse-events', true, { forward: true })
 })
 el.addEventListener('mouseleave', () => {
-  win.setIgnoreMouseEvents(false)
+  ipcRenderer.send('set-ignore-mouse-events', false)
+})
+
+// Main process
+const { ipcMain } = require('electron')
+ipcMain.on('set-ignore-mouse-events', (event, ...args) => {
+  BrowserWindow.fromWebContents(event.sender).setIgnoreMouseEvents(...args)
 })
 ```
 

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[]
 

docs/api/menu.md

@@ -141,13 +141,7 @@ can have a submenu.
 
 ## Examples
 
-The `Menu` class is only available in the main process, but you can also use it
-in the render process via the [`remote`](remote.md) module.
-
-### Main process
-
-An example of creating the application menu in the main process with the
-simple template API:
+An example of creating the application menu with the simple template API:
 
 ```javascript
 const { app, Menu } = require('electron')
@@ -257,26 +251,36 @@ Menu.setApplicationMenu(menu)
 
 ### Render process
 
-Below is an example of creating a menu dynamically in a web page
-(render process) by using the [`remote`](remote.md) module, and showing it when
-the user right clicks the page:
+To create menus initiated by the renderer process, send the required
+information to the main process using IPC and have the main process display the
+menu on behalf of the renderer.
 
-```html
-<!-- index.html -->
-<script>
-const { remote } = require('electron')
-const { Menu, MenuItem } = remote
-
-const menu = new Menu()
-menu.append(new MenuItem({ label: 'MenuItem1', click() { console.log('item 1 clicked') } }))
-menu.append(new MenuItem({ type: 'separator' }))
-menu.append(new MenuItem({ label: 'MenuItem2', type: 'checkbox', checked: true }))
+Below is an example of showing a menu when the user right clicks the page:
 
+```js
+// renderer
 window.addEventListener('contextmenu', (e) => {
   e.preventDefault()
-  menu.popup({ window: remote.getCurrentWindow() })
-}, false)
-</script>
+  ipcRenderer.send('show-context-menu')
+})
+
+ipcRenderer.on('context-menu-command', (e, command) => {
+  // ...
+})
+
+// main
+ipcMain.on('show-context-menu', (event) => {
+  const template = [
+    {
+      label: 'Menu Item 1',
+      click: () => { event.sender.send('context-menu-command', 'menu-item-1') }
+    },
+    { type: 'separator' },
+    { label: 'Menu Item 2', type: 'checkbox', checked: true }
+  ]
+  const menu = Menu.buildFromTemplate(template)
+  menu.popup(BrowserWindow.fromWebContents(event.sender))
+})
 ```
 
 ## Notes on macOS Application Menu

docs/api/power-monitor.md

@@ -39,6 +39,14 @@ Emitted when the system is about to lock the screen.
 
 Emitted as soon as the systems screen is unlocked.
 
+### Event: 'user-did-become-active' _macOS_
+
+Emitted when a login session is activated. See [documentation](https://developer.apple.com/documentation/appkit/nsworkspacesessiondidbecomeactivenotification?language=objc) for more information.
+
+### Event: 'user-did-resign-active' _macOS_
+
+Emitted when a login session is deactivated. See [documentation](https://developer.apple.com/documentation/appkit/nsworkspacesessiondidresignactivenotification?language=objc) for more information.
+
 ## Methods
 
 The `powerMonitor` module has the following methods:

docs/api/remote.md

@@ -4,6 +4,16 @@
 
 Process: [Renderer](../glossary.md#renderer-process)
 
+> ⚠️ WARNING ⚠️
+> The `remote` module is [deprecated](https://github.com/electron/electron/issues/21408).
+> Instead of `remote`, use [`ipcRenderer`](ipc-renderer.md) and
+> [`ipcMain`](ipc-main.md).
+>
+> Read more about why the `remote` module is deprecated [here](https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31).
+>
+> If you still want to use `remote` despite the performance and security
+> concerns, see [@electron/remote](https://github.com/electron/remote).
+
 The `remote` module provides a simple way to do inter-process communication
 (IPC) between the renderer process (web page) and the main process.
 
@@ -140,11 +150,32 @@ console.log(app)
 
 The `remote` module has the following methods:
 
-### `remote.require(module)`
+### `remote.getCurrentWindow()`
 
-* `module` String
+Returns [`BrowserWindow`](browser-window.md) - The window to which this web page
+belongs.
 
-Returns `any` - The object returned by `require(module)` in the main process.
+**Note:** Do not use `removeAllListeners` on [`BrowserWindow`](browser-window.md).
+Use of this can remove all [`blur`](https://developer.mozilla.org/en-US/docs/Web/Events/blur)
+listeners, disable click events on touch bar buttons, and other unintended
+consequences.
+
+### `remote.getCurrentWebContents()`
+
+Returns [`WebContents`](web-contents.md) - The web contents of this web page.
+
+### `remote.getGlobal(name)`
+
+* `name` String
+
+Returns `any` - The global variable of `name` (e.g. `global[name]`) in the main
+process.
+
+## Properties
+
+### `remote.require`
+
+A `NodeJS.Require` function equivalent to `require(module)` in the main process.
 Modules specified by their relative path will resolve relative to the entrypoint
 of the main process.
 
@@ -176,28 +207,6 @@ module.exports = 'bar'
 const foo = require('electron').remote.require('./foo') // bar
 ```
 
-### `remote.getCurrentWindow()`
-
-Returns [`BrowserWindow`](browser-window.md) - The window to which this web page
-belongs.
-
-**Note:** Do not use `removeAllListeners` on [`BrowserWindow`](browser-window.md).
-Use of this can remove all [`blur`](https://developer.mozilla.org/en-US/docs/Web/Events/blur)
-listeners, disable click events on touch bar buttons, and other unintended
-consequences.
-
-### `remote.getCurrentWebContents()`
-
-Returns [`WebContents`](web-contents.md) - The web contents of this web page.
-
-### `remote.getGlobal(name)`
-
-* `name` String
-
-Returns `any` - The global variable of `name` (e.g. `global[name]`) in the main
-process.
-
-## Properties
 
 ### `remote.process` _Readonly_
 

docs/api/sandbox-option.md

@@ -88,26 +88,17 @@ and preload.js:
 
 ```js
 // This file is loaded whenever a javascript context is created. It runs in a
-// private scope that can access a subset of Electron renderer APIs. We must be
-// careful to not leak any objects into the global scope!
-const { ipcRenderer, remote } = require('electron')
-const fs = remote.require('fs')
-
-// read a configuration file using the `fs` module
-const buf = fs.readFileSync('allowed-popup-urls.json')
-const allowedUrls = JSON.parse(buf.toString('utf8'))
+// private scope that can access a subset of Electron renderer APIs. Without
+// contextIsolation enabled, it's possible to accidentally leak privileged
+// globals like ipcRenderer to web content.
+const { ipcRenderer } = require('electron')
 
 const defaultWindowOpen = window.open
 
-function customWindowOpen (url, ...args) {
-  if (allowedUrls.indexOf(url) === -1) {
-    ipcRenderer.sendSync('blocked-popup-notification', location.origin, url)
-    return null
-  }
-  return defaultWindowOpen(url, ...args)
+window.open = function customWindowOpen (url, ...args) {
+  ipcRenderer.send('report-window-open', location.origin, url, args)
+  return defaultWindowOpen(url + '?from_electron=1', ...args)
 }
-
-window.open = customWindowOpen
 ```
 
 Important things to notice in the preload script:
@@ -115,8 +106,6 @@ Important things to notice in the preload script:
 - Even though the sandboxed renderer doesn't have Node.js running, it still has
   access to a limited node-like environment: `Buffer`, `process`, `setImmediate`,
   `clearImmediate` and `require` are available.
-- The preload script can indirectly access all APIs from the main process through the
-  `remote` and `ipcRenderer` modules.
 - The preload script must be contained in a single script, but it is possible to have
   complex preload code composed with multiple modules by using a tool like
   webpack or browserify. An example of using browserify is below.
@@ -144,15 +133,12 @@ following modules:
   - `desktopCapturer`
   - `ipcRenderer`
   - `nativeImage`
-  - `remote`
   - `webFrame`
 - `events`
 - `timers`
 - `url`
 
-More may be added as needed to expose more Electron APIs in the sandbox, but any
-module in the main process can already be used through
-`electron.remote.require`.
+More may be added as needed to expose more Electron APIs in the sandbox.
 
 ## Rendering untrusted content
 

docs/api/session.md

@@ -349,7 +349,6 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
 * `handler` Function | null
   * `webContents` [WebContents](web-contents.md) - WebContents requesting the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
   * `permission` String - The type of requested permission.
-    * `clipboard-read` - Request access to read from the clipboard.
     * `media` -  Request access to media devices such as camera, microphone and speakers.
     * `mediaKeySystem` - Request access to DRM protected content.
     * `geolocation` - Request access to user's current location.
@@ -385,7 +384,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

docs/api/shell.md

@@ -45,15 +45,27 @@ Returns `Promise<void>`
 
 Open the given external protocol URL in the desktop's default manner. (For example, mailto: URLs in the user's default mail agent).
 
-### `shell.moveItemToTrash(fullPath[, deleteOnFail])`
+### `shell.moveItemToTrash(fullPath[, deleteOnFail])` _Deprecated_
 
 * `fullPath` String
 * `deleteOnFail` Boolean (optional) - Whether or not to unilaterally remove the item if the Trash is disabled or unsupported on the volume. _macOS_
 
 Returns `Boolean` - Whether the item was successfully moved to the trash or otherwise deleted.
 
+> NOTE: This method is deprecated. Use `shell.trashItem` instead.
+
 Move the given file to trash and returns a boolean status for the operation.
 
+### `shell.trashItem(path)`
+
+* `path` String - path to the item to be moved to the trash.
+
+Returns `Promise<void>` - Resolves when the operation has been completed.
+Rejects if there was an error while deleting the requested item.
+
+This moves a path to the OS-specific trash location (Trash on macOS, Recycle
+Bin on Windows, and a desktop-environment-specific location on Linux).
+
 ### `shell.beep()`
 
 Play the beep sound.

docs/api/structures/shortcut-details.md

@@ -13,3 +13,5 @@ target's icon.
 DLL or EXE. Default is 0.
 * `appUserModelId` String (optional) - The Application User Model ID. Default
 is empty.
+* `toastActivatorClsid` String (optional) - The Application Toast Activator CLSID. Needed
+for participating in Action Center.

docs/api/synopsis.md

@@ -9,7 +9,7 @@ the [native modules](../tutorial/using-native-node-modules.md)).
 Electron also provides some extra built-in modules for developing native
 desktop applications. Some modules are only available in the main process, some
 are only available in the renderer process (web page), and some can be used in
-both processes.
+either process type.
 
 The basic rule is: if a module is [GUI][gui] or low-level system related, then
 it should be only available in the main process. You need to be familiar with
@@ -29,15 +29,15 @@ app.whenReady().then(() => {
 ```
 
 The renderer process is no different than a normal web page, except for the
-extra ability to use node modules:
+extra ability to use node modules if `nodeIntegration` is enabled:
 
 ```html
 <!DOCTYPE html>
 <html>
 <body>
 <script>
-  const { app } = require('electron').remote
-  console.log(app.getVersion())
+  const fs = require('fs')
+  console.log(fs.readFileSync(__filename, 'utf8'))
 </script>
 </body>
 </html>

docs/api/web-contents.md

@@ -364,7 +364,7 @@ Returns:
     * `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
+    * `launch-failure` - Process never successfully launched
     * `integrity-failure` - Windows code integrity checks failed
 
 Emitted when the renderer process unexpectedly disappears.  This is normally
@@ -784,7 +784,7 @@ Returns:
 Emitted when `desktopCapturer.getSources()` is called in the renderer process.
 Calling `event.preventDefault()` will make it return empty sources.
 
-#### Event: 'remote-require'
+#### Event: 'remote-require' _Deprecated_
 
 Returns:
 
@@ -795,7 +795,7 @@ Emitted when `remote.require()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-#### Event: 'remote-get-global'
+#### Event: 'remote-get-global' _Deprecated_
 
 Returns:
 
@@ -806,7 +806,7 @@ Emitted when `remote.getGlobal()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the global from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-#### Event: 'remote-get-builtin'
+#### Event: 'remote-get-builtin' _Deprecated_
 
 Returns:
 
@@ -817,7 +817,7 @@ Emitted when `remote.getBuiltin()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-#### Event: 'remote-get-current-window'
+#### Event: 'remote-get-current-window' _Deprecated_
 
 Returns:
 
@@ -827,7 +827,7 @@ Emitted when `remote.getCurrentWindow()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.
 
-#### Event: 'remote-get-current-web-contents'
+#### Event: 'remote-get-current-web-contents' _Deprecated_
 
 Returns:
 
@@ -998,34 +998,6 @@ Navigates to the specified offset from the "current entry".
 
 Returns `Boolean` - Whether the renderer process has crashed.
 
-#### `contents.forcefullyCrashRenderer()`
-
-Forcefully terminates the renderer process that is currently hosting this
-`webContents`. This will cause the `render-process-gone` event to be emitted
-with the `reason=killed || reason=crashed`. Please note that some webContents share renderer
-processes and therefore calling this method may also crash the host process
-for other webContents as well.
-
-Calling `reload()` immediately after calling this
-method will force the reload to occur in a new process. This should be used
-when this process is unstable or unusable, for instance in order to recover
-from the `unresponsive` event.
-
-```js
-contents.on('unresponsive', async () => {
-  const { response } = await dialog.showMessageBox({
-    message: 'App X has become unresponsive',
-    title: 'Do you want to try forcefully reloading the app?',
-    buttons: ['OK', 'Cancel'],
-    cancelId: 1
-  })
-  if (response === 0) {
-    contents.forcefullyCrashRenderer()
-    contents.reload()
-  }
-})
-```
-
 #### `contents.setUserAgent(userAgent)`
 
 * `userAgent` String
@@ -1145,6 +1117,10 @@ 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`.
 
+> **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that the
+> zoom level for a specific domain propagates across all instances of windows with
+> the same domain. Differentiating the window URLs will make zoom work per-window.
+
 #### `contents.getZoomLevel()`
 
 Returns `Number` - the current zoom level.
@@ -1236,12 +1212,6 @@ Inserts `text` to the focused element.
     defaults to `false`.
   * `matchCase` Boolean (optional) - Whether search should be case-sensitive,
     defaults to `false`.
-  * `wordStart` Boolean (optional) - Whether to look only at the start of words.
-    defaults to `false`.
-  * `medialCapitalAsWordStart` Boolean (optional) - When combined with `wordStart`,
-    accepts a match in the middle of a word if the match begins with an
-    uppercase letter followed by a lowercase or non-letter.
-    Accepts several other intra-word matches, defaults to `false`.
 
 Returns `Integer` - The request id used for the request.
 
@@ -1324,7 +1294,7 @@ 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` Object[] (optional) - The page range to print. On macOS, only one range is honored.
+  * `pageRanges` Object[]  (optional) - The page range to print. On macOS, only one range is honored.
     * `from` Number - Index of the first page to print (0-based).
     * `to` Number - Index of the last page to print (inclusive) (0-based).
   * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
@@ -1481,7 +1451,7 @@ An example of showing devtools in a `<webview>` tag:
   <webview id="browser" src="https://github.com"></webview>
   <webview id="devtools" src="about:blank"></webview>
   <script>
-    const { webContents } = require('electron').remote
+    const { ipcRenderer } = require('electron')
     const emittedOnce = (element, eventName) => new Promise(resolve => {
       element.addEventListener(eventName, event => resolve(event), { once: true })
     })
@@ -1490,16 +1460,26 @@ An example of showing devtools in a `<webview>` tag:
     const browserReady = emittedOnce(browserView, 'dom-ready')
     const devtoolsReady = emittedOnce(devtoolsView, 'dom-ready')
     Promise.all([browserReady, devtoolsReady]).then(() => {
-      const browser = webContents.fromId(browserView.getWebContentsId())
-      const devtools = webContents.fromId(devtoolsView.getWebContentsId())
-      browser.setDevToolsWebContents(devtools)
-      browser.openDevTools()
+      const targetId = browserView.getWebContentsId()
+      const devtoolsId = devtoolsView.getWebContentsId()
+      ipcRenderer.send('open-devtools', targetId, devtoolsId)
     })
   </script>
 </body>
 </html>
 ```
 
+```js
+// Main process
+const { ipcMain, webContents } = require('electron')
+ipcMain.on('open-devtools', (event, targetContentsId, devtoolsContentsId) => {
+  const target = webContents.fromId(targetContentsId)
+  const devtools = webContents.fromId(devtoolsContentsId)
+  target.setDevToolsWebContents(devtools)
+  target.openDevTools()
+})
+```
+
 An example of showing devtools in a `BrowserWindow`:
 
 ```js

docs/api/web-frame.md

@@ -41,6 +41,10 @@ Changes the zoom level to the specified level. The original size is 0 and each
 increment above or below represents zooming 20% larger or smaller to default
 limits of 300% and 50% of original size, respectively.
 
+> **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that the
+> zoom level for a specific domain propagates across all instances of windows with
+> the same domain. Differentiating the window URLs will make zoom work per-window.
+
 ### `webFrame.getZoomLevel()`
 
 Returns `Number` - The current zoom level.

docs/api/webview-tag.md

@@ -137,7 +137,7 @@ This option is disabled by default in the guest page.
 ```
 
 A `Boolean`. When this attribute is `false` the guest page in `webview` will not have access
-to the [`remote`](remote.md) module. The remote module is available by default.
+to the [`remote`](remote.md) module. The remote module is unavailable by default.
 
 ### `plugins`
 
@@ -519,12 +519,6 @@ Inserts `text` to the focused element.
     defaults to `false`.
   * `matchCase` Boolean (optional) - Whether search should be case-sensitive,
     defaults to `false`.
-  * `wordStart` Boolean (optional) - Whether to look only at the start of words.
-    defaults to `false`.
-  * `medialCapitalAsWordStart` Boolean (optional) - When combined with `wordStart`,
-    accepts a match in the middle of a word if the match begins with an
-    uppercase letter followed by a lowercase or non-letter.
-    Accepts several other intra-word matches, defaults to `false`.
 
 Returns `Integer` - The request id used for the request.
 
@@ -587,7 +581,7 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
     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.
+  * `pageRanges` Record<string, number> (optional) - The page range to print. On macOS, only the first range is honored.
     * `from` Number - Index of the first page to print (0-based).
     * `to` Number - Index of the last page to print (inclusive) (0-based).
   * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
@@ -648,6 +642,10 @@ 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`.
 
+> **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that the
+> zoom level for a specific domain propagates across all instances of windows with
+> the same domain. Differentiating the window URLs will make zoom work per-window.
+
 ### `<webview>.getZoomFactor()`
 
 Returns `Number` - the current zoom factor.

docs/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)
+```

docs/breaking-changes.md

@@ -12,6 +12,20 @@ This document uses the following convention to categorize breaking changes:
 - **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 (13.0)
+
+### Removed: `shell.moveItemToTrash()`
+
+The deprecated synchronous `shell.moveItemToTrash()` API has been removed. Use
+the asynchronous `shell.trashItem()` instead.
+
+```js
+// Removed in Electron 13
+shell.moveItemToTrash(path)
+// Replace with
+shell.trashItem(path).then(/* ... */)
+```
+
 ## Planned Breaking API Changes (12.0)
 
 ### Default Changed: `contextIsolation` defaults to `true`
@@ -50,6 +64,37 @@ If your crash ingestion server does not support compressed payloads, you can
 turn off compression by specifying `{ compress: false }` in the crash reporter
 options.
 
+### Deprecated: `remote` module
+
+The `remote` module is deprecated in Electron 12, and will be removed in
+Electron 14. It is replaced by the
+[`@electron/remote`](https://github.com/electron/remote) module.
+
+```js
+// Deprecated in Electron 12:
+const { BrowserWindow } = require('electron').remote
+```
+
+```js
+// Replace with:
+const { BrowserWindow } = require('@electron/remote')
+
+// In the main process:
+require('@electron/remote/main').initialize()
+```
+
+### Deprecated: `shell.moveItemToTrash()`
+
+The synchronous `shell.moveItemToTrash()` has been replaced by the new,
+asynchronous `shell.trashItem()`.
+
+```js
+// Deprecated in Electron 12
+shell.moveItemToTrash(path)
+// Replace with
+shell.trashItem(path).then(/* ... */)
+```
+
 ## Planned Breaking API Changes (11.0)
 
 There are no breaking changes planned for 11.0.
@@ -133,54 +178,6 @@ const w = new BrowserWindow({
 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)
-```
-
 ## Planned Breaking API Changes (9.0)
 
 ### Default Changed: Loading non-context-aware native modules in the renderer process is disabled by default

docs/development/README.md

@@ -4,8 +4,8 @@ These guides are intended for people working on the Electron project itself.
 For guides on Electron app development, see
 [/docs/README.md](../README.md#guides-and-tutorials).
 
-* [Code of Conduct](../../CODE_OF_CONDUCT.md)
-* [Contributing to Electron](../../CONTRIBUTING.md)
+* [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md)
+* [Contributing to Electron](https://github.com/electron/electron/blob/master/CONTRIBUTING.md)
 * [Issues](issues.md)
 * [Pull Requests](pull-requests.md)
 * [Documentation Styleguide](coding-style.md#documentation)

docs/development/build-instructions-gn.md

@@ -177,12 +177,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 :)
 

docs/development/debug-instructions-windows.md

@@ -69,8 +69,7 @@ way of figuring out which is which.
 ### Which Process Should I Attach to?
 
 Code executed within the main process (that is, code found in or eventually run
-by your main JavaScript file) as well as code called using the remote
-(`require('electron').remote`) will run inside the main process, while other
+by your main JavaScript file) will run inside the main process, while other
 code will execute inside its respective renderer process.
 
 You can be attached to multiple programs when you are debugging, but only one

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
 

docs/fiddles/media/screenshot/take-screenshot/main.js

@@ -1,7 +1,11 @@
-const { BrowserWindow, app } = require('electron')
+const { BrowserWindow, app, screen, ipcMain } = require('electron')
 
 let mainWindow = null
 
+ipcMain.handle('get-screen-size', () => {
+  return screen.getPrimaryDisplay().workAreaSize
+})
+
 function createWindow () {
   const windowOptions = {
     width: 600,

docs/fiddles/media/screenshot/take-screenshot/renderer.js

@@ -1,5 +1,4 @@
-const { desktopCapturer } = require('electron')
-const { screen, shell } = require('electron').remote
+const { desktopCapturer, shell, ipcRenderer } = require('electron')
 
 const fs = require('fs')
 const os = require('os')
@@ -8,9 +7,9 @@ const path = require('path')
 const screenshot = document.getElementById('screen-shot')
 const screenshotMsg = document.getElementById('screenshot-path')
 
-screenshot.addEventListener('click', (event) => {
+screenshot.addEventListener('click', async (event) => {
   screenshotMsg.textContent = 'Gathering screens...'
-  const thumbSize = determineScreenShotSize()
+  const thumbSize = await determineScreenShotSize()
   const options = { types: ['screen'], thumbnailSize: thumbSize }
 
   desktopCapturer.getSources(options, (error, sources) => {
@@ -33,8 +32,8 @@ screenshot.addEventListener('click', (event) => {
   })
 })
 
-function determineScreenShotSize () {
-  const screenSize = screen.getPrimaryDisplay().workAreaSize
+async function determineScreenShotSize () {
+  const screenSize = await ipcRenderer.invoke('get-screen-size')
   const maxDimension = Math.max(screenSize.width, screenSize.height)
   return {
     width: maxDimension * window.devicePixelRatio,

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

@@ -1,23 +1,20 @@
-const { app, BrowserWindow } = require('electron')
+const { app, BrowserWindow, ipcMain } = require('electron')
 
-let mainWindow = null
+ipcMain.on('create-frameless-window', (event, {url}) => {
+  const win = new BrowserWindow({ frame: false })
+  win.loadURL(url)
+})
 
 function createWindow () {
-  const windowOptions = {
+  const mainWindow = new BrowserWindow({
     width: 600,
     height: 400,
     title: 'Create a frameless window',
     webPreferences: {
       nodeIntegration: true
     }
-  }
-
-  mainWindow = new BrowserWindow(windowOptions)
-  mainWindow.loadFile('index.html')
-
-  mainWindow.on('closed', () => {
-    mainWindow = null
   })
+  mainWindow.loadFile('index.html')
 }
 
 app.whenReady().then(() => {

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

@@ -1,12 +1,8 @@
-const { BrowserWindow } = require('electron').remote
+const { ipcRenderer } = require('electron')
 
 const newWindowBtn = document.getElementById('frameless-window')
 
-newWindowBtn.addEventListener('click', (event) => {
-  let win = new BrowserWindow({ frame: false })
-
-  win.on('close', () => { win = null })
-
-  win.loadURL('data:text/html,<h2>Hello World!</h2><a id="close" href="javascript:window.close()">Close this Window</a>')
-  win.show()
+newWindowBtn.addEventListener('click', () => {
+  const url = 'data:text/html,<h2>Hello World!</h2><a id="close" href="javascript:window.close()">Close this Window</a>'
+  ipcRenderer.send('create-frameless-window', { url })
 })

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

@@ -1,13 +1,14 @@
 // Modules to control application life and create native browser window
 const { app, BrowserWindow } = require('electron')
 
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
+ipcMain.on('create-frameless-window', (event, {url}) => {
+  const win = new BrowserWindow({ frame: false })
+  win.loadURL(url)
+})
 
 function createWindow () {
   // Create the browser window.
-  mainWindow = new BrowserWindow({
+  const mainWindow = new BrowserWindow({
     width: 800,
     height: 600,
     webPreferences: {
@@ -17,17 +18,6 @@ function createWindow () {
 
   // and load the index.html of the app.
   mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
 }
 
 // This method will be called when Electron has finished

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

@@ -1,25 +1,8 @@
-const { BrowserWindow } = require('electron').remote
-const shell = require('electron').shell
+const { ipcRenderer } = require('electron')
 
-const framelessWindowBtn = document.getElementById('frameless-window')
+const newWindowBtn = document.getElementById('frameless-window')
 
-const links = document.querySelectorAll('a[href]')
-
-framelessWindowBtn.addEventListener('click', (event) => {
-  const modalPath = 'https://electronjs.org'
-  let win = new BrowserWindow({ frame: false })
-
-  win.on('close', () => { win = null })
-  win.loadURL(modalPath)
-  win.show()
-})
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
+newWindowBtn.addEventListener('click', () => {
+  const url = 'data:text/html,<h2>Hello World!</h2><a id="close" href="javascript:window.close()">Close this Window</a>'
+  ipcRenderer.send('create-frameless-window', { url })
 })

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

@@ -1,9 +1,20 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow } = require('electron')
+const { app, BrowserWindow, ipcMain } = require('electron')
 
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
+ipcMain.on('create-demo-window', (event) => {
+  const win = new BrowserWindow({ width: 400, height: 275 })
+
+  function updateReply() {
+    event.sender.send('bounds-changed', {
+      size: win.getSize(),
+      position: win.getPosition()
+    })
+  }
+
+  win.on('resize', updateReply)
+  win.on('move', updateReply)
+  win.loadURL('https://electronjs.org')
+})
 
 function createWindow () {
   // Create the browser window.
@@ -17,17 +28,6 @@ function createWindow () {
 
   // and load the index.html of the app.
   mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
 }
 
 // This method will be called when Electron has finished

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

@@ -1,27 +1,17 @@
-const { BrowserWindow } = require('electron').remote
-const shell = require('electron').shell
+const { shell, ipcRenderer } = require('electron')
 
 const manageWindowBtn = document.getElementById('manage-window')
 
 const links = document.querySelectorAll('a[href]')
 
-let win
+ipcRenderer.on('bounds-changed', (event, bounds) => {
+  const manageWindowReply = document.getElementById('manage-window-reply')
+  const message = `Size: ${bounds.size} Position: ${bounds.position}`
+  manageWindowReply.textContent = message
+})
 
 manageWindowBtn.addEventListener('click', (event) => {
-  const modalPath = 'https://electronjs.org'
-  win = new BrowserWindow({ width: 400, height: 275 })
-
-  win.on('resize', updateReply)
-  win.on('move', updateReply)
-  win.on('close', () => { win = null })
-  win.loadURL(modalPath)
-  win.show()
-
-  function updateReply () {
-    const manageWindowReply = document.getElementById('manage-window-reply')
-    const message = `Size: ${win.getSize()} Position: ${win.getPosition()}`
-    manageWindowReply.innerText = message
-  }
+  ipcRenderer.send('create-demo-window')
 })
 
 Array.prototype.forEach.call(links, (link) => {

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

@@ -7,7 +7,7 @@
   <h2>Create a new window</h2>
   <h3>Supports: Win, macOS, Linux <span>|</span> Process: Main</h3>
   <button id="new-window">View Demo</button>
-  <p>The <code>BrowserWindow</code> module gives you the ability to create new windows in your app. This main process module can be used from the renderer process with the <code>remote</code> module, as is shown in this demo.</p>
+  <p>The <code>BrowserWindow</code> module gives you the ability to create new windows in your app.</p>
   <p>There are a lot of options when creating a new window. A few are in this demo, but visit the <a id="browser-window-link" href="">documentation<span>(opens in new window)</span></a>
 <div>
             <h2>ProTip</h2>

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

@@ -1,13 +1,14 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow } = require('electron')
+const { app, BrowserWindow, ipcMain } = require('electron')
 
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
+ipcMain.on('new-window', (event, { url, width, height }) => {
+  const win = new BrowserWindow({ width, height })
+  win.loadURL(url)
+})
 
 function createWindow () {
   // Create the browser window.
-  mainWindow = new BrowserWindow({
+  const mainWindow = new BrowserWindow({
     width: 800,
     height: 600,
     webPreferences: {
@@ -17,17 +18,6 @@ function createWindow () {
 
   // and load the index.html of the app.
   mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-  })
 }
 
 // This method will be called when Electron has finished

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

@@ -1,16 +1,11 @@
-const { BrowserWindow } = require('electron').remote
-const { shell } = require('electron').remote
+const { shell, ipcRenderer } = require('electron')
 
 const newWindowBtn = document.getElementById('new-window')
 const link = document.getElementById('browser-window-link')
 
 newWindowBtn.addEventListener('click', (event) => {
-
-  let win = new BrowserWindow({ width: 400, height: 320 })
-
-  win.on('close', () => { win = null })
-  win.loadURL('https://electronjs.org')
-  win.show()
+  const url = 'https://electronjs.org'
+  ipcRenderer.send('new-window', { url, width: 400, height: 320 });
 })
 
 link.addEventListener('click', (e) => {

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

@@ -1,13 +1,9 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow } = require('electron')
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
+const { app, BrowserWindow, ipcMain } = require('electron')
 
 function createWindow () {
   // Create the browser window.
-  mainWindow = new BrowserWindow({
+  const mainWindow = new BrowserWindow({
     width: 800,
     height: 600,
     webPreferences: {
@@ -18,15 +14,27 @@ function createWindow () {
   // and load the index.html of the app.
   mainWindow.loadFile('index.html')
 
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
+  let demoWindow
+  ipcMain.on('show-demo-window', () => {
+    if (demoWindow) {
+      demoWindow.focus()
+      return
+    }
+    demoWindow = new BrowserWindow({ width: 600, height: 400 })
+    demoWindow.loadURL('https://electronjs.org')
+    demoWindow.on('close', () => {
+      mainWindow.webContents.send('window-close')
+    })
+    demoWindow.on('focus', () => {
+      mainWindow.webContents.send('window-focus')
+    })
+    demoWindow.on('blur', () => {
+      mainWindow.webContents.send('window-blur')
+    })
+  })
 
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
+  ipcMain.on('focus-demo-window', () => {
+    if (demoWindow) demoWindow.focus()
   })
 }
 

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

@@ -1,42 +1,33 @@
-const { BrowserWindow } = require('electron').remote
-const shell = require('electron').shell
+const { shell, ipcRenderer } = require('electron')
 
 const listenToWindowBtn = document.getElementById('listen-to-window')
 const focusModalBtn = document.getElementById('focus-on-modal-window')
 
-const links = document.querySelectorAll('a[href]')
+const hideFocusBtn = () => {
+  focusModalBtn.classList.add('disappear')
+  focusModalBtn.classList.remove('smooth-appear')
+  focusModalBtn.removeEventListener('click', focusWindow)
+}
 
-let win
+const showFocusBtn = (btn) => {
+  focusModalBtn.classList.add('smooth-appear')
+  focusModalBtn.classList.remove('disappear')
+  focusModalBtn.addEventListener('click', focusWindow)
+}
+const focusWindow = () => {
+  ipcRenderer.send('focus-demo-window')
+}
+
+ipcRenderer.on('window-focus', hideFocusBtn)
+ipcRenderer.on('window-close', hideFocusBtn)
+ipcRenderer.on('window-blur', showFocusBtn)
 
 listenToWindowBtn.addEventListener('click', () => {
-  const modalPath = 'https://electronjs.org'
-  win = new BrowserWindow({ width: 600, height: 400 })
-
-  const hideFocusBtn = () => {
-    focusModalBtn.classList.add('disappear')
-    focusModalBtn.classList.remove('smooth-appear')
-    focusModalBtn.removeEventListener('click', clickHandler)
-  }
-
-  const showFocusBtn = (btn) => {
-    if (!win) return
-    focusModalBtn.classList.add('smooth-appear')
-    focusModalBtn.classList.remove('disappear')
-    focusModalBtn.addEventListener('click', clickHandler)
-  }
-
-  win.on('focus', hideFocusBtn)
-  win.on('blur', showFocusBtn)
-  win.on('close', () => {
-    hideFocusBtn()
-    win = null
-  })
-  win.loadURL(modalPath)
-  win.show()
-
-  const clickHandler = () => { win.focus() }
+  ipcRenderer.send('show-demo-window')
 })
 
+const links = document.querySelectorAll('a[href]')
+
 Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {

docs/tutorial/accessibility.md

@@ -1,6 +1,6 @@
 # Accessibility
 
-Making accessible applications is important and we're happy to introduce new
+Making accessible applications is important and we're happy to provide
 functionality to [Devtron][devtron] and [Spectron][spectron] that gives
 developers the opportunity to make their apps better for everyone.
 
@@ -11,7 +11,7 @@ websites because they're both ultimately HTML. With Electron apps, however,
 you can't use the online resources for accessibility audits because your app
 doesn't have a URL to point the auditor to.
 
-These new features bring those auditing tools to your Electron app. You can
+These features bring those auditing tools to your Electron app. You can
 choose to add audits to your tests with Spectron or use them within DevTools
 with Devtron. Read on for a summary of the tools.
 
@@ -32,7 +32,7 @@ You can read more about this feature in [Spectron's documentation][spectron-a11y
 
 ## Devtron
 
-In Devtron, there is a new accessibility tab which will allow you to audit a
+In Devtron, there is an accessibility tab which will allow you to audit a
 page in your app, sort and filter the results.
 
 ![devtron screenshot][devtron-screenshot]
@@ -44,26 +44,29 @@ audit rules this library uses on that [repository's wiki][a11y-devtools-wiki].
 If you know of other great accessibility tools for Electron, add them to the
 accessibility documentation with a pull request.
 
-## Enabling Accessibility
+## Manually enabling accessibility features
 
-Electron applications keep accessibility disabled by default for performance
-reasons but there are multiple ways to enable it.
+Electron applications will automatically enable accessibility features in the
+presence of assistive technology (e.g. [JAWS](https://www.freedomscientific.com/products/software/jaws/)
+on Windows or [VoiceOver](https://help.apple.com/voiceover/mac/10.15/) on macOS).
+See Chrome's [accessibility documentation][a11y-docs] for more details.
 
-### Inside Application
+You can also manually toggle these features either within your Electron application
+or by setting flags in third-party native software.
 
-By using [`app.setAccessibilitySupportEnabled(enabled)`][setAccessibilitySupportEnabled],
-you can expose accessibility switch to users in the application preferences.
-User's system assistive utilities have priority over this setting and will
-override it.
+### Using Electron's API
 
-### Assistive Technology
+By using the [`app.setAccessibilitySupportEnabled(enabled)`][setAccessibilitySupportEnabled]
+API, you can manually expose Chrome's accessibility tree to users in the application preferences.
+Note that the user's system assistive utilities have priority over this setting and
+will override it.
 
-Electron application will enable accessibility automatically when it detects
-assistive technology (Windows) or VoiceOver (macOS). See Chrome's
-[accessibility documentation][a11y-docs] for more details.
+### Within third-party software
 
-On macOS, third-party assistive technology can switch accessibility inside
-Electron applications by setting the attribute `AXManualAccessibility`
+#### macOS
+
+On macOS, third-party assistive technology can toggle accessibility features inside
+Electron applications by setting the `AXManualAccessibility` attribute
 programmatically:
 
 ```objc

docs/tutorial/in-app-purchases.md

@@ -26,7 +26,8 @@ To test In-App Purchase in development with Electron you'll have to change the `
 Here is an example that shows how to use In-App Purchases in Electron. You'll have to replace the product ids by the identifiers of the products created with iTunes Connect (the identifier of `com.example.app.product1` is `product1`). Note that you have to listen to the `transactions-updated` event as soon as possible in your app.
 
 ```javascript
-const { inAppPurchase } = require('electron').remote
+// Main process
+const { inAppPurchase } = require('electron')
 const PRODUCT_IDS = ['id1', 'id2']
 
 // Listen for transactions as soon as possible.

docs/tutorial/using-pepper-flash-plugin.md

@@ -7,7 +7,7 @@ and then enable it in your application.
 ## Prepare a Copy of Flash Plugin
 
 On macOS and Linux, the details of the Pepper Flash plugin can be found by
-navigating to `chrome://version` in the Chrome browser. Its location and version
+navigating to `chrome://flash` in the Chrome browser. Its location and version
 are useful for Electron's Pepper Flash support. You can also copy it to another
 location.
 

electron_strings.grdp

@@ -80,8 +80,4 @@
       Windows Utilities
     </message>
   </if>
-  <message name="IDS_DOWNLOAD_MORE_ACTIONS"
-          desc="Tooltip of a button on the downloads page that shows a menu with actions like 'Open downloads folder' or 'Clear all'">
-    More actions
-</message>
 </grit-part>

filenames.gni

@@ -21,215 +21,12 @@ filenames = {
     "node_modules/@primer/octicons/build/svg/star-fill-24.svg",
   ]
 
-  lib_sources_linux = [
-    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
-    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
-    "shell/browser/ui/file_dialog_gtk.cc",
-    "shell/browser/ui/message_box_gtk.cc",
-    "shell/browser/ui/tray_icon_gtk.cc",
-    "shell/browser/ui/tray_icon_gtk.h",
-    "shell/browser/ui/views/global_menu_bar_x11.cc",
-    "shell/browser/ui/views/global_menu_bar_x11.h",
-    "shell/browser/ui/x/event_disabler.cc",
-    "shell/browser/ui/x/event_disabler.h",
-    "shell/browser/ui/x/window_state_watcher.cc",
-    "shell/browser/ui/x/window_state_watcher.h",
-    "shell/browser/ui/x/x_window_utils.cc",
-    "shell/browser/ui/x/x_window_utils.h",
-    "shell/browser/browser_linux.cc",
-    "shell/browser/lib/power_observer_linux.cc",
-    "shell/browser/lib/power_observer_linux.h",
-    "shell/browser/notifications/linux/notification_presenter_linux.cc",
-    "shell/browser/notifications/linux/notification_presenter_linux.h",
-    "shell/browser/relauncher_linux.cc",
-    "shell/common/application_info_linux.cc",
-    "shell/common/language_util_linux.cc",
-    "shell/common/node_bindings_linux.cc",
-    "shell/common/node_bindings_linux.h",
-    "shell/common/platform_util_linux.cc",
-    "shell/browser/linux/unity_service.h",
-    "shell/browser/notifications/linux/libnotify_notification.cc",
-    "shell/browser/notifications/linux/libnotify_notification.h",
-    "shell/browser/linux/unity_service.cc",
-  ]
-
-  lib_sources_posix = [
-    "chromium_src/chrome/browser/process_singleton_posix.cc",
-    "shell/browser/electron_browser_main_parts_posix.cc",
-  ]
-
-  lib_sources_win = [
-    "chromium_src/chrome/browser/process_singleton_win.cc",
-    "shell/browser/api/electron_api_power_monitor_win.cc",
-    "shell/browser/api/electron_api_system_preferences_win.cc",
-    "shell/browser/browser_win.cc",
-    "shell/browser/native_window_views_win.cc",
-    "shell/browser/notifications/win/notification_presenter_win.cc",
-    "shell/browser/notifications/win/notification_presenter_win.h",
-    "shell/browser/notifications/win/notification_presenter_win7.cc",
-    "shell/browser/notifications/win/notification_presenter_win7.h",
-    "shell/browser/relauncher_win.cc",
-    "shell/browser/ui/certificate_trust_win.cc",
-    "shell/browser/ui/file_dialog_win.cc",
-    "shell/browser/ui/message_box_win.cc",
-    "shell/browser/ui/tray_icon_win.cc",
-    "shell/browser/ui/views/electron_views_delegate_win.cc",
-    "shell/browser/ui/views/win_frame_view.cc",
-    "shell/browser/ui/views/win_frame_view.h",
-    "shell/browser/ui/win/electron_desktop_window_tree_host_win.cc",
-    "shell/browser/ui/win/electron_desktop_window_tree_host_win.h",
-    "shell/common/api/electron_api_native_image_win.cc",
-    "shell/common/application_info_win.cc",
-    "shell/common/language_util_win.cc",
-    "shell/common/node_bindings_win.cc",
-    "shell/common/node_bindings_win.h",
-    "shell/common/platform_util_win.cc",
-    "shell/browser/notifications/win/win32_desktop_notifications/common.h",
-    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc",
-    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast.cc",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast.h",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h",
-    "shell/browser/notifications/win/win32_notification.cc",
-    "shell/browser/notifications/win/win32_notification.h",
-    "shell/browser/notifications/win/windows_toast_notification.cc",
-    "shell/browser/notifications/win/windows_toast_notification.h",
-    "shell/browser/ui/win/dialog_thread.cc",
-    "shell/browser/ui/win/dialog_thread.h",
-    "shell/browser/ui/win/electron_desktop_native_widget_aura.cc",
-    "shell/browser/ui/win/electron_desktop_native_widget_aura.h",
-    "shell/browser/ui/win/jump_list.cc",
-    "shell/browser/ui/win/jump_list.h",
-    "shell/browser/ui/win/notify_icon.cc",
-    "shell/browser/ui/win/notify_icon.h",
-    "shell/browser/ui/win/notify_icon_host.cc",
-    "shell/browser/ui/win/notify_icon_host.h",
-    "shell/browser/ui/win/taskbar_host.cc",
-    "shell/browser/ui/win/taskbar_host.h",
-    "shell/browser/win/scoped_hstring.cc",
-    "shell/browser/win/scoped_hstring.h",
-  ]
-
-  lib_sources_mac = [
-    "shell/app/electron_main_delegate_mac.h",
-    "shell/app/electron_main_delegate_mac.mm",
-    "shell/browser/api/electron_api_app_mac.mm",
-    "shell/browser/api/electron_api_browser_window_mac.mm",
-    "shell/browser/api/electron_api_menu_mac.h",
-    "shell/browser/api/electron_api_menu_mac.mm",
-    "shell/browser/api/electron_api_native_theme_mac.mm",
-    "shell/browser/api/electron_api_power_monitor_mac.mm",
-    "shell/browser/api/electron_api_system_preferences_mac.mm",
-    "shell/browser/api/electron_api_web_contents_mac.mm",
-    "shell/browser/auto_updater_mac.mm",
-    "shell/browser/browser_mac.mm",
-    "shell/browser/notifications/mac/notification_center_delegate.h",
-    "shell/browser/notifications/mac/notification_center_delegate.mm",
-    "shell/common/mac/main_application_bundle.h",
-    "shell/common/mac/main_application_bundle.mm",
-    "shell/browser/common_web_contents_delegate_mac.mm",
-    "shell/browser/electron_browser_main_parts_mac.mm",
-    "shell/browser/native_browser_view_mac.h",
-    "shell/browser/native_browser_view_mac.mm",
-    "shell/browser/native_window_mac.h",
-    "shell/browser/native_window_mac.mm",
-    "shell/browser/notifications/mac/notification_presenter_mac.h",
-    "shell/browser/notifications/mac/notification_presenter_mac.mm",
-    "shell/browser/relauncher_mac.cc",
-    "shell/browser/ui/certificate_trust_mac.mm",
-    "shell/browser/ui/cocoa/electron_native_widget_mac.h",
-    "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
-    "shell/browser/ui/cocoa/root_view_mac.h",
-    "shell/browser/ui/cocoa/root_view_mac.mm",
-    "shell/browser/ui/cocoa/views_delegate_mac.h",
-    "shell/browser/ui/cocoa/views_delegate_mac.mm",
-    "shell/browser/ui/drag_util_mac.mm",
-    "shell/browser/ui/file_dialog_mac.mm",
-    "shell/browser/ui/inspectable_web_contents_view_mac.h",
-    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
-    "shell/browser/ui/message_box_mac.mm",
-    "shell/common/api/electron_api_clipboard_mac.mm",
-    "shell/common/api/electron_api_native_image_mac.mm",
-    "shell/common/application_info_mac.mm",
-    "shell/common/language_util_mac.mm",
-    "shell/common/node_bindings_mac.cc",
-    "shell/common/node_bindings_mac.h",
-    "shell/common/platform_util_mac.mm",
-    "shell/browser/notifications/mac/cocoa_notification.h",
-    "shell/browser/notifications/mac/cocoa_notification.mm",
-    "shell/browser/ui/cocoa/NSColor+Hex.h",
-    "shell/browser/ui/cocoa/NSColor+Hex.mm",
-    "shell/browser/ui/cocoa/NSString+ANSI.h",
-    "shell/browser/ui/cocoa/NSString+ANSI.mm",
-    "shell/browser/ui/cocoa/delayed_native_view_host.cc",
-    "shell/browser/ui/cocoa/delayed_native_view_host.h",
-    "shell/browser/ui/cocoa/electron_bundle_mover.h",
-    "shell/browser/ui/cocoa/electron_bundle_mover.mm",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
-    "shell/browser/ui/cocoa/electron_menu_controller.h",
-    "shell/browser/ui/cocoa/electron_menu_controller.mm",
-    "shell/browser/ui/cocoa/electron_ns_window.h",
-    "shell/browser/ui/cocoa/electron_ns_window.mm",
-    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
-    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
-    "shell/browser/ui/cocoa/electron_preview_item.h",
-    "shell/browser/ui/cocoa/electron_preview_item.mm",
-    "shell/browser/ui/cocoa/electron_touch_bar.h",
-    "shell/browser/ui/cocoa/electron_touch_bar.mm",
-    "shell/browser/ui/cocoa/event_dispatching_window.h",
-    "shell/browser/ui/cocoa/event_dispatching_window.mm",
-    "shell/browser/ui/tray_icon_cocoa.h",
-    "shell/browser/ui/tray_icon_cocoa.mm",
-    "shell/browser/mac/dict_util.h",
-    "shell/browser/mac/dict_util.mm",
-    "shell/browser/mac/electron_application.h",
-    "shell/browser/mac/electron_application.mm",
-    "shell/browser/mac/electron_application_delegate.h",
-    "shell/browser/mac/electron_application_delegate.mm",
-    "shell/browser/mac/in_app_purchase.h",
-    "shell/browser/mac/in_app_purchase.mm",
-    "shell/browser/mac/in_app_purchase_observer.h",
-    "shell/browser/mac/in_app_purchase_observer.mm",
-    "shell/browser/mac/in_app_purchase_product.h",
-    "shell/browser/mac/in_app_purchase_product.mm",
-  ]
-
-  lib_sources_views = [
-    "shell/browser/api/electron_api_browser_window_views.cc",
-    "shell/browser/api/electron_api_menu_views.cc",
-    "shell/browser/api/electron_api_menu_views.h",
-    "shell/browser/common_web_contents_delegate_views.cc",
-    "shell/browser/native_browser_view_views.cc",
-    "shell/browser/native_browser_view_views.h",
-    "shell/browser/native_window_views.cc",
-    "shell/browser/native_window_views.h",
-    "shell/browser/ui/drag_util_views.cc",
-    "shell/browser/ui/views/inspectable_web_contents_view_views.cc",
-    "shell/browser/ui/views/inspectable_web_contents_view_views.h",
-    "shell/browser/ui/views/autofill_popup_view.cc",
-    "shell/browser/ui/views/autofill_popup_view.h",
-    "shell/browser/ui/views/electron_views_delegate.cc",
-    "shell/browser/ui/views/electron_views_delegate.h",
-    "shell/browser/ui/views/frameless_view.cc",
-    "shell/browser/ui/views/frameless_view.h",
-    "shell/browser/ui/views/menu_bar.cc",
-    "shell/browser/ui/views/menu_bar.h",
-    "shell/browser/ui/views/menu_delegate.cc",
-    "shell/browser/ui/views/menu_delegate.h",
-    "shell/browser/ui/views/menu_model_adapter.cc",
-    "shell/browser/ui/views/menu_model_adapter.h",
-    "shell/browser/ui/views/native_frame_view.cc",
-    "shell/browser/ui/views/native_frame_view.h",
-    "shell/browser/ui/views/root_view.cc",
-    "shell/browser/ui/views/root_view.h",
-    "shell/browser/ui/views/submenu_button.cc",
-    "shell/browser/ui/views/submenu_button.h",
-  ]
-
   lib_sources = [
     "chromium_src/chrome/browser/process_singleton.h",
+    "chromium_src/chrome/browser/process_singleton_posix.cc",
+    "chromium_src/chrome/browser/process_singleton_win.cc",
+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
     "shell/app/command_line_args.cc",
     "shell/app/command_line_args.h",
     "shell/app/electron_content_client.cc",
@@ -238,10 +35,13 @@ filenames = {
     "shell/app/electron_crash_reporter_client.h",
     "shell/app/electron_main_delegate.cc",
     "shell/app/electron_main_delegate.h",
+    "shell/app/electron_main_delegate_mac.h",
+    "shell/app/electron_main_delegate_mac.mm",
     "shell/app/uv_task_runner.cc",
     "shell/app/uv_task_runner.h",
     "shell/browser/api/electron_api_app.cc",
     "shell/browser/api/electron_api_app.h",
+    "shell/browser/api/electron_api_app_mac.mm",
     "shell/browser/api/electron_api_auto_updater.cc",
     "shell/browser/api/electron_api_auto_updater.h",
     "shell/browser/api/electron_api_base_window.cc",
@@ -250,6 +50,8 @@ filenames = {
     "shell/browser/api/electron_api_browser_view.h",
     "shell/browser/api/electron_api_browser_window.cc",
     "shell/browser/api/electron_api_browser_window.h",
+    "shell/browser/api/electron_api_browser_window_mac.mm",
+    "shell/browser/api/electron_api_browser_window_views.cc",
     "shell/browser/api/electron_api_content_tracing.cc",
     "shell/browser/api/electron_api_cookies.cc",
     "shell/browser/api/electron_api_cookies.h",
@@ -271,8 +73,13 @@ filenames = {
     "shell/browser/api/electron_api_in_app_purchase.h",
     "shell/browser/api/electron_api_menu.cc",
     "shell/browser/api/electron_api_menu.h",
+    "shell/browser/api/electron_api_menu_mac.h",
+    "shell/browser/api/electron_api_menu_mac.mm",
+    "shell/browser/api/electron_api_menu_views.cc",
+    "shell/browser/api/electron_api_menu_views.h",
     "shell/browser/api/electron_api_native_theme.cc",
     "shell/browser/api/electron_api_native_theme.h",
+    "shell/browser/api/electron_api_native_theme_mac.mm",
     "shell/browser/api/electron_api_net.cc",
     "shell/browser/api/electron_api_net_log.cc",
     "shell/browser/api/electron_api_net_log.h",
@@ -280,6 +87,8 @@ filenames = {
     "shell/browser/api/electron_api_notification.h",
     "shell/browser/api/electron_api_power_monitor.cc",
     "shell/browser/api/electron_api_power_monitor.h",
+    "shell/browser/api/electron_api_power_monitor_mac.mm",
+    "shell/browser/api/electron_api_power_monitor_win.cc",
     "shell/browser/api/electron_api_power_save_blocker.cc",
     "shell/browser/api/electron_api_power_save_blocker.h",
     "shell/browser/api/electron_api_protocol.cc",
@@ -292,6 +101,8 @@ filenames = {
     "shell/browser/api/electron_api_session.h",
     "shell/browser/api/electron_api_system_preferences.cc",
     "shell/browser/api/electron_api_system_preferences.h",
+    "shell/browser/api/electron_api_system_preferences_mac.mm",
+    "shell/browser/api/electron_api_system_preferences_win.cc",
     "shell/browser/api/electron_api_tray.cc",
     "shell/browser/api/electron_api_tray.h",
     "shell/browser/api/electron_api_url_loader.cc",
@@ -301,6 +112,7 @@ filenames = {
     "shell/browser/api/electron_api_web_contents.cc",
     "shell/browser/api/electron_api_web_contents.h",
     "shell/browser/api/electron_api_web_contents_impl.cc",
+    "shell/browser/api/electron_api_web_contents_mac.mm",
     "shell/browser/api/electron_api_web_contents_view.cc",
     "shell/browser/api/electron_api_web_contents_view.h",
     "shell/browser/api/electron_api_web_request.cc",
@@ -324,15 +136,21 @@ filenames = {
     "shell/browser/api/ui_event.h",
     "shell/browser/auto_updater.cc",
     "shell/browser/auto_updater.h",
+    "shell/browser/auto_updater_mac.mm",
     "shell/browser/browser.cc",
     "shell/browser/browser.h",
+    "shell/browser/browser_linux.cc",
+    "shell/browser/browser_mac.mm",
     "shell/browser/browser_observer.h",
     "shell/browser/browser_process_impl.cc",
     "shell/browser/browser_process_impl.h",
+    "shell/browser/browser_win.cc",
     "shell/browser/child_web_contents_tracker.cc",
     "shell/browser/child_web_contents_tracker.h",
     "shell/browser/common_web_contents_delegate.cc",
     "shell/browser/common_web_contents_delegate.h",
+    "shell/browser/common_web_contents_delegate_mac.mm",
+    "shell/browser/common_web_contents_delegate_views.cc",
     "shell/browser/cookie_change_notifier.cc",
     "shell/browser/cookie_change_notifier.h",
     "shell/browser/electron_autofill_driver.cc",
@@ -345,6 +163,8 @@ filenames = {
     "shell/browser/electron_browser_context.h",
     "shell/browser/electron_browser_main_parts.cc",
     "shell/browser/electron_browser_main_parts.h",
+    "shell/browser/electron_browser_main_parts_mac.mm",
+    "shell/browser/electron_browser_main_parts_posix.cc",
     "shell/browser/electron_download_manager_delegate.cc",
     "shell/browser/electron_download_manager_delegate.h",
     "shell/browser/electron_gpu_client.cc",
@@ -363,20 +183,32 @@ filenames = {
     "shell/browser/electron_web_ui_controller_factory.h",
     "shell/browser/event_emitter_mixin.cc",
     "shell/browser/event_emitter_mixin.h",
-    "shell/browser/extended_web_contents_observer.h",
     "shell/browser/feature_list.cc",
     "shell/browser/feature_list.h",
-    "shell/browser/file_select_helper.cc",
-    "shell/browser/file_select_helper.h",
-    "shell/browser/file_select_helper_mac.mm",
     "shell/browser/font_defaults.cc",
     "shell/browser/font_defaults.h",
     "shell/browser/javascript_environment.cc",
     "shell/browser/javascript_environment.h",
     "shell/browser/lib/bluetooth_chooser.cc",
     "shell/browser/lib/bluetooth_chooser.h",
+    "shell/browser/lib/power_observer_linux.cc",
+    "shell/browser/lib/power_observer_linux.h",
+    "shell/browser/linux/unity_service.cc",
+    "shell/browser/linux/unity_service.h",
     "shell/browser/login_handler.cc",
     "shell/browser/login_handler.h",
+    "shell/browser/mac/dict_util.h",
+    "shell/browser/mac/dict_util.mm",
+    "shell/browser/mac/electron_application.h",
+    "shell/browser/mac/electron_application.mm",
+    "shell/browser/mac/electron_application_delegate.h",
+    "shell/browser/mac/electron_application_delegate.mm",
+    "shell/browser/mac/in_app_purchase.h",
+    "shell/browser/mac/in_app_purchase.mm",
+    "shell/browser/mac/in_app_purchase_observer.h",
+    "shell/browser/mac/in_app_purchase_observer.mm",
+    "shell/browser/mac/in_app_purchase_product.h",
+    "shell/browser/mac/in_app_purchase_product.mm",
     "shell/browser/media/media_capture_devices_dispatcher.cc",
     "shell/browser/media/media_capture_devices_dispatcher.h",
     "shell/browser/media/media_device_id_salt.cc",
@@ -387,9 +219,18 @@ filenames = {
     "shell/browser/microtasks_runner.h",
     "shell/browser/native_browser_view.cc",
     "shell/browser/native_browser_view.h",
+    "shell/browser/native_browser_view_mac.h",
+    "shell/browser/native_browser_view_mac.mm",
+    "shell/browser/native_browser_view_views.cc",
+    "shell/browser/native_browser_view_views.h",
     "shell/browser/native_window.cc",
     "shell/browser/native_window.h",
+    "shell/browser/native_window_mac.h",
+    "shell/browser/native_window_mac.mm",
     "shell/browser/native_window_observer.h",
+    "shell/browser/native_window_views.cc",
+    "shell/browser/native_window_views.h",
+    "shell/browser/native_window_views_win.cc",
     "shell/browser/net/asar/asar_url_loader.cc",
     "shell/browser/net/asar/asar_url_loader.h",
     "shell/browser/net/cert_verifier_client.cc",
@@ -417,6 +258,16 @@ filenames = {
     "shell/browser/network_hints_handler_impl.h",
     "shell/browser/node_debugger.cc",
     "shell/browser/node_debugger.h",
+    "shell/browser/notifications/linux/libnotify_notification.cc",
+    "shell/browser/notifications/linux/libnotify_notification.h",
+    "shell/browser/notifications/linux/notification_presenter_linux.cc",
+    "shell/browser/notifications/linux/notification_presenter_linux.h",
+    "shell/browser/notifications/mac/cocoa_notification.h",
+    "shell/browser/notifications/mac/cocoa_notification.mm",
+    "shell/browser/notifications/mac/notification_center_delegate.h",
+    "shell/browser/notifications/mac/notification_center_delegate.mm",
+    "shell/browser/notifications/mac/notification_presenter_mac.h",
+    "shell/browser/notifications/mac/notification_presenter_mac.mm",
     "shell/browser/notifications/notification.cc",
     "shell/browser/notifications/notification.h",
     "shell/browser/notifications/notification_delegate.h",
@@ -424,6 +275,21 @@ filenames = {
     "shell/browser/notifications/notification_presenter.h",
     "shell/browser/notifications/platform_notification_service.cc",
     "shell/browser/notifications/platform_notification_service.h",
+    "shell/browser/notifications/win/notification_presenter_win.cc",
+    "shell/browser/notifications/win/notification_presenter_win.h",
+    "shell/browser/notifications/win/notification_presenter_win7.cc",
+    "shell/browser/notifications/win/notification_presenter_win7.h",
+    "shell/browser/notifications/win/win32_desktop_notifications/common.h",
+    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc",
+    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast.cc",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast.h",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h",
+    "shell/browser/notifications/win/win32_notification.cc",
+    "shell/browser/notifications/win/win32_notification.h",
+    "shell/browser/notifications/win/windows_toast_notification.cc",
+    "shell/browser/notifications/win/windows_toast_notification.h",
     "shell/browser/plugins/plugin_utils.cc",
     "shell/browser/plugins/plugin_utils.h",
     "shell/browser/pref_store_delegate.cc",
@@ -432,6 +298,9 @@ filenames = {
     "shell/browser/protocol_registry.h",
     "shell/browser/relauncher.cc",
     "shell/browser/relauncher.h",
+    "shell/browser/relauncher_linux.cc",
+    "shell/browser/relauncher_mac.cc",
+    "shell/browser/relauncher_win.cc",
     "shell/browser/session_preferences.cc",
     "shell/browser/session_preferences.h",
     "shell/browser/special_storage_policy.cc",
@@ -441,27 +310,116 @@ filenames = {
     "shell/browser/ui/autofill_popup.cc",
     "shell/browser/ui/autofill_popup.h",
     "shell/browser/ui/certificate_trust.h",
+    "shell/browser/ui/certificate_trust_mac.mm",
+    "shell/browser/ui/certificate_trust_win.cc",
+    "shell/browser/ui/cocoa/NSColor+Hex.h",
+    "shell/browser/ui/cocoa/NSColor+Hex.mm",
+    "shell/browser/ui/cocoa/NSString+ANSI.h",
+    "shell/browser/ui/cocoa/NSString+ANSI.mm",
+    "shell/browser/ui/cocoa/delayed_native_view_host.cc",
+    "shell/browser/ui/cocoa/delayed_native_view_host.h",
+    "shell/browser/ui/cocoa/electron_bundle_mover.h",
+    "shell/browser/ui/cocoa/electron_bundle_mover.mm",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
+    "shell/browser/ui/cocoa/electron_menu_controller.h",
+    "shell/browser/ui/cocoa/electron_menu_controller.mm",
+    "shell/browser/ui/cocoa/electron_native_widget_mac.h",
+    "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
+    "shell/browser/ui/cocoa/electron_ns_window.h",
+    "shell/browser/ui/cocoa/electron_ns_window.mm",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
+    "shell/browser/ui/cocoa/electron_preview_item.h",
+    "shell/browser/ui/cocoa/electron_preview_item.mm",
+    "shell/browser/ui/cocoa/electron_touch_bar.h",
+    "shell/browser/ui/cocoa/electron_touch_bar.mm",
+    "shell/browser/ui/cocoa/event_dispatching_window.h",
+    "shell/browser/ui/cocoa/event_dispatching_window.mm",
+    "shell/browser/ui/cocoa/root_view_mac.h",
+    "shell/browser/ui/cocoa/root_view_mac.mm",
+    "shell/browser/ui/cocoa/views_delegate_mac.h",
+    "shell/browser/ui/cocoa/views_delegate_mac.mm",
     "shell/browser/ui/devtools_manager_delegate.cc",
     "shell/browser/ui/devtools_manager_delegate.h",
     "shell/browser/ui/devtools_ui.cc",
     "shell/browser/ui/devtools_ui.h",
-    "shell/browser/ui/drag_util.cc",
     "shell/browser/ui/drag_util.h",
+    "shell/browser/ui/drag_util_mac.mm",
+    "shell/browser/ui/drag_util_views.cc",
     "shell/browser/ui/electron_menu_model.cc",
     "shell/browser/ui/electron_menu_model.h",
     "shell/browser/ui/file_dialog.h",
+    "shell/browser/ui/file_dialog_gtk.cc",
+    "shell/browser/ui/file_dialog_mac.mm",
+    "shell/browser/ui/file_dialog_win.cc",
     "shell/browser/ui/inspectable_web_contents.cc",
     "shell/browser/ui/inspectable_web_contents.h",
     "shell/browser/ui/inspectable_web_contents_delegate.h",
     "shell/browser/ui/inspectable_web_contents_view.h",
     "shell/browser/ui/inspectable_web_contents_view_delegate.cc",
     "shell/browser/ui/inspectable_web_contents_view_delegate.h",
+    "shell/browser/ui/inspectable_web_contents_view_mac.h",
+    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
     "shell/browser/ui/message_box.h",
+    "shell/browser/ui/message_box_gtk.cc",
+    "shell/browser/ui/message_box_mac.mm",
+    "shell/browser/ui/message_box_win.cc",
     "shell/browser/ui/tray_icon.cc",
     "shell/browser/ui/tray_icon.h",
+    "shell/browser/ui/tray_icon_cocoa.h",
+    "shell/browser/ui/tray_icon_cocoa.mm",
+    "shell/browser/ui/tray_icon_gtk.cc",
+    "shell/browser/ui/tray_icon_gtk.h",
     "shell/browser/ui/tray_icon_observer.h",
+    "shell/browser/ui/tray_icon_win.cc",
+    "shell/browser/ui/views/autofill_popup_view.cc",
+    "shell/browser/ui/views/autofill_popup_view.h",
+    "shell/browser/ui/views/electron_views_delegate.cc",
+    "shell/browser/ui/views/electron_views_delegate.h",
+    "shell/browser/ui/views/electron_views_delegate_win.cc",
+    "shell/browser/ui/views/frameless_view.cc",
+    "shell/browser/ui/views/frameless_view.h",
+    "shell/browser/ui/views/global_menu_bar_x11.cc",
+    "shell/browser/ui/views/global_menu_bar_x11.h",
+    "shell/browser/ui/views/inspectable_web_contents_view_views.cc",
+    "shell/browser/ui/views/inspectable_web_contents_view_views.h",
+    "shell/browser/ui/views/menu_bar.cc",
+    "shell/browser/ui/views/menu_bar.h",
+    "shell/browser/ui/views/menu_delegate.cc",
+    "shell/browser/ui/views/menu_delegate.h",
+    "shell/browser/ui/views/menu_model_adapter.cc",
+    "shell/browser/ui/views/menu_model_adapter.h",
+    "shell/browser/ui/views/native_frame_view.cc",
+    "shell/browser/ui/views/native_frame_view.h",
+    "shell/browser/ui/views/root_view.cc",
+    "shell/browser/ui/views/root_view.h",
+    "shell/browser/ui/views/submenu_button.cc",
+    "shell/browser/ui/views/submenu_button.h",
+    "shell/browser/ui/views/win_frame_view.cc",
+    "shell/browser/ui/views/win_frame_view.h",
     "shell/browser/ui/webui/accessibility_ui.cc",
     "shell/browser/ui/webui/accessibility_ui.h",
+    "shell/browser/ui/win/dialog_thread.cc",
+    "shell/browser/ui/win/dialog_thread.h",
+    "shell/browser/ui/win/electron_desktop_native_widget_aura.cc",
+    "shell/browser/ui/win/electron_desktop_native_widget_aura.h",
+    "shell/browser/ui/win/electron_desktop_window_tree_host_win.cc",
+    "shell/browser/ui/win/electron_desktop_window_tree_host_win.h",
+    "shell/browser/ui/win/jump_list.cc",
+    "shell/browser/ui/win/jump_list.h",
+    "shell/browser/ui/win/notify_icon.cc",
+    "shell/browser/ui/win/notify_icon.h",
+    "shell/browser/ui/win/notify_icon_host.cc",
+    "shell/browser/ui/win/notify_icon_host.h",
+    "shell/browser/ui/win/taskbar_host.cc",
+    "shell/browser/ui/win/taskbar_host.h",
+    "shell/browser/ui/x/event_disabler.cc",
+    "shell/browser/ui/x/event_disabler.h",
+    "shell/browser/ui/x/window_state_watcher.cc",
+    "shell/browser/ui/x/window_state_watcher.h",
+    "shell/browser/ui/x/x_window_utils.cc",
+    "shell/browser/ui/x/x_window_utils.h",
     "shell/browser/unresponsive_suppressor.cc",
     "shell/browser/unresponsive_suppressor.h",
     "shell/browser/web_contents_permission_helper.cc",
@@ -476,6 +434,8 @@ filenames = {
     "shell/browser/web_view_guest_delegate.h",
     "shell/browser/web_view_manager.cc",
     "shell/browser/web_view_manager.h",
+    "shell/browser/win/scoped_hstring.cc",
+    "shell/browser/win/scoped_hstring.h",
     "shell/browser/window_list.cc",
     "shell/browser/window_list.h",
     "shell/browser/window_list_observer.h",
@@ -484,10 +444,13 @@ filenames = {
     "shell/common/api/electron_api_asar.cc",
     "shell/common/api/electron_api_clipboard.cc",
     "shell/common/api/electron_api_clipboard.h",
+    "shell/common/api/electron_api_clipboard_mac.mm",
     "shell/common/api/electron_api_command_line.cc",
     "shell/common/api/electron_api_key_weak_map.h",
     "shell/common/api/electron_api_native_image.cc",
     "shell/common/api/electron_api_native_image.h",
+    "shell/common/api/electron_api_native_image_mac.mm",
+    "shell/common/api/electron_api_native_image_win.cc",
     "shell/common/api/electron_api_shell.cc",
     "shell/common/api/electron_api_v8_util.cc",
     "shell/common/api/electron_bindings.cc",
@@ -497,6 +460,9 @@ filenames = {
     "shell/common/api/object_life_monitor.h",
     "shell/common/application_info.cc",
     "shell/common/application_info.h",
+    "shell/common/application_info_linux.cc",
+    "shell/common/application_info_mac.mm",
+    "shell/common/application_info_win.cc",
     "shell/common/asar/archive.cc",
     "shell/common/asar/archive.h",
     "shell/common/asar/asar_util.cc",
@@ -524,6 +490,7 @@ filenames = {
     "shell/common/gin_converters/file_path_converter.h",
     "shell/common/gin_converters/gfx_converter.cc",
     "shell/common/gin_converters/gfx_converter.h",
+    "shell/common/gin_converters/guid_converter.h",
     "shell/common/gin_converters/gurl_converter.h",
     "shell/common/gin_converters/image_converter.cc",
     "shell/common/gin_converters/image_converter.h",
@@ -579,16 +546,32 @@ filenames = {
     "shell/common/keyboard_util.cc",
     "shell/common/keyboard_util.h",
     "shell/common/language_util.h",
+    "shell/common/language_util_linux.cc",
+    "shell/common/language_util_mac.mm",
+    "shell/common/language_util_win.cc",
+    "shell/common/mac/main_application_bundle.h",
+    "shell/common/mac/main_application_bundle.mm",
     "shell/common/mouse_util.cc",
     "shell/common/mouse_util.h",
     "shell/common/node_bindings.cc",
     "shell/common/node_bindings.h",
+    "shell/common/node_bindings_linux.cc",
+    "shell/common/node_bindings_linux.h",
+    "shell/common/node_bindings_mac.cc",
+    "shell/common/node_bindings_mac.h",
+    "shell/common/node_bindings_win.cc",
+    "shell/common/node_bindings_win.h",
     "shell/common/node_includes.h",
     "shell/common/node_util.cc",
     "shell/common/node_util.h",
     "shell/common/options_switches.cc",
     "shell/common/options_switches.h",
+    "shell/common/platform_util.cc",
     "shell/common/platform_util.h",
+    "shell/common/platform_util_internal.h",
+    "shell/common/platform_util_linux.cc",
+    "shell/common/platform_util_mac.mm",
+    "shell/common/platform_util_win.cc",
     "shell/common/process_util.cc",
     "shell/common/process_util.h",
     "shell/common/skia_util.cc",

lib/browser/api/browser-window.ts

@@ -92,11 +92,7 @@ BrowserWindow.getFocusedWindow = () => {
 };
 
 BrowserWindow.fromWebContents = (webContents: WebContents) => {
-  for (const window of BrowserWindow.getAllWindows()) {
-    if (window.webContents && window.webContents.equal(webContents)) return window;
-  }
-
-  return null;
+  return webContents.getOwnerBrowserWindow();
 };
 
 BrowserWindow.fromBrowserView = (browserView: BrowserView) => {

lib/browser/api/crash-reporter.ts

@@ -13,7 +13,7 @@ class CrashReporter {
       submitURL,
       uploadToServer = true,
       rateLimit = false,
-      compress = false
+      compress = true
     } = options || {};
 
     if (submitURL == null) throw new Error('submitURL is a required option to crashReporter.start');

lib/browser/api/menu-utils.ts

@@ -157,12 +157,9 @@ function sortGroups<T> (groups: {id?: T}[][]) {
   return sortedGroupIndexes.map(i => groups[i]);
 }
 
-export function sortMenuItems (menuItems: (Electron.MenuItemConstructorOptions | Electron.MenuItem)[]) {
-  const isSeparator = (i: Electron.MenuItemConstructorOptions | Electron.MenuItem) => {
-    const opts = i as Electron.MenuItemConstructorOptions;
-    return i.type === 'separator' && !opts.before && !opts.after && !opts.beforeGroupContaining && !opts.afterGroupContaining;
-  };
-  const separators = menuItems.filter(isSeparator);
+export function sortMenuItems (menuItems: {type?: string, id?: string}[]) {
+  const isSeparator = (item: {type?: string}) => item.type === 'separator';
+  const separators = menuItems.filter(i => i.type === 'separator');
 
   // Split the items into their implicit groups based upon separators.
   const groups = splitArray(menuItems, isSeparator);

lib/browser/api/menu.ts

@@ -182,11 +182,11 @@ Menu.buildFromTemplate = function (template) {
     throw new TypeError('Invalid template for MenuItem: must have at least one of label, role or type');
   }
 
-  const sorted = sortTemplate(template);
-  const filtered = removeExtraSeparators(sorted);
+  const filtered = removeExtraSeparators(template);
+  const sorted = sortTemplate(filtered);
 
   const menu = new Menu();
-  filtered.forEach(item => {
+  sorted.forEach(item => {
     if (item instanceof MenuItem) {
       menu.append(item);
     } else {

lib/browser/api/net.ts

@@ -362,7 +362,7 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
     delete this._urlLoaderOptions.extraHeaders[key];
   }
 
-  _write (chunk: Buffer, encoding: string, callback: () => void) {
+  _write (chunk: Buffer, encoding: BufferEncoding, callback: () => void) {
     this._firstWrite = true;
     if (!this._body) {
       this._body = new SlurpStream();
@@ -481,6 +481,14 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
   }
 
   _die (err?: Error) {
+    // Node.js assumes that any stream which is ended is no longer capable of emitted events
+    // which is a faulty assumption for the case of an object that is acting like a stream
+    // (our urlRequest). If we don't emit here, this causes errors since we *do* expect
+    // that error events can be emitted after urlRequest.end().
+    if ((this as any)._writableState.destroyed && err) {
+      this.emit('error', err);
+    }
+
     this.destroy(err);
     if (this._urlLoader) {
       this._urlLoader.cancel();

lib/browser/api/web-contents.ts

@@ -462,7 +462,8 @@ const addReturnValueToEvent = (event: any) => {
 };
 
 const loggingEnabled = () => {
-  return process.env.ELECTRON_ENABLE_LOGGING || app.commandLine.hasSwitch('enable-logging');
+  return Object.prototype.hasOwnProperty.call(process.env, 'ELECTRON_ENABLE_LOGGING') ||
+    process.argv.some(arg => arg.toLowerCase().startsWith('--enable-logging'));
 };
 
 // Add JavaScript wrappers for WebContents class.
@@ -547,17 +548,17 @@ WebContents.prototype._init = function () {
 
   this.on('crashed', (event, ...args) => {
     app.emit('renderer-process-crashed', event, this, ...args);
-  });
-
-  this.on('render-process-gone', (event, details) => {
-    app.emit('render-process-gone', event, this, details);
 
     // Log out a hint to help users better debug renderer crashes.
     if (loggingEnabled()) {
-      console.info(`Renderer process ${details.reason} - see https://www.electronjs.org/docs/tutorial/application-debugging for potential debugging information.`);
+      console.info('Renderer process crashed - see https://www.electronjs.org/docs/tutorial/application-debugging for potential debugging information.');
     }
   });
 
+  this.on('render-process-gone', (event, ...args) => {
+    app.emit('render-process-gone', event, this, ...args);
+  });
+
   // The devtools requests the webContents to reload.
   this.on('devtools-reload-page', function (this: Electron.WebContentsInternal) {
     this.reload();
@@ -615,15 +616,6 @@ WebContents.prototype._init = function () {
     app.emit('login', event, this, ...args);
   });
 
-  this.on('ready-to-show' as any, () => {
-    const owner = this.getOwnerBrowserWindow();
-    if (owner && !owner.isDestroyed()) {
-      process.nextTick(() => {
-        owner.emit('ready-to-show');
-      });
-    }
-  });
-
   const event = process._linkedBinding('electron_browser_event').createEmpty();
   app.emit('web-contents-created', event, this);
 

lib/browser/init.ts

@@ -4,6 +4,7 @@ import * as fs from 'fs';
 import { Socket } from 'net';
 import * as path from 'path';
 import * as util from 'util';
+
 const Module = require('module');
 
 // We modified the original process.argv to let node.js load the init.js,
@@ -62,7 +63,7 @@ process.on('uncaughtException', function (error) {
 // Emit 'exit' event on quit.
 const { app } = require('electron');
 
-app.on('quit', function (event, exitCode) {
+app.on('quit', (_event, exitCode) => {
   process.emit('exit', exitCode);
 });
 

lib/browser/remote/server.ts

@@ -353,7 +353,7 @@ handleRemoteCommand('ELECTRON_BROWSER_REQUIRE', function (event, contextId, modu
     if (customEvent.defaultPrevented) {
       throw new Error(`Blocked remote.require('${moduleName}')`);
     } else {
-      customEvent.returnValue = process.mainModule!.require(moduleName);
+      customEvent.returnValue = (process as any).mainModule.require(moduleName);
     }
   }
 

lib/common/api/shell.ts

@@ -1 +1,7 @@
-export default process._linkedBinding('electron_common_shell');
+import { deprecate } from 'electron/main';
+
+const shell = process._linkedBinding('electron_common_shell');
+
+shell.moveItemToTrash = deprecate.renameFunction(shell.moveItemToTrash, 'shell.trashItem');
+
+export default shell;

lib/common/parse-features-string.ts

@@ -38,7 +38,7 @@ const keysOfTypeNumber = ['top', 'left', ...Object.keys(keysOfTypeNumberCompileT
 type CoercedValue = string | number | boolean;
 function coerce (key: string, value: string): CoercedValue {
   if (keysOfTypeNumber.includes(key)) {
-    return parseInt(value, 10);
+    return Number(value);
   }
 
   switch (value) {

lib/common/reset-search-paths.ts

@@ -43,10 +43,10 @@ if (process.type === 'renderer') {
 }
 
 const originalResolveFilename = Module._resolveFilename;
-Module._resolveFilename = function (request: string, parent: NodeModule, isMain: boolean, options?: { paths: Array<string>}) {
+Module._resolveFilename = function (request: string, parent: NodeModule, isMain: boolean) {
   if (request === 'electron' || request.startsWith('electron/')) {
     return 'electron';
   } else {
-    return originalResolveFilename(request, parent, isMain, options);
+    return originalResolveFilename(request, parent, isMain);
   }
 };

lib/renderer/api/remote.ts

@@ -3,9 +3,12 @@ import { isPromise, isSerializableObject, serialize, deserialize } from '../../c
 import { MetaTypeFromRenderer, ObjectMember, ObjProtoDescriptor, MetaType } from '../../common/remote/types';
 import { ipcRendererInternal } from '../ipc-renderer-internal';
 import type { BrowserWindow, WebContents } from 'electron/main';
+import deprecate from '@electron/internal/common/api/deprecate';
 import { browserModuleNames } from '@electron/internal/browser/api/module-names';
 import { commonModuleList } from '@electron/internal/common/api/module-list';
 
+deprecate.log('The remote module is deprecated. Use https://github.com/electron/remote instead.');
+
 const v8Util = process._linkedBinding('electron_common_v8_util');
 const { hasSwitch } = process._linkedBinding('electron_common_command_line');
 
@@ -298,7 +301,7 @@ function metaToError (meta: { type: 'error', value: any, members: ObjectMember[]
 }
 
 function handleMessage (channel: string, handler: Function) {
-  ipcRendererInternal.onMessageFromMain(channel, (event, passedContextId, id, ...args) => {
+  ipcRendererInternal.on(channel, (event, passedContextId, id, ...args) => {
     if (passedContextId === contextId) {
       handler(id, ...args);
     } else {

lib/renderer/ipc-renderer-internal-utils.ts

@@ -3,7 +3,7 @@ import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-in
 type IPCHandler = (event: Electron.IpcRendererEvent, ...args: any[]) => any
 
 export const handle = function <T extends IPCHandler> (channel: string, handler: T) {
-  ipcRendererInternal.onMessageFromMain(channel, async (event, requestId, ...args) => {
+  ipcRendererInternal.on(channel, async (event, requestId, ...args) => {
     const replyChannel = `${channel}_RESPONSE_${requestId}`;
     try {
       event.sender.send(replyChannel, null, await handler(event, ...args));

lib/renderer/ipc-renderer-internal.ts

@@ -29,27 +29,4 @@ ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[])
   return result;
 };
 
-ipcRendererInternal.onMessageFromMain = function (channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
-  return ipcRendererInternal.on(channel, (event, ...args) => {
-    if (event.senderId !== 0) {
-      console.error(`Message ${channel} sent by unexpected WebContents (${event.senderId})`);
-      return;
-    }
-
-    listener(event, ...args);
-  });
-};
-
-ipcRendererInternal.onceMessageFromMain = function (channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
-  return ipcRendererInternal.on(channel, function wrapper (event, ...args) {
-    if (event.senderId !== 0) {
-      console.error(`Message ${channel} sent by unexpected WebContents (${event.senderId})`);
-      return;
-    }
-
-    ipcRendererInternal.removeListener(channel, wrapper);
-    listener(event, ...args);
-  });
-};
-
 export { ipcRendererInternal };

lib/renderer/security-warnings.ts

@@ -76,9 +76,8 @@ const isLocalhost = function () {
  *
  * @returns {boolean} Is a CSP with `unsafe-eval` set?
  */
-const isUnsafeEvalEnabled: () => Promise<boolean> = function () {
-  // Call _executeJavaScript to bypass the world-safe deprecation warning
-  return (webFrame as any)._executeJavaScript(`(${(() => {
+const isUnsafeEvalEnabled = function () {
+  return webFrame.executeJavaScript(`(${(() => {
     try {
       new Function(''); // eslint-disable-line no-new,no-new-func
     } catch {

lib/renderer/web-view/guest-view-internal.ts

@@ -66,18 +66,18 @@ const dispatchEvent = function (
 };
 
 export function registerEvents (webView: WebViewImpl, viewInstanceId: number) {
-  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
+  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
     webView.guestInstanceId = undefined;
     webView.reset();
     const domEvent = new Event('destroyed');
     webView.dispatchEvent(domEvent);
   });
 
-  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
+  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
     dispatchEvent(webView, eventName, eventName, ...args);
   });
 
-  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`, function (event, channel, ...args) {
+  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`, function (event, channel, ...args) {
     const domEvent = new Event('ipc-message') as IpcMessageEvent;
     domEvent.channel = channel;
     domEvent.args = args;

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

@@ -17,7 +17,7 @@ interface MutationHandler {
 
 // Attribute objects.
 // Default implementation of a WebView attribute.
-export class WebViewAttribute implements MutationHandler {
+class WebViewAttribute implements MutationHandler {
   public value: any;
   public ignoreMutation = false;
 
@@ -78,7 +78,7 @@ class BooleanAttribute extends WebViewAttribute {
 }
 
 // Attribute representing the state of the storage partition.
-export class PartitionAttribute extends WebViewAttribute {
+class PartitionAttribute extends WebViewAttribute {
   public validPartitionId = true
 
   constructor (public webViewImpl: WebViewImpl) {
@@ -102,7 +102,7 @@ export class PartitionAttribute extends WebViewAttribute {
 }
 
 // Attribute that handles the location and navigation of the webview.
-export class SrcAttribute extends WebViewAttribute {
+class SrcAttribute extends WebViewAttribute {
   public observer!: MutationObserver;
 
   constructor (public webViewImpl: WebViewImpl) {
@@ -168,7 +168,7 @@ export class SrcAttribute extends WebViewAttribute {
   }
 
   public parse () {
-    if (!this.webViewImpl.elementAttached || !(this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION) as PartitionAttribute).validPartitionId || !this.getValue()) {
+    if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].validPartitionId || !this.getValue()) {
       return;
     }
     if (this.webViewImpl.guestInstanceId == null) {
@@ -182,12 +182,12 @@ export class SrcAttribute extends WebViewAttribute {
     // Navigate to |this.src|.
     const opts: Record<string, string> = {};
 
-    const httpreferrer = this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER)!.getValue();
+    const httpreferrer = this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER].getValue();
     if (httpreferrer) {
       opts.httpReferrer = httpreferrer;
     }
 
-    const useragent = this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT)!.getValue();
+    const useragent = this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT].getValue();
     if (useragent) {
       opts.userAgent = useragent;
     }
@@ -274,18 +274,19 @@ class EnableRemoteModuleAttribute extends WebViewAttribute {
 
 // Sets up all of the webview attributes.
 WebViewImpl.prototype.setupWebViewAttributes = function () {
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION, new PartitionAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC, new SrcAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER, new HttpReferrerAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT, new UserAgentAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE, new EnableRemoteModuleAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD, new PreloadAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES, new BlinkFeaturesAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES, new DisableBlinkFeaturesAttribute(this));
-  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES, new WebPreferencesAttribute(this));
+  this.attributes = {};
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION] = new PartitionAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC] = new SrcAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT] = new UserAgentAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE] = new EnableRemoteModuleAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES] = new BlinkFeaturesAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES] = new DisableBlinkFeaturesAttribute(this);
+  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES] = new WebPreferencesAttribute(this);
 };

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

@@ -16,6 +16,9 @@ export const enum WEB_VIEW_CONSTANTS {
   ATTRIBUTE_DISABLEBLINKFEATURES = 'disableblinkfeatures',
   ATTRIBUTE_WEBPREFERENCES = 'webpreferences',
 
+  // Internal attribute.
+  ATTRIBUTE_INTERNALINSTANCEID = 'internalinstanceid',
+
   // Error messages.
   ERROR_MSG_ALREADY_NAVIGATED = 'The object has already navigated, so its partition cannot be changed.',
   ERROR_MSG_CANNOT_INJECT_SCRIPT = '<webview> = ' + 'Script cannot be injected into content until the page has loaded.',

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

@@ -10,7 +10,6 @@
 
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
 import { WebViewImpl as IWebViewImpl, webViewImplModule } from '@electron/internal/renderer/web-view/web-view-impl';
-import type { SrcAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 
 // Return a WebViewElement class that is defined in this context.
 const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof webViewImplModule) => {
@@ -50,7 +49,7 @@ const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof
       if (!internal.elementAttached) {
         guestViewInternal.registerEvents(internal, internal.viewInstanceId);
         internal.elementAttached = true;
-        (internal.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC) as SrcAttribute).parse();
+        internal.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC].parse();
       }
     }
 

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

@@ -5,7 +5,6 @@ import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-inte
 import * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal';
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
 import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods';
-import type { WebViewAttribute, PartitionAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 import { deserialize } from '@electron/internal/common/type-utils';
 const { webFrame } = electron;
 
@@ -34,7 +33,7 @@ export class WebViewImpl {
   public internalElement: HTMLIFrameElement
 
   // Replaced in web-view-attributes
-  public attributes = new Map<string, WebViewAttribute>();
+  public attributes: Record<string, any> = {}
   public setupWebViewAttributes (): void {}
 
   constructor (public webviewNode: HTMLElement) {
@@ -77,7 +76,7 @@ export class WebViewImpl {
     }
 
     this.beforeFirstNavigation = true;
-    (this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION) as PartitionAttribute).validPartitionId = true;
+    this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].validPartitionId = true;
 
     // Since attachment swaps a local frame for a remote frame, we need our
     // internal iframe element to be local again before we can reattach.
@@ -96,12 +95,12 @@ export class WebViewImpl {
   // attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
   // details.
   handleWebviewAttributeMutation (attributeName: string, oldValue: any, newValue: any) {
-    if (!this.attributes.has(attributeName) || this.attributes.get(attributeName)!.ignoreMutation) {
+    if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
       return;
     }
 
     // Let the changed attribute handle its own mutation
-    this.attributes.get(attributeName)!.handleMutation(oldValue, newValue);
+    this.attributes[attributeName].handleMutation(oldValue, newValue);
   }
 
   onElementResize () {
@@ -150,7 +149,7 @@ export class WebViewImpl {
       // Touching the src attribute triggers a navigation. To avoid
       // triggering a page reload on every guest-initiated navigation,
       // we do not handle this mutation.
-      this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC)!.setValueIgnoreMutation(newValue);
+      this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue);
     }
   }
 
@@ -164,7 +163,7 @@ export class WebViewImpl {
   }
 
   onAttach (storagePartitionId: number) {
-    return this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION)!.setValue(storagePartitionId);
+    return this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].setValue(storagePartitionId);
   }
 
   buildParams () {
@@ -173,8 +172,10 @@ export class WebViewImpl {
       userAgentOverride: this.userAgentOverride
     };
 
-    for (const [attributeName, attribute] of this.attributes) {
-      params[attributeName] = attribute.getValue();
+    for (const attributeName in this.attributes) {
+      if (Object.prototype.hasOwnProperty.call(this.attributes, attributeName)) {
+        params[attributeName] = this.attributes[attributeName].getValue();
+      }
     }
 
     return params;

lib/renderer/window-setup.ts

@@ -181,7 +181,7 @@ class BrowserWindowProxy {
     this.guestId = guestId;
     this._location = new LocationProxy(guestId);
 
-    ipcRendererInternal.onceMessageFromMain(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => {
+    ipcRendererInternal.once(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => {
       removeProxy(guestId);
       this.closed = true;
     });
@@ -281,7 +281,7 @@ export const windowSetup = (
   if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueFromIsolatedWorld(['prompt'], window.prompt);
 
   if (!usesNativeWindowOpen || openerId != null) {
-    ipcRendererInternal.onMessageFromMain('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
+    ipcRendererInternal.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
       _event, sourceId: number, message: any, sourceOrigin: string
     ) {
       // Manually dispatch event instead of using postMessage because we also need to
@@ -336,7 +336,7 @@ export const windowSetup = (
     let cachedVisibilityState = isHiddenPage ? 'hidden' : 'visible';
 
     // Subscribe to visibilityState changes.
-    ipcRendererInternal.onMessageFromMain('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', function (_event, visibilityState: VisibilityState) {
+    ipcRendererInternal.on('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', function (_event, visibilityState: VisibilityState) {
       if (cachedVisibilityState !== visibilityState) {
         cachedVisibilityState = visibilityState;
         document.dispatchEvent(new Event('visibilitychange'));

npm/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@electron/get": "^1.0.1",
-    "@types/node": "^12.0.12",
+    "@types/node": "^14.6.2",
     "extract-zip": "^1.0.3"
   },
   "engines": {

package.json

@@ -1,12 +1,11 @@
 {
   "name": "electron",
-  "version": "11.0.2",
+  "version": "12.0.0-nightly.20200923",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
-    "@electron/docs-parser": "^0.10.0",
-    "@electron/typescript-definitions": "^8.7.5",
-    "@octokit/auth-app": "^2.10.0",
+    "@electron/docs-parser": "^0.9.1",
+    "@electron/typescript-definitions": "^8.7.9",
     "@octokit/rest": "^18.0.3",
     "@primer/octicons": "^10.0.0",
     "@types/basic-auth": "^1.1.3",
@@ -17,7 +16,7 @@
     "@types/express": "^4.17.7",
     "@types/fs-extra": "^9.0.1",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^12.12.6",
+    "@types/node": "^14.6.2",
     "@types/semver": "^7.3.3",
     "@types/send": "^0.14.5",
     "@types/split": "^1.0.0",

patches/boringssl/expose_aes-cfb.patch

@@ -57,10 +57,10 @@ index 53cb9d2dc8f1962a70dc12b648d27c32be8aca4b..84af06fc56e4aa72d4d48801d7c037ad
    callback(EVP_aes_192_ctr(), "aes-192-ctr", NULL, arg);
    callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
 diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
-index 31390a3f63a1e88d50c22fa8c0d3b53610ebda68..792ae8feaa53229e3f6f9130269b268f43ded8d6 100644
+index d22a6c216a2afe29f9507c90a190a4c6992c06a5..0bde0af4b25fbc24ee479b0ffffa037481c71e53 100644
 --- a/include/openssl/cipher.h
 +++ b/include/openssl/cipher.h
-@@ -430,6 +430,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
+@@ -424,6 +424,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
  
  // EVP_aes_128_cfb128 is only available in decrepit.
  OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);

patches/boringssl/expose_ripemd160.patch

@@ -80,7 +80,7 @@ index d540144b293297791c087e0b968a47d368a73695..53cb9d2dc8f1962a70dc12b648d27c32
 +  callback(EVP_ripemd160(), "ripemd160", NULL, arg);
  }
 diff --git a/include/openssl/digest.h b/include/openssl/digest.h
-index 8e398e8b87f199cf947e097cf99e175bfc9870da..6c0ce559681817cae3273a50e6533468f17177ee 100644
+index 7b0ed06cb352718a972be875d03d7c7c89489701..7072457224af3a66d1862f0028cb0ae17847f237 100644
 --- a/include/openssl/digest.h
 +++ b/include/openssl/digest.h
 @@ -89,6 +89,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_sha512_256(void);

patches/chromium/.patches

@@ -73,6 +73,7 @@ add_trustedauthclient_to_urlloaderfactory.patch
 feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
 accessible_pane_view.patch
 fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch
+use_electron_resources_in_pdf_util.patch
 hack_plugin_response_interceptor_to_point_to_electron.patch
 fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
 feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -92,16 +93,11 @@ crash_allow_disabling_compression_on_linux.patch
 allow_setting_secondary_label_via_simplemenumodel.patch
 fix_swap_global_proxies_before_initializing_the_windows_proxies.patch
 feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
+use_electron_resources_in_icon_reader_service.patch
 fix_patch_out_profile_refs_in_accessibility_ui.patch
 remove_some_deps_that_do_not_work_on_arm64.patch
 fix_check_issecureeventinputenabled_in_constructor_before_setting.patch
 skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
-cherry-pick-2f5b8357dca2.patch
-fix_use_electron_generated_resources.patch
-chore_expose_v8_initialization_isolate_callbacks.patch
-crashpad-initialize-logging.patch
 fix_properly_honor_printing_page_ranges.patch
-cherry-pick-8f5a08079948.patch
-cherry-pick-275865e8c237.patch
-use_public_apis_to_determine_if_a_font_is_a_system_font_in_mas_build.patch
+remove_deprecated_factory_parameter_for_worker_resource_loader.patch

patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

@@ -33,10 +33,10 @@ index 1bb696ec5a89fd2215e523a9e320c6d74bd79a42..c0cbe3a2920b0cb453b847be7a0dc8a1
      client->PostIOThreadCreated(gpu_process.io_task_runner());
  
 diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
-index 2231ce937692f567fd2d4661e4feea389e12203e..a281c7bd40dac0acf350d08683e7c71282a83e9a 100644
+index 88e80bdaecbdd9000109f638c6d79d8102d0e537..a0c0f17e6642dcd2690c095b95ff2c2de9b6ae4f 100644
 --- a/content/public/gpu/content_gpu_client.h
 +++ b/content/public/gpu/content_gpu_client.h
-@@ -31,6 +31,10 @@ class CONTENT_EXPORT ContentGpuClient {
+@@ -30,6 +30,10 @@ class CONTENT_EXPORT ContentGpuClient {
   public:
    virtual ~ContentGpuClient() {}
  

patches/chromium/add_didinstallconditionalfeatures.patch

@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index f63b17435218d0d67bba044da67c1c80015fc996..d0fe24182f2cb48a1333054ce44b6a7f49b2f053 100644
+index 8ab07f180b0e5d7baaa314cf1121c7182de7cce9..feb76f5278ba11f82c65e298d9772fc8742739a9 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -116,6 +116,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -115,6 +115,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
    virtual void DidHandleOnloadEvents() {}
    virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                        int32_t world_id) {}
@@ -23,10 +23,10 @@ index f63b17435218d0d67bba044da67c1c80015fc996..d0fe24182f2cb48a1333054ce44b6a7f
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 72a3bd4837f37bb1bab1f5ca48e90c41a297337f..23ff9cc13aaa97d395983dceb2a27158b2d679a5 100644
+index bcac6e71666b3f3a820a4311ab04e3d26d06618a..f9e97c36bca9c70af0c585b81902165c1ac6ba5d 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -5036,6 +5036,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4996,6 +4996,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index 72a3bd4837f37bb1bab1f5ca48e90c41a297337f..23ff9cc13aaa97d395983dceb2a27158
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 7c18f07de49c422a35a38e96aca6bc52c85050cb..0cb91fc8369f8a7b602b1f249c897a11014ad3ac 100644
+index 905845607558ac3af57ba33a1537ebb4ff0e8e7a..8e95993cc9ae88d57b373ff194e97976154fb91d 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -710,6 +710,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -717,6 +717,8 @@ class CONTENT_EXPORT RenderFrameImpl
    bool ShouldTrackUseCounter(const blink::WebURL& url) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,7 +53,7 @@ index 7c18f07de49c422a35a38e96aca6bc52c85050cb..0cb91fc8369f8a7b602b1f249c897a11
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 069ebc8bc53c4c0b27f99f13199b406c29dee3f5..e96d6b9454229339b93a20c2117f58f2ce746777 100644
+index eecf846eabce6429ef61f9ef333572644dcbe129..e490f7d5977f946e36a3a824ad60acc0d5629780 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
 @@ -535,6 +535,9 @@ class BLINK_EXPORT WebLocalFrameClient {
@@ -67,7 +67,7 @@ index 069ebc8bc53c4c0b27f99f13199b406c29dee3f5..e96d6b9454229339b93a20c2117f58f2
    virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
                                          int32_t world_id) {}
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index be4c8053f2bc5e2ad9da6a038a1a70edb37656c9..953e436fc09e9afa2189ad2ebdfdb085cabe51a7 100644
+index 4f4efaadcc60ed5d60fca74b9938b472eb67295d..6ec9d80ba9c4e167c5ec474e8de6ea655e928481 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 @@ -203,6 +203,7 @@ void LocalWindowProxy::Initialize() {
@@ -123,7 +123,7 @@ index 831ce5ccc32676790307d49416a3a40e7e3652bc..8898a6162a759a3a4d313d8956051b62
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index 50beea038e1cf928ea18cac3e0a4071ca7686cc4..d47a028bdcdf67b892ce82a9d9660e1fb8ddb760 100644
+index 8080a1b3c4efe3854bd12dc4d714838a4e135689..d16d2572a37b46028dfa8d7554f97289918bf792 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
 @@ -325,6 +325,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {

patches/chromium/add_realloc.patch

@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
  
    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 3c7a7a5675fce7ba4065f8b2f52e29dc083551a6..85ac9d5d95856470707d320d382743673cd1451a 100644
+index 211ea701aba4935ed5641914493fd90e277f18f5..7c2ae147254dad017214d2535203a18719294768 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -685,6 +685,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+@@ -689,6 +689,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
      return result;
    }
  

patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch

@@ -10,10 +10,10 @@ WebContents, and cancels the authentication if there's no WebContents
 available, which there isn't in the case of the 'net' module.
 
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 0f9d88529021db245fb498dfa339e5327450256a..962dc2d3e8c3976f5088146c9edc0516e41ebeb4 100644
+index b4d200164829d0d34c2511a07eb0cc3d046d6fa3..e15635d66859211ac91b5beff36beffd4dfe4807 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -215,6 +215,25 @@ struct CTPolicy {
+@@ -214,6 +214,25 @@ struct CTPolicy {
    array<string> excluded_legacy_spkis;
  };
  
@@ -39,7 +39,7 @@ index 0f9d88529021db245fb498dfa339e5327450256a..962dc2d3e8c3976f5088146c9edc0516
  interface CertVerifierClient {
    Verify(
      int32 default_error,
-@@ -641,6 +660,8 @@ struct URLLoaderFactoryParams {
+@@ -652,6 +671,8 @@ struct URLLoaderFactoryParams {
    // impact because of the extra process hops, so use should be minimized.
    pending_remote<TrustedURLLoaderHeaderClient>? header_client;
  
@@ -49,10 +49,10 @@ index 0f9d88529021db245fb498dfa339e5327450256a..962dc2d3e8c3976f5088146c9edc0516
    // the per-context allow patterns that is managed via NetworkContext
    // interface. This still respects the per-context block lists.
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index e13745d859ca82ec313c25e1958945a3efeaaa62..0f6ec93b55fcc263f69157d650b20bf34d6a586f 100644
+index 5f05f9a5385f5b424b2d66a5ac19e878f09f24f4..f5ce4de54b0c71f2099753198794503c8ee10013 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -463,6 +463,7 @@ URLLoader::URLLoader(
+@@ -483,6 +483,7 @@ URLLoader::URLLoader(
      base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
      base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
      mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
@@ -60,7 +60,7 @@ index e13745d859ca82ec313c25e1958945a3efeaaa62..0f6ec93b55fcc263f69157d650b20bf3
      mojom::OriginPolicyManager* origin_policy_manager,
      std::unique_ptr<TrustTokenRequestHelperFactory> trust_token_helper_factory,
      mojo::PendingRemote<mojom::CookieAccessObserver> cookie_observer)
-@@ -525,6 +526,11 @@ URLLoader::URLLoader(
+@@ -546,6 +547,11 @@ URLLoader::URLLoader(
      header_client_.set_disconnect_handler(
          base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
    }
@@ -72,7 +72,7 @@ index e13745d859ca82ec313c25e1958945a3efeaaa62..0f6ec93b55fcc263f69157d650b20bf3
    if (want_raw_headers_) {
      options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
                  mojom::kURLLoadOptionSendSSLInfoForCertificateError;
-@@ -1130,7 +1136,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
+@@ -1119,7 +1125,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
      // |this| may have been deleted.
      return;
    }
@@ -81,7 +81,7 @@ index e13745d859ca82ec313c25e1958945a3efeaaa62..0f6ec93b55fcc263f69157d650b20bf3
      OnAuthCredentials(base::nullopt);
      return;
    }
-@@ -1146,11 +1152,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
+@@ -1135,11 +1141,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
    if (url_request->response_headers())
      head->headers = url_request->response_headers();
    head->auth_challenge_info = auth_info;
@@ -108,7 +108,7 @@ index e13745d859ca82ec313c25e1958945a3efeaaa62..0f6ec93b55fcc263f69157d650b20bf3
    auth_challenge_responder_receiver_.set_disconnect_handler(
        base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 70518f42849e5d1d6e1dd0faf4cae866ba39ef09..b081be5d939b17ecaffa85e75ebb012444bb2bf1 100644
+index a624b8c43f49a7db975d8deda753b18583db5d72..cce8d7e0b8847528715aca4704db5194829c5bbc 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
 @@ -118,6 +118,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader

patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch

@@ -6,7 +6,7 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.
 
 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index f3d40b628ec20c140fb36d139bad55cb2b1bc30e..9b5b8166987dd82383984391893ca3f2c978aee6 100644
+index c1b5d30fd927feaeb3e068adc72edafa871ae8cd..7534eef2cfe57044be038632ab040b4df1e7ef9e 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
 @@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(

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

@@ -6,10 +6,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
 This allows file:// URLs in workers to have a CSP.
 
 diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-index 9c697793db98ddaaece76f7f8a7890ca0773f936..d264acf0173de6f2ebbf600187d4ceeea4625e42 100644
+index 0d31933076d65aae063c01514f77deec1724c159..def9d2d52f41d09ea2d5291df2749f93a0b3f9fc 100644
 --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-@@ -367,7 +367,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
+@@ -373,7 +373,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
    // document (which is implemented in WorkerMessagingProxy, and
    // m_contentSecurityPolicy should be left as nullptr to inherit the policy).
    if (!response.CurrentRequestUrl().ProtocolIs("blob") &&

patches/chromium/blink_local_frame.patch

@@ -14,10 +14,10 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index f532469a54a40ef56350063e2472cbf77705d69f..98b5007d5a41cb7b8f71bdd03ccb88d56d2e039e 100644
+index f64d3826cbbf10d1e951d90721cd147ac6ad8168..1d0d443cbeb3f51c07a3bd56302274f7c5278437 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -581,10 +581,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -580,10 +580,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -28,10 +28,10 @@ index f532469a54a40ef56350063e2472cbf77705d69f..98b5007d5a41cb7b8f71bdd03ccb88d5
    if (!Client())
      return;
  
-@@ -601,6 +597,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
-   // Notify WindowProxyManager that the frame is closing, since its cleanup ends
+@@ -600,6 +596,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+   // Notify ScriptController that the frame is closing, since its cleanup ends
    // up calling back to LocalFrameClient via WindowProxy.
-   GetWindowProxyManager()->ClearForClose();
+   GetScriptController().ClearForClose();
 +  // This is the earliest that scripting can be disabled:
 +  // - FrameLoader::Detach() can fire XHR abort events
 +  // - Document::Shutdown() can dispose plugins which can run script.

patches/chromium/blink_world_context.patch

@@ -7,10 +7,10 @@ This exposes a method for obtaining a reference to an isolated world, which is
 otherwise not available in the Blink API.
 
 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index 0e8a64cdd2b38058b967b39260e6f5ff4e45147c..166ea5f681eee30f299242d826d97c17f8c6a5a8 100644
+index 229b6d79668c47417e56d5869182183cdb209429..1cc8f91d233a6df89b1200e80b77585de681a8c7 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
-@@ -365,6 +365,8 @@ class WebLocalFrame : public WebFrame {
+@@ -358,6 +358,8 @@ class WebLocalFrame : public WebFrame {
    // Returns the world ID associated with |script_context|.
    virtual int32_t GetScriptContextWorldId(
        v8::Local<v8::Context> script_context) const = 0;
@@ -20,10 +20,10 @@ index 0e8a64cdd2b38058b967b39260e6f5ff4e45147c..166ea5f681eee30f299242d826d97c17
    // Executes script in the context of the current page and returns the value
    // that the script evaluated to with callback. Script execution can be
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index 1bb42b8fc49d420767a2dbe4893d8594b7eda6d1..3f47067c3a4be48155771f0c1d25f614ad73b4e8 100644
+index 53b4f68d0785fa6ec5b7256c791b56b26a2ee2bd..14c5e5edfe52279319938d203a8311195c8ef77f 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -992,6 +992,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -980,6 +980,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
    return MainWorldScriptContext()->Global();
  }
  
@@ -38,10 +38,10 @@ index 1bb42b8fc49d420767a2dbe4893d8594b7eda6d1..3f47067c3a4be48155771f0c1d25f614
    return BindingSecurity::ShouldAllowAccessToFrame(
        CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index 5ff4f6a6d7e6b992c1ae702acd88116d19444986..ef068180f5a9e0f537a2c646212aab9fe4b9c874 100644
+index 46e977ab9fedbfd58d425fe4bf3b85762517fae4..85e66b66472bf83140d6652eaead2326b4c7c3dc 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-@@ -169,6 +169,8 @@ class CORE_EXPORT WebLocalFrameImpl final
+@@ -163,6 +163,8 @@ class CORE_EXPORT WebLocalFrameImpl final
    v8::Local<v8::Context> MainWorldScriptContext() const override;
    int32_t GetScriptContextWorldId(
        v8::Local<v8::Context> script_context) const override;

patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch

@@ -10,10 +10,10 @@ breakpad independently, as a "browser" process. This patches
 crash annotation.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 1c076672c77d90eb3814b5b269340d2800217868..7d23a5732b47bef04cadc707f58e50b423393605 100644
+index 72ee7e8df3d62eca301b08586f06d51711e941b5..fdd76ee1490e39dbfcd39bbff6686864a5c5af29 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
-@@ -715,8 +715,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
+@@ -716,8 +716,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
    log_path[log_path_len] = '\0';
    info.log_filename = log_path;
  #endif
@@ -29,7 +29,7 @@ index 1c076672c77d90eb3814b5b269340d2800217868..7d23a5732b47bef04cadc707f58e50b4
    info.distro = base::g_linux_distro;
    info.distro_length = my_strlen(base::g_linux_distro);
    info.upload = upload;
-@@ -2022,8 +2027,13 @@ void InitCrashReporter(const std::string& process_type) {
+@@ -2023,8 +2028,13 @@ void InitCrashReporter(const std::string& process_type) {
        process_type == kWebViewSingleProcessType ||
        process_type == kBrowserProcessType ||
  #endif

patches/chromium/build_gn.patch

@@ -14,7 +14,7 @@ tradeoff is that switching from MAS_BUILD to !MAS_BUILD or vice-versa will
 rebuild the entire tree.
 
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index 3082046a91da5fe400d8405da61f55ad66fa5e74..e0e90bcd7bb4741dfe792336d59028c500f59b39 100644
+index bb656fa19ff32fa407a01f302ea989ffcacc45f8..7b1c24f17c44e60a2274798546cae5b8f1018327 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -123,6 +123,9 @@ if (current_os == "") {
@@ -27,7 +27,7 @@ index 3082046a91da5fe400d8405da61f55ad66fa5e74..e0e90bcd7bb4741dfe792336d59028c5
    # Set to enable the official build level of optimization. This has nothing
    # to do with branding, but enables an additional level of optimization above
    # release (!is_debug). This might be better expressed as a tri-state
-@@ -335,6 +338,7 @@ default_compiler_configs = [
+@@ -348,6 +351,7 @@ default_compiler_configs = [
    "//build/config/compiler/pgo:default_pgo_flags",
    "//build/config/coverage:default_coverage",
    "//build/config/sanitizers:default_sanitizer_flags",

patches/chromium/can_create_window.patch

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 45ce62954b5527b3906c7ec8c06c41cf2dd4d111..bc55d9109d5c34e9f2b4a19424926e7f43ad5d4e 100644
+index c7f2d8e31eba60686016d2c2d7b565f6d8943df9..7ab29a65a8081cfcbd12e4bd77aa9133965497e0 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -4959,6 +4959,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -4872,6 +4872,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 45ce62954b5527b3906c7ec8c06c41cf2dd4d111..bc55d9109d5c34e9f2b4a19424926e7f
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 2640a8c6371083804da42565f65fb41cf1a57607..6aa0c4db0cf1a3644a20d0fe0c7e292f3d4bbd6f 100644
+index d13b9cd849c531fea59e8d7e46bd1b006b6f5659..93065a4d6e41498b0f358935cecf7ecedaf0d829 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3712,9 +3712,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3695,9 +3695,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
    }
  
    if (delegate_) {
@@ -38,10 +38,10 @@ index 2640a8c6371083804da42565f65fb41cf1a57607..6aa0c4db0cf1a3644a20d0fe0c7e292f
  
    observers_.ForEachObserver([&](WebContentsObserver* observer) {
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index e769df393c1e89cdf04519b82d75f7f1542ad26b..752818c2791343a5c574a96f0e0aa672a7ef3726 100644
+index c969ed9b17b915f713d9b82114c7b637c8fd90df..9530a1936b0a801a4c6152dd53ec5105d5d712e0 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -282,6 +282,10 @@ struct CreateNewWindowParams {
+@@ -264,6 +264,10 @@ struct CreateNewWindowParams {
  
    // The window features to use for the new window.
    blink.mojom.WindowFeatures features;
@@ -53,7 +53,7 @@ index e769df393c1e89cdf04519b82d75f7f1542ad26b..752818c2791343a5c574a96f0e0aa672
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index da3aceed75b10087a86bcb8427c241fe647cdcfe..cafd45df059293bc1cf31e1d7b798e67578f3e9d 100644
+index 2d2bfc7e50d9b3e117ffb1dcf433fb6a809923a1..ca22e2dbdfbd4b4c3bf60464cbdcd2104cbe5a7e 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -544,6 +544,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -66,7 +66,7 @@ index da3aceed75b10087a86bcb8427c241fe647cdcfe..cafd45df059293bc1cf31e1d7b798e67
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 811bc7be6b174e0695beac6ee604ca19e9402739..3b93afa004fb4d56ade2ab16147b42f26e90e3db 100644
+index 718fc096bd1087ef89d599f572abe20d4173a41c..bd81fcd224d4cad545265be2dd1fa4a65b3248eb 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -153,6 +153,7 @@ class NetworkService;
@@ -77,7 +77,7 @@ index 811bc7be6b174e0695beac6ee604ca19e9402739..3b93afa004fb4d56ade2ab16147b42f2
  }  // namespace network
  
  namespace sandbox {
-@@ -876,6 +877,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -872,6 +873,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -87,7 +87,7 @@ index 811bc7be6b174e0695beac6ee604ca19e9402739..3b93afa004fb4d56ade2ab16147b42f2
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 12ce66464a416262767c126d0600fed60f5b106a..f60cf6064fdf279b26f0d11125e2ffa5bbb36c78 100644
+index 7ac50fbbe16b057d7263c7850a62b01d3dfae095..90d315d815bb269ee47cef7fb5e0b0e2edd578c4 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -26,6 +26,17 @@ namespace content {
@@ -109,7 +109,7 @@ index 12ce66464a416262767c126d0600fed60f5b106a..f60cf6064fdf279b26f0d11125e2ffa5
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index ee6b87d40496591935cef789bab9c1de8e60cee9..dd7f018be164b250f0b2408ce309219d61c50caa 100644
+index a10c5caf5a4b7a30b7338c8b10ffa038e13dfd6a..938b6e622b52a05e6b7d626c4824e76121d807c5 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -17,6 +17,7 @@
@@ -135,17 +135,17 @@ index ee6b87d40496591935cef789bab9c1de8e60cee9..dd7f018be164b250f0b2408ce309219d
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index fec5e2312b716436e96d5c57b2a5203ca2b1e423..f6697538b5717a12a6d29704bc49de0b6e632417 100644
+index fb0f9eb912782251ca610669e99285bc5df00fcc..425dde974830bf8a669d799da1e695734ebe46aa 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -66,6 +66,7 @@
+@@ -65,6 +65,7 @@
  #include "content/renderer/history_serialization.h"
  #include "content/renderer/internal_document_state_data.h"
  #include "content/renderer/loader/request_extra_data.h"
 +#include "content/renderer/loader/web_url_request_util.h"
+ #include "content/renderer/media/audio/audio_device_factory.h"
  #include "content/renderer/render_frame_impl.h"
  #include "content/renderer/render_frame_proxy.h"
- #include "content/renderer/render_process.h"
 @@ -644,6 +645,10 @@ WebView* RenderViewImpl::CreateView(
    }
    params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
@@ -158,7 +158,7 @@ index fec5e2312b716436e96d5c57b2a5203ca2b1e423..f6697538b5717a12a6d29704bc49de0b
    // moved on send.
    bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index f0c53c0945d76ce4482ce4c24acb75c3eccb59e9..458919350048f02d07695bef1c4d4e41b0ce043e 100644
+index 53e938ec4b6515cabea5b7da8c5c9e7168f2d2ee..2e20931edeeca271f620128f5abd1ed4ddf75e1e 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
 @@ -377,6 +377,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 58c922f8da2a85f4354df61cf1ac7c454fd12359..d7903ef7b6e8dd458b14d13a24d7f9423a55707f 100644
+index b2c724001af583b1497afab4176ffb02feca05e5..d12a6b4db191ca4e757837e39b8a8d6c024c35f4 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -1957,6 +1957,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -1949,6 +1949,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    }
  
    WebWindowFeatures window_features = GetWindowFeaturesFromString(features);

patches/chromium/cherry-pick-275865e8c237.patch

@@ -1,413 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Robinson <mrobinson@igalia.com>
-Date: Tue, 20 Oct 2020 09:00:52 +0000
-Subject: Mac: Target a11y actions on certain containers to focused or
- activedescendant children
-
-When an action is triggered on a container with selectable children and
-that container has a focused or activedescendant child, retarget the
-action to that child. This fixes an issue where when the VoiceOver
-cursor is on a tree with a focused child, triggered context menus would
-use the tree as the target element.
-
-menu on a tree instead of a focused child.
-
-Bug: 1114892
-Change-Id: Ibe580beed93aeaac54d1dabaee28443b290fd0e2
-AX-Relnotes: Fix an issue where VoiceOver would trigger a context
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466281
-Commit-Queue: Martin Robinson <mrobinson@igalia.com>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
-Reviewed-by: Nektarios Paisios <nektar@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#818831}
-
-diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
-index 770c0cb6a4dad8cbf35900311a23a8296407d81d..0ffc8d768299cc5e7f37878fb656c12b028fead9 100644
---- a/content/browser/accessibility/browser_accessibility_cocoa.h
-+++ b/content/browser/accessibility/browser_accessibility_cocoa.h
-@@ -117,6 +117,14 @@ id AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker);
- - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
-     withCurrentIndex:(int*)currentIndex;
- 
-+// Choose the appropriate accessibility object to receive an action depending
-+// on the characteristics of this accessibility node.
-+- (content::BrowserAccessibility*)actionTarget;
-+
-+// Return the active descendant for this accessibility object or null if there
-+// is no active descendant defined or in the case of an error.
-+- (content::BrowserAccessibility*)activeDescendant;
-+
- // Internally-used property.
- @property(nonatomic, readonly) NSPoint origin;
- 
-diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-index 17aa494d6473866721a8cc5f4c5c646af9307d93..71f927cd35a27dd5f656907dc177fbfe7577d3f0 100644
---- a/content/browser/accessibility/browser_accessibility_cocoa.mm
-+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
-@@ -1744,14 +1744,7 @@ - (id)owns {
-   // supported with VoiceOver.
-   //
- 
--  int activeDescendantId;
--  if (!_owner->GetIntAttribute(ax::mojom::IntAttribute::kActivedescendantId,
--                               &activeDescendantId))
--    return nil;
--
--  BrowserAccessibilityManager* manager = _owner->manager();
--  BrowserAccessibility* activeDescendant =
--      manager->GetFromID(activeDescendantId);
-+  BrowserAccessibility* activeDescendant = [self activeDescendant];
-   if (!activeDescendant)
-     return nil;
- 
-@@ -3729,16 +3722,18 @@ - (void)accessibilityPerformAction:(NSString*)action {
-     return;
- 
-   // TODO(dmazzoni): Support more actions.
--  BrowserAccessibilityManager* manager = _owner->manager();
-+  BrowserAccessibility* actionTarget = [self actionTarget];
-+  BrowserAccessibilityManager* manager = actionTarget->manager();
-   if ([action isEqualToString:NSAccessibilityPressAction]) {
--    manager->DoDefaultAction(*_owner);
--    if (_owner->GetData().GetRestriction() != ax::mojom::Restriction::kNone ||
-+    manager->DoDefaultAction(*actionTarget);
-+    if (actionTarget->GetData().GetRestriction() !=
-+            ax::mojom::Restriction::kNone ||
-         ![self isCheckable])
-       return;
-     // Hack: preemptively set the checked state to what it should become,
-     // otherwise VoiceOver will very likely report the old, incorrect state to
-     // the user as it requests the value too quickly.
--    ui::AXNode* node = _owner->node();
-+    ui::AXNode* node = actionTarget->node();
-     if (!node)
-       return;
-     AXNodeData data(node->TakeData());  // Temporarily take data.
-@@ -3756,13 +3751,13 @@ - (void)accessibilityPerformAction:(NSString*)action {
-     }
-     node->SetData(data);  // Set the data back in the node.
-   } else if ([action isEqualToString:NSAccessibilityShowMenuAction]) {
--    manager->ShowContextMenu(*_owner);
-+    manager->ShowContextMenu(*actionTarget);
-   } else if ([action isEqualToString:NSAccessibilityScrollToVisibleAction]) {
--    manager->ScrollToMakeVisible(*_owner, gfx::Rect());
-+    manager->ScrollToMakeVisible(*actionTarget, gfx::Rect());
-   } else if ([action isEqualToString:NSAccessibilityIncrementAction]) {
--    manager->Increment(*_owner);
-+    manager->Increment(*actionTarget);
-   } else if ([action isEqualToString:NSAccessibilityDecrementAction]) {
--    manager->Decrement(*_owner);
-+    manager->Decrement(*actionTarget);
-   }
- }
- 
-@@ -3871,4 +3866,32 @@ - (BOOL)accessibilityNotifiesWhenDestroyed {
-   return YES;
- }
- 
-+// Choose the appropriate accessibility object to receive an action depending
-+// on the characteristics of this accessibility node.
-+- (BrowserAccessibility*)actionTarget {
-+  // When an action is triggered on a container with selectable children and
-+  // one of those children is an active descendant or focused, retarget the
-+  // action to that child. See https://crbug.com/1114892.
-+  if (!ui::IsContainerWithSelectableChildren(_owner->node()->data().role))
-+    return _owner;
-+
-+  if (BrowserAccessibility* activeDescendant = [self activeDescendant])
-+    return activeDescendant;
-+
-+  BrowserAccessibility* focused = _owner->manager()->GetFocus();
-+  if (focused && focused->IsDescendantOf(_owner))
-+    return focused;
-+
-+  return _owner;
-+}
-+
-+// Return the active descendant for this accessibility object or null if there
-+// is no active descendant defined or in the case of an error.
-+- (BrowserAccessibility*)activeDescendant {
-+  int activeDescendantId;
-+  if (!_owner->GetIntAttribute(ax::mojom::IntAttribute::kActivedescendantId,
-+                               &activeDescendantId))
-+    return nullptr;
-+  return _owner->manager()->GetFromID(activeDescendantId);
-+}
- @end
-diff --git a/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm b/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm
-index 17801b9774813df79e4b944cb0a73535eb4c07c2..6eb2c484ddc479d9cfa566df0b103782264d3af8 100644
---- a/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm
-+++ b/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm
-@@ -44,6 +44,35 @@
-     return web_contents->GetRootBrowserAccessibilityManager();
-   }
- 
-+  // Trigger a context menu for the provided element without showing it. Returns
-+  // the coordinates where the  context menu was invoked (calculated based on
-+  // the provided element). These coordinates are relative to the RenderView
-+  // origin.
-+  gfx::Point TriggerContextMenuAndGetMenuLocation(
-+      NSAccessibilityElement* element,
-+      ContextMenuFilter* filter) {
-+    // accessibilityPerformAction is deprecated, but it's still used internally
-+    // by AppKit.
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-+    [element accessibilityPerformAction:NSAccessibilityShowMenuAction];
-+    filter->Wait();
-+
-+    UntrustworthyContextMenuParams context_menu_params = filter->get_params();
-+    return gfx::Point(context_menu_params.x, context_menu_params.y);
-+#pragma clang diagnostic pop
-+  }
-+
-+  void FocusAccessibilityElementAndWaitForFocusChange(
-+      NSAccessibilityElement* element) {
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-+    [element accessibilitySetValue:@(1)
-+                      forAttribute:NSAccessibilityFocusedAttribute];
-+#pragma clang diagnostic pop
-+    WaitForAccessibilityFocusChange();
-+  }
-+
-  private:
-   BrowserAccessibility* FindNodeInSubtree(BrowserAccessibility& node,
-                                           ax::mojom::Role role) {
-@@ -466,4 +495,165 @@ GURL url(R"HTML(data:text/html,
-   EXPECT_NSEQ(@"AXRow", [row_nodes[1] role]);
-   EXPECT_NSEQ(@"row2", [row_nodes[1] descriptionForAccessibility]);
- }
-+
-+IN_PROC_BROWSER_TEST_F(BrowserAccessibilityCocoaBrowserTest,
-+                       TestTreeContextMenuEvent) {
-+  AccessibilityNotificationWaiter waiter(shell()->web_contents(),
-+                                         ui::kAXModeComplete,
-+                                         ax::mojom::Event::kLoadComplete);
-+
-+  GURL url(R"HTML(data:text/html,
-+             <div alt="tree" role="tree">
-+               <div tabindex="1" role="treeitem">1</div>
-+               <div tabindex="2" role="treeitem">2</div>
-+             </div>)HTML");
-+
-+  EXPECT_TRUE(NavigateToURL(shell(), url));
-+  waiter.WaitForNotification();
-+
-+  BrowserAccessibility* tree = FindNode(ax::mojom::Role::kTree);
-+  base::scoped_nsobject<BrowserAccessibilityCocoa> cocoa_tree(
-+      [ToBrowserAccessibilityCocoa(tree) retain]);
-+
-+  NSArray* tree_children = [cocoa_tree children];
-+  EXPECT_NSEQ(@"AXRow", [tree_children[0] role]);
-+  EXPECT_NSEQ(@"AXRow", [tree_children[1] role]);
-+
-+  content::RenderProcessHost* render_process_host =
-+      shell()->web_contents()->GetMainFrame()->GetProcess();
-+  auto menu_filter = base::MakeRefCounted<ContextMenuFilter>(
-+      ContextMenuFilter::ShowBehavior::kPreventShow);
-+  render_process_host->AddFilter(menu_filter.get());
-+
-+  gfx::Point tree_point =
-+      TriggerContextMenuAndGetMenuLocation(cocoa_tree, menu_filter.get());
-+
-+  menu_filter->Reset();
-+  gfx::Point item_1_point =
-+      TriggerContextMenuAndGetMenuLocation(tree_children[1], menu_filter.get());
-+  ASSERT_NE(tree_point, item_1_point);
-+
-+  // Now focus the second child and trigger a context menu on the tree.
-+  EXPECT_TRUE(
-+      content::ExecuteScript(shell()->web_contents(),
-+                             "document.body.children[0].children[1].focus();"));
-+  WaitForAccessibilityFocusChange();
-+
-+  // Triggering a context menu on the tree should now trigger the menu
-+  // on the focused child.
-+  menu_filter->Reset();
-+  gfx::Point new_point =
-+      TriggerContextMenuAndGetMenuLocation(cocoa_tree, menu_filter.get());
-+  ASSERT_EQ(new_point, item_1_point);
-+}
-+
-+IN_PROC_BROWSER_TEST_F(BrowserAccessibilityCocoaBrowserTest,
-+                       TestEventRetargetingFocus) {
-+  AccessibilityNotificationWaiter waiter(shell()->web_contents(),
-+                                         ui::kAXModeComplete,
-+                                         ax::mojom::Event::kLoadComplete);
-+
-+  GURL url(R"HTML(data:text/html,
-+             <div role="tree">
-+               <div tabindex="1" role="treeitem">1</div>
-+               <div tabindex="2" role="treeitem">2</div>
-+             </div>
-+             <div role="treegrid">
-+               <div tabindex="1" role="treeitem">1</div>
-+               <div tabindex="2" role="treeitem">2</div>
-+             </div>
-+             <div role="tablist">
-+               <div tabindex="1" role="tab">1</div>
-+               <div tabindex="2" role="tab">2</div>
-+             </div>
-+             <div role="table">
-+               <div tabindex="1" role="row">1</div>
-+               <div tabindex="2" role="row">2</div>
-+             </div>
-+             <div role="banner">
-+               <div tabindex="1" role="link">1</div>
-+               <div tabindex="2" role="link">2</div>
-+             </div>)HTML");
-+
-+  EXPECT_TRUE(NavigateToURL(shell(), url));
-+  waiter.WaitForNotification();
-+
-+  std::pair<ax::mojom::Role, bool> tests[] = {
-+      std::make_pair(ax::mojom::Role::kTree, true),
-+      std::make_pair(ax::mojom::Role::kTreeGrid, true),
-+      std::make_pair(ax::mojom::Role::kTabList, true),
-+      std::make_pair(ax::mojom::Role::kTable, false),
-+      std::make_pair(ax::mojom::Role::kBanner, false),
-+  };
-+
-+  for (auto& test : tests) {
-+    base::scoped_nsobject<BrowserAccessibilityCocoa> parent(
-+        [ToBrowserAccessibilityCocoa(FindNode(test.first)) retain]);
-+    BrowserAccessibilityCocoa* child = [parent children][1];
-+
-+    EXPECT_NE(nullptr, parent.get());
-+    EXPECT_EQ([child owner], [child actionTarget]);
-+    EXPECT_EQ([parent owner], [parent actionTarget]);
-+
-+    FocusAccessibilityElementAndWaitForFocusChange(child);
-+    ASSERT_EQ(test.second, [parent actionTarget] == [child owner]);
-+  }
-+}
-+
-+IN_PROC_BROWSER_TEST_F(BrowserAccessibilityCocoaBrowserTest,
-+                       TestEventRetargetingActiveDescendant) {
-+  AccessibilityNotificationWaiter waiter(shell()->web_contents(),
-+                                         ui::kAXModeComplete,
-+                                         ax::mojom::Event::kLoadComplete);
-+
-+  GURL url(R"HTML(data:text/html,
-+             <div role="tree" aria-activedescendant="tree-child">
-+               <div tabindex="1" role="treeitem">1</div>
-+               <div id="tree-child" tabindex="2" role="treeitem">2</div>
-+             </div>
-+             <div role="treegrid" aria-activedescendant="treegrid-child">
-+               <div tabindex="1" role="treeitem">1</div>
-+               <div id="treegrid-child" tabindex="2" role="treeitem">2</div>
-+             </div>
-+             <div role="tablist" aria-activedescendant="tablist-child">
-+               <div tabindex="1" role="tab">1</div>
-+               <div id="tablist-child" tabindex="2" role="tab">2</div>
-+             </div>
-+             <div role="table" aria-activedescendant="table-child">
-+               <div tabindex="1" role="row">1</div>
-+               <div id="table-child" tabindex="2" role="row">2</div>
-+             </div>
-+             <div role="banner" aria-activedescendant="banner-child">
-+               <div tabindex="1" role="link">1</div>
-+               <div id="banner-child" tabindex="2" role="link">2</div>
-+             </div>)HTML");
-+
-+  EXPECT_TRUE(NavigateToURL(shell(), url));
-+  waiter.WaitForNotification();
-+
-+  std::pair<ax::mojom::Role, bool> tests[] = {
-+      std::make_pair(ax::mojom::Role::kTree, true),
-+      std::make_pair(ax::mojom::Role::kTreeGrid, true),
-+      std::make_pair(ax::mojom::Role::kTabList, true),
-+      std::make_pair(ax::mojom::Role::kTable, false),
-+      std::make_pair(ax::mojom::Role::kBanner, false),
-+  };
-+
-+  for (auto& test : tests) {
-+    base::scoped_nsobject<BrowserAccessibilityCocoa> parent(
-+        [ToBrowserAccessibilityCocoa(FindNode(test.first)) retain]);
-+    BrowserAccessibilityCocoa* first_child = [parent children][0];
-+    BrowserAccessibilityCocoa* second_child = [parent children][1];
-+
-+    EXPECT_NE(nullptr, parent.get());
-+    EXPECT_EQ([second_child owner], [second_child actionTarget]);
-+    EXPECT_EQ(test.second, [second_child owner] == [parent actionTarget]);
-+
-+    // aria-activedescendant should take priority of focus for determining
-+    // if an object is the action target.
-+    FocusAccessibilityElementAndWaitForFocusChange(first_child);
-+    EXPECT_EQ(test.second, [second_child owner] == [parent actionTarget]);
-+  }
-+}
-+
- }  // namespace content
-diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
-index 47161f98b2fcdacece578cde50141860d2ab0a40..a8f988b8465c420224979d805baf454483e49134 100644
---- a/content/public/test/browser_test_utils.cc
-+++ b/content/public/test/browser_test_utils.cc
-@@ -3220,10 +3220,11 @@ void VerifyStaleContentOnFrameEviction(
- 
- #endif  // defined(USE_AURA)
- 
--ContextMenuFilter::ContextMenuFilter()
-+ContextMenuFilter::ContextMenuFilter(ShowBehavior behavior)
-     : BrowserMessageFilter(FrameMsgStart),
-       run_loop_(std::make_unique<base::RunLoop>()),
--      quit_closure_(run_loop_->QuitClosure()) {}
-+      quit_closure_(run_loop_->QuitClosure()),
-+      show_behavior_(behavior) {}
- 
- bool ContextMenuFilter::OnMessageReceived(const IPC::Message& message) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-@@ -3234,6 +3235,9 @@ bool ContextMenuFilter::OnMessageReceived(const IPC::Message& message) {
-     GetUIThreadTaskRunner({})->PostTask(
-         FROM_HERE,
-         base::BindOnce(&ContextMenuFilter::OnContextMenu, this, menu_params));
-+    // Returning true here blocks the default action for this message, which
-+    // means that the menu will not be shown.
-+    return show_behavior_ == ShowBehavior::kPreventShow;
-   }
-   return false;
- }
-@@ -3244,6 +3248,12 @@ void ContextMenuFilter::Wait() {
-   run_loop_ = nullptr;
- }
- 
-+void ContextMenuFilter::Reset() {
-+  ASSERT_EQ(run_loop_, nullptr);
-+  run_loop_ = std::make_unique<base::RunLoop>();
-+  quit_closure_ = run_loop_->QuitClosure();
-+}
-+
- ContextMenuFilter::~ContextMenuFilter() = default;
- 
- void ContextMenuFilter::OnContextMenu(
-diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
-index f68d423999ff711b46b7fe9d718163158e1d5223..3568bcceee9867db634306d36e3281d32450ea0a 100644
---- a/content/public/test/browser_test_utils.h
-+++ b/content/public/test/browser_test_utils.h
-@@ -1688,10 +1688,15 @@ void VerifyStaleContentOnFrameEviction(
- // sent by the renderer.
- class ContextMenuFilter : public content::BrowserMessageFilter {
-  public:
--  ContextMenuFilter();
-+  // Whether or not the ContextMenu should be prevented from performing
-+  // its default action, preventing the context menu from showing.
-+  enum ShowBehavior { kShow, kPreventShow };
-+
-+  explicit ContextMenuFilter(ShowBehavior behavior = ShowBehavior::kShow);
- 
-   bool OnMessageReceived(const IPC::Message& message) override;
-   void Wait();
-+  void Reset();
- 
-   content::UntrustworthyContextMenuParams get_params() { return last_params_; }
- 
-@@ -1703,6 +1708,7 @@ class ContextMenuFilter : public content::BrowserMessageFilter {
-   std::unique_ptr<base::RunLoop> run_loop_;
-   base::OnceClosure quit_closure_;
-   content::UntrustworthyContextMenuParams last_params_;
-+  const ShowBehavior show_behavior_;
- 
-   DISALLOW_COPY_AND_ASSIGN(ContextMenuFilter);
- };