Bump v7.0.0-nightly.20190621

* chore: remove unneeded require

* chore: update lockfile

.circleci/config.yml

@@ -22,12 +22,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge
 
 machine-mac: &machine-mac
   macos:
-    xcode: "8.3.3"
+    xcode: "9.4.1"
 
 machine-mac-large: &machine-mac-large
   resource_class: large
   macos:
-    xcode: "8.3.3"
+    xcode: "9.4.1"
 
 # Build configurations options.
 env-debug-build: &env-debug-build
@@ -35,6 +35,7 @@ env-debug-build: &env-debug-build
 
 env-testing-build: &env-testing-build
   GN_CONFIG: //electron/build/args/testing.gn
+  CHECK_DIST_MANIFEST: '1'
 
 env-release-build: &env-release-build
   GN_CONFIG: //electron/build/args/release.gn
@@ -101,6 +102,12 @@ env-mac-large: &env-mac-large
 env-disable-crash-reporter-tests: &env-disable-crash-reporter-tests
   DISABLE_CRASH_REPORTER_TESTS: true
 
+env-ninja-status: &env-ninja-status
+  NINJA_STATUS: "[%r processes, %f/%t @ %o/s : %es] "
+
+env-disable-run-as-node: &env-disable-run-as-node
+  GN_BUILDFLAG_ARGS: 'enable_run_as_node = false'
+
 # Individual (shared) steps.
 step-maybe-notify-slack-failure: &step-maybe-notify-slack-failure
   run:
@@ -143,13 +150,16 @@ step-gclient-sync: &step-gclient-sync
   run:
     name: Gclient sync
     command: |
-      gclient config \
-        --name "src/electron" \
-        --unmanaged \
-        $GCLIENT_EXTRA_ARGS \
-        "$CIRCLE_REPOSITORY_URL"
+      # If we did not restore a complete sync then we need to sync for realz
+      if [ ! -s "src/electron/.circle-sync-done" ]; then
+        gclient config \
+          --name "src/electron" \
+          --unmanaged \
+          $GCLIENT_EXTRA_ARGS \
+          "$CIRCLE_REPOSITORY_URL"
 
-      gclient sync --with_branch_heads --with_tags
+        gclient sync --with_branch_heads --with_tags
+      fi
 
 step-setup-env-for-build: &step-setup-env-for-build
   run:
@@ -176,27 +186,33 @@ step-restore-brew-cache: &step-restore-brew-cache
     keys:
       - v1-brew-cache-{{ arch }}
 
-step-install-nodejs-on-mac: &step-install-nodejs-on-mac
+step-get-more-space-on-mac: &step-get-more-space-on-mac
   run:
-    name: Install Node.js 10 on MacOS
+    name: Free up space on MacOS
     command: |
       if [ "`uname`" == "Darwin" ]; then
-        brew update
-        brew install node@10
-        echo 'export PATH="/usr/local/opt/node@10/bin:$PATH"' >> $BASH_ENV
+        sudo rm -rf /Library/Developer/CoreSimulator
       fi
 
-# On macOS the npm install command during gclient sync was run on a linux
+step-delete-git-directories: &step-delete-git-directories
+  run:
+    name: Delete src/.git directory on MacOS to free space
+    command: |
+      if [ "`uname`" == "Darwin" ]; then
+        sudo rm -rf src/.git
+      fi
+
+# On macOS the yarn install command during gclient sync was run on a linux
 # machine and therefore installed a slightly different set of dependencies
-# Notably "fsevents" is a macOS only dependency, we rerun npm install once
+# Notably "fsevents" is a macOS only dependency, we rerun yarn install once
 # we are on a macOS machine to get the correct state
 step-install-npm-deps-on-mac: &step-install-npm-deps-on-mac
   run:
-    name: Install NPM Dependencies on MacOS
+    name: Install node_modules on MacOS
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src/electron
-        npm install
+        node script/yarn install
       fi
 
 # This step handles the differences between the linux "gclient sync"
@@ -214,6 +230,15 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
         python src/electron/script/update-external-binaries.py
       fi
 
+step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
+  run:
+    name: Import and trust self-signed codesigning cert on MacOS
+    command: |
+      if [ "`uname`" == "Darwin" ]; then
+        cd src/electron
+        ./script/codesign/import-testing-cert-ci.sh
+      fi
+
 step-install-gnutar-on-mac: &step-install-gnutar-on-mac
   run:
     name: Install gnu-tar on macos
@@ -229,7 +254,17 @@ step-gn-gen-default: &step-gn-gen-default
     name: Default GN gen
     command: |
       cd src
-      gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS"
+      gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+
+step-gn-check: &step-gn-check
+  run:
+    name: GN check
+    command: |
+      cd src
+      gn check out/Default //electron:electron_lib
+      gn check out/Default //electron:electron_app
+      gn check out/Default //electron:manifests
+      gn check out/Default //electron/shell/common/api:mojo
 
 step-electron-build: &step-electron-build
   run:
@@ -254,6 +289,28 @@ step-electron-dist-build: &step-electron-dist-build
     command: |
       cd src
       ninja -C out/Default electron:electron_dist_zip
+      if [ "$CHECK_DIST_MANIFEST" == "1" ]; then
+        if [ "`uname`" == "Darwin" ]; then
+          target_os=mac
+          target_cpu=x64
+          if [ x"$MAS_BUILD" == x"true" ]; then
+            target_os=mac_mas
+          fi
+        elif [ "`uname`" == "Linux" ]; then
+          target_os=linux
+          if [ x"$TARGET_ARCH" == x ]; then
+            target_cpu=x64
+          elif [ "$TARGET_ARCH" == "ia32" ]; then
+            target_cpu=x86
+          else
+            target_cpu="$TARGET_ARCH"
+          fi
+        else
+          echo "Unknown system: `uname`"
+          exit 1
+        fi
+        electron/script/check-zip-manifest.py out/Default/dist.zip electron/script/dist_zip.$target_os.$target_cpu.manifest
+      fi
 
 step-electron-dist-store: &step-electron-dist-store
   store_artifacts:
@@ -431,44 +488,29 @@ step-maybe-zip-symbols: &step-maybe-zip-symbols
       export BUILD_PATH="$PWD/out/Default"
       electron/script/zip-symbols.py -b $BUILD_PATH
 
-step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
+step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
   run:
-    name: Native mksnapshot GN gen (arm/arm64)
+    name: Generate cross arch snapshot (arm/arm64)
     command: |
-      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
+      if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
         cd src
-        gn gen out/native_mksnapshot --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'" v8_snapshot_toolchain="'"$MKSNAPSHOT_TOOLCHAIN"'"'" $GN_EXTRA_ARGS v8_enable_embedded_builtins = false"
-      else
-        echo 'Skipping native mksnapshot GN gen for non arm build'
+        if [ "$TARGET_ARCH" == "arm" ]; then
+          export MKSNAPSHOT_PATH="clang_x86_v8_arm"
+        elif [ "$TARGET_ARCH" == "arm64" ]; then
+          export MKSNAPSHOT_PATH="clang_x64_v8_arm64"
+        fi
+        cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default
+        cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.so" out/Default
+        cp "out/Default/$MKSNAPSHOT_PATH/v8_context_snapshot_generator" out/Default
+        python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --create-snapshot-only
+        mkdir cross-arch-snapshots
+        cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
       fi
 
-step-maybe-native-mksnapshot-build: &step-maybe-native-mksnapshot-build
-  run:
-    name: Native mksnapshot build (arm/arm64)
-    no_output_timeout: 30m
-    command: |
-      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
-        cd src
-        ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
-      else
-        echo 'Skipping native mksnapshot build for non arm build'
-      fi
-
-step-maybe-native-mksnapshot-strip: &step-maybe-native-mksnapshot-strip
-  run:
-    name: Native mksnapshot binary strip (arm/arm64)
-    command: |
-      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
-        cd src
-        electron/script/strip-binaries.py --file $PWD/out/native_mksnapshot/mksnapshot --target-cpu="$TARGET_ARCH"
-      else
-        echo 'Skipping native mksnapshot binary strip'
-      fi
-
-step-maybe-native-mksnapshot-store: &step-maybe-native-mksnapshot-store
+step-maybe-cross-arch-snapshot-store: &step-maybe-cross-arch-snapshot-store
   store_artifacts:
-    path: src/out/native_mksnapshot/mksnapshot.zip
-    destination: native_mksnapshot.zip
+    path: src/cross-arch-snapshots
+    destination: cross-arch-snapshots
 
 step-maybe-trigger-arm-test: &step-maybe-trigger-arm-test
   run:
@@ -488,53 +530,159 @@ step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src/electron
-        npm run create-typescript-definitions
+        node script/yarn create-typescript-definitions
       fi
 
+step-fix-known-hosts-linux: &step-fix-known-hosts-linux
+  run:
+    name: Fix Known Hosts on Linux
+    command: |
+      if [ "`uname`" == "Linux" ]; then
+        ./src/electron/.circleci/fix-known-hosts.sh
+      fi
+
+step-ninja-summary: &step-ninja-summary
+  run:
+    name: Print ninja summary
+    command: |
+      python depot_tools/post_build_ninja_summary.py -C src/out/Default
+
 # Lists of steps.
+steps-lint: &steps-lint
+  steps:
+    - *step-checkout-electron
+    - run:
+        name: Setup third_party Depot Tools
+        command: |
+          # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+          echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
+    - run:
+        name: Download GN Binary
+        command: |
+          chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+          gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
+
+          cipd ensure -ensure-file - -root . <<-CIPD
+          \$ServiceURL https://chrome-infra-packages.appspot.com/
+          @Subdir buildtools/linux64
+          gn/gn/linux-amd64 $gn_version
+          CIPD
+
+          echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
+    - run:
+        name: Run Lint
+        command: |
+          # gn.py tries to find a gclient root folder starting from the current dir.
+          # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
+          touch .gclient
+          # Another option would be to checkout "buildtools" inside the Electron checkout,
+          # but then we would lint its contents (at least gn format), and it doesn't pass it.
+
+          cd src/electron
+          node script/yarn install --frozen-lockfile
+          node script/yarn lint
+
 steps-checkout: &steps-checkout
   steps:
     - *step-checkout-electron
     - *step-depot-tools-get
     - *step-depot-tools-add-to-path
     - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
+    - *step-get-more-space-on-mac
     - *step-install-gnutar-on-mac
 
+    - run:
+        name: Generate DEPS Hash
+        command: node src/electron/script/generate-deps-hash.js
+    - run:
+        name: Touch Sync Done
+        command: touch src/electron/.circle-sync-done
+    # Restore exact src cache based on the hash of DEPS and patches/*
+    # If no cache is matched EXACTLY then the .circle-sync-done file is empty
+    # If a cache is matched EXACTLY then the .circle-sync-done file contains "done"
+    - restore_cache:
+        paths:
+          - ./src
+        keys:
+          - v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
+        name: Restoring src cache
+    # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
+    # If the src cache was restored above then this will match an empty cache
+    # If the src cache was not restored above then this will match a close git cache
     - restore_cache:
         paths:
           - ~/.gclient-cache
         keys:
-          - v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
-          - v1-gclient-cache-{{ arch }}-
+          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}
+        name: Conditionally restoring git cache
     - run:
         name: Set GIT_CACHE_PATH to make gclient to use the cache
         command: |
           # CircleCI does not support interpolation when setting environment variables.
           # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
           echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
+    # This sync call only runs if .circle-sync-done is an EMPTY file
     - *step-gclient-sync
+    # Persist the git cache based on the hash of DEPS and .circle-sync-done
+    # If the src cache was restored above then this will persist an empty cache
     - save_cache:
         paths:
           - ~/.gclient-cache
-        key: v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
+        key: v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+        name: Persisting git cache
+    # These next few steps reset Electron to the correct commit regardless of which cache was restored
+    - run:
+        name: Wipe Electron
+        command: rm -rf src/electron
+    - *step-checkout-electron
+    - run:
+        name: Run Electron Only Hooks
+        command: gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
+    - run:
+        name: Generate DEPS Hash
+        command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js
+    # Mark the sync as done for future cache saving
+    - run:
+        name: Mark Sync Done
+        command: echo DONE > src/electron/.circle-sync-done
+    # Minimize the size of the cache
+    - run:
+        name: Remove some unused data to avoid storing it in the workspace/cache
+        command: |
+          rm -rf src/android_webview
+          rm -rf src/ios
+          rm -rf src/third_party/blink/web_tests
+          rm -rf src/third_party/blink/perf_tests
+          rm -rf src/third_party/hunspell_dictionaries
+          rm -rf src/third_party/WebKit/LayoutTests
+    # Save the src cache based on the deps hash
+    - save_cache:
+        paths:
+          - ./src
+        key: v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
+        name: Persisting src cache
     - save_cache:
         paths:
           - /usr/local/Homebrew
         key: v1-brew-cache-{{ arch }}
-
-    - run:
-        name: Remove some unused data to avoid storing it in the workspace
-        command: |
-          rm -rf src/android_webview
-          rm -rf src/ios
-          rm -rf src/third_party/WebKit/LayoutTests
+        name: Persisting brew cache
     - persist_to_workspace:
         root: .
         paths:
           - depot_tools
           - src
 
+steps-electron-gn-check: &steps-electron-gn-check
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-gn-gen-default
+    - *step-gn-check
+
 steps-electron-build: &steps-electron-build
   steps:
     - attach_workspace:
@@ -547,6 +695,7 @@ steps-electron-build: &steps-electron-build
     - *step-electron-build
     - *step-electron-dist-build
     - *step-electron-dist-store
+    - *step-ninja-summary
 
     # Node.js headers
     - *step-nodejs-headers-build
@@ -561,7 +710,6 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     - *step-depot-tools-add-to-path
     - *step-setup-env-for-build
     - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync-on-mac
     - *step-gn-gen-default
@@ -571,6 +719,7 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     - *step-maybe-electron-dist-strip
     - *step-electron-dist-build
     - *step-electron-dist-store
+    - *step-ninja-summary
 
     # Node.js headers
     - *step-nodejs-headers-build
@@ -581,12 +730,8 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     # mksnapshot
     - *step-mksnapshot-build
     - *step-mksnapshot-store
-
-    # native_mksnapshot
-    - *step-maybe-native-mksnapshot-gn-gen
-    - *step-maybe-native-mksnapshot-build
-    - *step-maybe-native-mksnapshot-strip
-    - *step-maybe-native-mksnapshot-store
+    - *step-maybe-cross-arch-snapshot
+    - *step-maybe-cross-arch-snapshot-store
 
     # ffmpeg
     - *step-ffmpeg-gn-gen
@@ -611,10 +756,11 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-depot-tools-get
     - *step-depot-tools-add-to-path
     - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
+    - *step-get-more-space-on-mac
     - *step-gclient-sync
     - *step-setup-env-for-build
     - *step-gn-gen-default
+    - *step-delete-git-directories
 
     # Electron app
     - *step-electron-build
@@ -629,12 +775,6 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-mksnapshot-build
     - *step-mksnapshot-store
 
-    # native_mksnapshot
-    - *step-maybe-native-mksnapshot-gn-gen
-    - *step-maybe-native-mksnapshot-build
-    - *step-maybe-native-mksnapshot-strip
-    - *step-maybe-native-mksnapshot-store
-
     # chromedriver
     - *step-electron-chromedriver-build
     - *step-electron-chromedriver-store
@@ -668,18 +808,6 @@ steps-chromedriver-build: &steps-chromedriver-build
 
     - *step-maybe-notify-slack-failure
 
-steps-native-mksnapshot-build: &steps-native-mksnapshot-build
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - *step-setup-env-for-build
-    - *step-maybe-native-mksnapshot-gn-gen
-    - *step-maybe-native-mksnapshot-build
-    - *step-maybe-native-mksnapshot-store
-
-    - *step-maybe-notify-slack-failure
-
 steps-native-tests: &steps-native-tests
   steps:
     - attach_workspace:
@@ -745,7 +873,8 @@ steps-tests: &steps-tests
     - *step-mksnapshot-unzip
     - *step-setup-linux-for-headless-testing
     - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
+    - *step-fix-known-hosts-linux
+    - *step-install-signing-cert-on-mac
 
     - run:
         name: Run Electron tests
@@ -757,11 +886,17 @@ steps-tests: &steps-tests
         command: |
           cd src
           export ELECTRON_OUT_DIR=Default
-          (cd electron && npm run test -- --ci --enable-logging)
+          (cd electron && node script/yarn test -- --ci --enable-logging)
     - run:
         name: Check test results existence
         command: |
-          MOCHA_FILE='src/junit/test-results.xml'
+          MOCHA_FILE='src/junit/test-results-remote.xml'
+          # Check if it exists and not empty.
+          if [ ! -s "$MOCHA_FILE" ]; then
+            exit 1
+          fi
+
+          MOCHA_FILE='src/junit/test-results-main.xml'
           # Check if it exists and not empty.
           if [ ! -s "$MOCHA_FILE" ]; then
             exit 1
@@ -773,12 +908,34 @@ steps-tests: &steps-tests
 
     - *step-maybe-notify-slack-failure
 
+steps-test-nan: &steps-test-nan
+  steps:
+    - attach_workspace:
+          at: .
+    - *step-depot-tools-add-to-path
+    - *step-electron-dist-unzip
+    - *step-setup-linux-for-headless-testing
+    - *step-fix-known-hosts-linux
+    - run:
+        name: Run Nan Tests
+        command: |
+          cd src
+          export ELECTRON_OUT_DIR=Default
+          node electron/script/nan-spec-runner.js
+
 chromium-upgrade-branches: &chromium-upgrade-branches
   /chromium\-upgrade\/[0-9]+/
 
 # List of all jobs.
 version: 2
 jobs:
+  # Layer 0: Lint. Standalone.
+  lint:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+    <<: *steps-lint
+
   # Layer 1: Checkout.
   linux-checkout:
     <<: *machine-linux-2xlarge
@@ -815,16 +972,42 @@ jobs:
       <<: *env-linux-2xlarge
       <<: *env-debug-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build
 
+  linux-x64-debug-gn-check:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check
+
   linux-x64-testing:
     <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
+  linux-x64-testing-no-run-as-node:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-testing-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+      <<: *env-disable-run-as-node
+    <<: *steps-electron-build-for-tests
+
+  linux-x64-testing-gn-check:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-testing-build
+    <<: *steps-electron-gn-check
+
   linux-x64-chromedriver:
     <<: *machine-linux-medium
     environment:
@@ -841,6 +1024,7 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-x64-publish:
@@ -858,6 +1042,7 @@ jobs:
       <<: *env-ia32
       <<: *env-debug-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build
 
   linux-ia32-testing:
@@ -867,6 +1052,7 @@ jobs:
       <<: *env-ia32
       <<: *env-testing-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-ia32-chromedriver:
@@ -887,6 +1073,7 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-ia32-publish:
@@ -905,6 +1092,7 @@ jobs:
       <<: *env-arm
       <<: *env-debug-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build
 
   linux-arm-testing:
@@ -914,6 +1102,7 @@ jobs:
       <<: *env-arm
       <<: *env-testing-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
       TRIGGER_ARM_TEST: true
     <<: *steps-electron-build-for-tests
 
@@ -935,6 +1124,7 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-arm-publish:
@@ -946,16 +1136,6 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
     <<: *steps-electron-build-for-publish
 
-  linux-arm-native-mksnapshot:
-    <<: *machine-linux-2xlarge
-    environment:
-      <<: *env-linux-medium
-      <<: *env-arm
-      <<: *env-release-build
-      <<: *env-enable-sccache
-      <<: *env-send-slack-notifications
-    <<: *steps-native-mksnapshot-build
-
   linux-arm64-debug:
     <<: *machine-linux-2xlarge
     environment:
@@ -963,8 +1143,17 @@ jobs:
       <<: *env-arm64
       <<: *env-debug-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build
 
+  linux-arm64-debug-gn-check:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm64
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check
+
   linux-arm64-testing:
     <<: *machine-linux-2xlarge
     environment:
@@ -972,9 +1161,18 @@ jobs:
       <<: *env-arm64
       <<: *env-testing-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
       TRIGGER_ARM_TEST: true
     <<: *steps-electron-build-for-tests
 
+  linux-arm64-testing-gn-check:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm64
+      <<: *env-testing-build
+    <<: *steps-electron-gn-check
+
   linux-arm64-chromedriver:
     <<: *machine-linux-medium
     environment:
@@ -993,6 +1191,7 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-arm64-publish:
@@ -1004,24 +1203,29 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
     <<: *steps-electron-build-for-publish
 
-  linux-arm64-native-mksnapshot:
-    <<: *machine-linux-2xlarge
-    environment:
-      <<: *env-linux-medium
-      <<: *env-arm64
-      <<: *env-release-build
-      <<: *env-enable-sccache
-      <<: *env-send-slack-notifications
-    <<: *steps-native-mksnapshot-build
-
   osx-testing:
     <<: *machine-mac-large
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
+  osx-debug-gn-check:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check
+
+  osx-testing-gn-check:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-testing-build
+    <<: *steps-electron-gn-check
+
   osx-chromedriver:
     <<: *machine-mac
     environment:
@@ -1037,6 +1241,7 @@ jobs:
       <<: *env-mac-large
       <<: *env-release-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   osx-publish:
@@ -1054,8 +1259,25 @@ jobs:
       <<: *env-mas
       <<: *env-testing-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
+  mas-debug-gn-check:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-mas
+      <<: *env-debug-build
+    <<: *steps-electron-gn-check
+
+  mas-testing-gn-check:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-mas
+      <<: *env-testing-build
+    <<: *steps-electron-gn-check
+
   mas-chromedriver:
     <<: *machine-mac
     environment:
@@ -1072,6 +1294,7 @@ jobs:
       <<: *env-mas
       <<: *env-release-build
       <<: *env-enable-sccache
+      <<: *env-ninja-status      
     <<: *steps-electron-build-for-tests
 
   mas-publish:
@@ -1131,6 +1354,14 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-tests
 
+  linux-x64-testing-nan:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-stack-dumping
+    <<: *steps-test-nan
+
   linux-x64-release-tests:
     <<: *machine-linux-medium
     environment:
@@ -1164,6 +1395,15 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-tests
 
+  linux-ia32-testing-nan:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-headless-testing
+      <<: *env-stack-dumping
+    <<: *steps-test-nan
+
   linux-ia32-release-tests:
     <<: *machine-linux-medium
     environment:
@@ -1302,6 +1542,10 @@ jobs:
 
 workflows:
   version: 2
+  lint:
+    jobs:
+      - lint
+
   build-linux:
     jobs:
       - linux-checkout
@@ -1309,12 +1553,24 @@ workflows:
       - linux-x64-debug:
           requires:
             - linux-checkout
+      - linux-x64-debug-gn-check:
+          requires:
+            - linux-checkout
       - linux-x64-testing:
           requires:
             - linux-checkout
+      - linux-x64-testing-no-run-as-node:
+          requires:
+            - linux-checkout
+      - linux-x64-testing-gn-check:
+          requires:
+            - linux-checkout
       - linux-x64-testing-tests:
           requires:
             - linux-x64-testing
+      - linux-x64-testing-nan:
+          requires:
+            - linux-x64-testing
 
       - linux-ia32-debug:
           requires:
@@ -1325,6 +1581,9 @@ workflows:
       - linux-ia32-testing-tests:
           requires:
             - linux-ia32-testing
+      - linux-ia32-testing-nan:
+          requires:
+            - linux-ia32-testing
 
       - linux-arm-debug:
           requires:
@@ -1336,9 +1595,15 @@ workflows:
       - linux-arm64-debug:
           requires:
             - linux-checkout
+      - linux-arm64-debug-gn-check:
+          requires:
+            - linux-checkout
       - linux-arm64-testing:
           requires:
             - linux-checkout
+      - linux-arm64-testing-gn-check:
+          requires:
+            - linux-checkout
 
   build-mac:
     jobs:
@@ -1347,6 +1612,13 @@ workflows:
           requires:
             - mac-checkout
 
+      - osx-debug-gn-check:
+          requires:
+            - mac-checkout
+      - osx-testing-gn-check:
+          requires:
+            - mac-checkout
+
       - osx-testing-tests:
           requires:
             - osx-testing
@@ -1355,6 +1627,13 @@ workflows:
           requires:
             - mac-checkout
 
+      - mas-debug-gn-check:
+          requires:
+            - mac-checkout
+      - mas-testing-gn-check:
+          requires:
+            - mac-checkout
+
       - mas-testing-tests:
           requires:
             - mas-testing
@@ -1418,9 +1697,6 @@ workflows:
       - linux-arm-release:
           requires:
             - linux-checkout
-      - linux-arm-native-mksnapshot:
-          requires:
-            - linux-checkout
       - linux-arm-chromedriver:
           requires:
             - linux-checkout
@@ -1428,14 +1704,11 @@ workflows:
           requires:
             - linux-arm-release
             - linux-arm-chromedriver
-            - linux-arm-native-mksnapshot
+
 
       - linux-arm64-release:
           requires:
             - linux-checkout
-      - linux-arm64-native-mksnapshot:
-          requires:
-            - linux-checkout
       - linux-arm64-chromedriver:
           requires:
             - linux-checkout
@@ -1443,7 +1716,6 @@ workflows:
           requires:
             - linux-arm64-release
             - linux-arm64-chromedriver
-            - linux-arm64-native-mksnapshot
 
   nightly-mac-release-test:
     triggers:

.circleci/fix-known-hosts.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p ~/.ssh
+echo "|1|B3r+7aO0/x90IdefihIjxIoJrrk=|OJddGDfhbuLFc1bUyy84hhIw57M= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+|1|rGlEvW55DtzNZp+pzw9gvyOyKi4=|LLWr+7qlkAlw3YGGVfLHHxB/kR0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts

.env.example

@@ -1,7 +1,7 @@
 # These env vars are only necessary for creating Electron releases.
 # See docs/development/releasing.md
 
-APPVEYOR_TOKEN=
+APPVEYOR_CLOUD_TOKEN=
 CIRCLE_TOKEN=
 ELECTRON_GITHUB_TOKEN=
 VSTS_TOKEN=

.eslintrc.json

@@ -1,12 +1,34 @@
 {
   "extends": "standard",
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
   "env": {
     "browser": true
   },
   "rules": {
     "no-var": "error",
+    "no-unused-vars": 0,
+    "no-global-assign": 0,
+    "@typescript-eslint/no-unused-vars": ["error", {
+      "vars": "all",
+      "args": "after-used",
+      "ignoreRestSiblings": false
+    }],
     "prefer-const": ["error", {
       "destructuring": "all"
-    }]
-  }
+    }],
+    "node/no-deprecated-api": 0
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "overrides": [
+    {
+      "files": "*.js",
+      "rules": {
+          "@typescript-eslint/no-unused-vars": "off"
+      }
+    }
+  ]
 }

.github/CODEOWNERS

@@ -3,19 +3,28 @@
 # https://help.github.com/articles/about-codeowners
 # https://git-scm.com/docs/gitignore
 
-# Everything that falls through the cracks:
-* @electron/reviewers
+# Most stuff in here is owned by the Community & Safety WG...
+/.github/*                              @electron/wg-community
 
-# filename patterns
-*browser_view* @electron/browserview
-*notification* @electron/notifications
-*pdf* @electron/printing
-*printing* @electron/printing
-*updater* @electron/updater
+# ...except the Admin WG maintains this file.
+/.github/CODEOWNERS                     @electron/wg-admin
 
-# directories
-/.github/ @electron/electrocats
-/default_app/ @electron/docs
-/docs/ @electron/docs
-/docs-translations/ @electron/i18n
-/npm/ @electron/electrocats
+# Upgrades WG
+/patches/                               @electron/wg-upgrades
+
+# Docs & Tooling WG
+/default_app/ @electron/wg-docs-tools
+/docs/                                  @electron/wg-docs-tools
+
+# Releases WG
+/npm/                                   @electron/wg-releases
+/script/release-notes                   @electron/wg-releases
+/script/prepare-release.js              @electron/wg-releases
+/script/bump-version.js                 @electron/wg-releases
+/script/ci-release-build.js             @electron/wg-releases
+/script/release.js                      @electron/wg-releases
+/script/upload-to-github.js             @electron/wg-releases
+/script/release-artifact-cleanup.js     @electron/wg-releases
+/script/get-last-major-for-master.js    @electron/wg-releases
+/script/find-release.js                 @electron/wg-releases
+/script/download-circleci-artifacts.js  @electron/wg-releases

.github/ISSUE_TEMPLATE.md

@@ -1,38 +0,0 @@
-<!--
-Thanks for opening an issue! A few things to keep in mind:
-
-- The issue tracker is only for bugs and feature requests.
-- Before reporting a bug, please try reproducing your issue against
-  the latest version of Electron.
-- If you need general advice, join our Slack: http://atom-slack.herokuapp.com
--->
-
-* Output of `node_modules/.bin/electron --version`:
-* Operating System (Platform and Version):
-
-<!-- If this used to work -->
-* Output of `node_modules/.bin/electron --version` on last known working Electron version (if applicable):
-
-### Expected behavior
-
-<!-- What do you think should happen? -->
-
-### Actual behavior
-
-<!-- What actually happens? -->
-
-### How to reproduce
-
-<!-- 
-
-Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
-
-You can fork https://github.com/electron/electron-quick-start and include a link to the branch with your changes.
-
-If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
-
-  $ git clone $YOUR_URL -b $BRANCH
-  $ npm install
-  $ npm start || electron .
-
--->

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -4,29 +4,51 @@ about: Create a report to help us improve Electron
 
 ---
 
-* Output of `node_modules/.bin/electron --version`:
-* Operating System (Platform and Version):
-* Output of `node_modules/.bin/electron --version` on last known working Electron version (if applicable):
+<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
+-->
 
-**Expected Behavior**
-A clear and concise description of what you expected to happen.
+### Preflight Checklist
+<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
 
-**Actual behavior**
-A clear and concise description of what actually happened.
+* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
+* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
+* [ ] I have searched the issue tracker for an issue that matches the one I want to file, without success.
 
-**To Reproduce**
+### Issue Details
+
+* **Electron Version:**
+  * <!-- (output of `node_modules/.bin/electron --version`) e.g. 4.0.3 -->
+* **Operating System:**
+  * <!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
+* **Last Known Working Electron version:**
+  * <!-- (if applicable) e.g. 3.1.0 -->
+
+### Expected Behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Actual Behavior
+<!-- A clear and concise description of what actually happened. -->
+
+### To Reproduce
+<!--
 Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
+-->
 
-You can fork [electron-quick-start](https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
+<!--
+You can fork electron-quick-start (https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
+-->
 
+<!--
 If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
 ```sh
 $ git clone $YOUR_URL -b $BRANCH
 $ npm install
 $ npm start || electron .
 ```
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+-->
 
-**Additional Information**
-Add any other context about the problem here.
+### Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### Additional Information
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -4,14 +4,24 @@ about: Suggest an idea for Electron
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is.
+<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
+-->
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+### Preflight Checklist
+<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
+* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
+* [ ] I have searched the issue tracker for a feature request that matches the one I want to file, without success.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+### Problem Description
+<!-- Is your feature request related to a problem? Please add a clear and concise description of what the problem is. -->
+
+### Proposed Solution
+<!-- Describe the solution you'd like in a clear and concise manner -->
+
+### Alternatives Considered
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+### Additional Information
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/mac-app-store-private-api-rejection.md

@@ -1,13 +0,0 @@
----
-name: Mac App Store Private API Rejection
-about: Your app was rejected from the Mac App Store for using private API's
-
----
-
-* Electron Version: 
-
-**Rejection Email**
-Paste the contents of your rejection email here, censoring any private information such as app names.
-
-**Additional Information**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.md

@@ -0,0 +1,25 @@
+---
+name: Mac App Store Private API Rejection
+about: Your app was rejected from the Mac App Store for using private API's
+
+---
+
+<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
+-->
+
+### Preflight Checklist
+<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
+
+* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
+* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
+
+### Issue Details
+
+* **Electron Version:** 
+  * <!-- (output of `node_modules/.bin/electron --version`) e.g. 4.0.3 -->
+
+### Rejection Email
+<!-- Paste the contents of your rejection email here, censoring any private information such as app names.-->
+
+### Additional Information
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/security_report.md

@@ -4,6 +4,7 @@ about: Do not create an issue for security reports, send an email to security@el
 
 ---
 
-Do not create an issue for security reports, send an email to:
+### Notice 
 
-security@electronjs.org
+**DO NOT** create an issue for security reports.
+Send an email to: **security@electronjs.org**.

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,7 +16,6 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] 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).
 
-
 #### Release Notes
 
 Notes: <!-- Please add a one-line description for app developers to read in the release notes, or `no-notes` if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->

.github/config.yml

@@ -1,13 +1,3 @@
-# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: |
-  👋 Thanks for opening your first issue here! If you're reporting a 🐞 bug, please make sure you include steps to reproduce it. We get a lot of issues on this repo, so please be patient and we will get back to you as soon as we can.
-
-  To help make it easier for us to investigate your issue, please follow the [contributing guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md).
-
-# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
-
 # Comment to be posted to on PRs from first time contributors in your repository
 newPRWelcomeComment: |
   💖 Thanks for opening this pull request! 💖
@@ -36,11 +26,6 @@ newPRWelcomeComment: |
 firstPRMergeComment: >
   Congrats on merging your first pull request! 🎉🎉🎉
 
-# Configuration for trop - https://github.com/electron/trop
-
-watchedProject:
-  name: Backports
-
 # Users authorized to run manual trop backports
 authorizedUsers:
   - alexeykuzmin
@@ -50,6 +35,7 @@ authorizedUsers:
   - deepak1556
   - jkleinsc
   - MarshallOfSound
+  - miniak
   - nitsakh
   - nornagon
   - zcbenz

.github/main.workflow

@@ -0,0 +1,10 @@
+workflow "Clerk" {
+  #TODO(codebytere): make this work properly on pull_request
+  on = "repository_dispatch"
+  resolves = "Check release notes"
+}
+
+action "Check release notes" {
+  uses = "electron/clerk@master"
+  secrets = [ "GITHUB_TOKEN" ]
+}

.gitignore

@@ -37,7 +37,7 @@
 /vendor/pyyaml
 node_modules/
 SHASUMS256.txt
-**/yarn.lock
+**/package-lock.json
 compile_commands.json
 .envrc
 
@@ -59,3 +59,9 @@ spec/.hash
 
 # Generated native addon files
 /spec/fixtures/native-addon/echo/build/
+
+# If someone runs tsc this is where stuff will end up
+ts-gen
+
+# Used to accelerate CI builds
+.depshash

.vsts/lint.yml

@@ -1,31 +0,0 @@
-pool:
-  vmImage: 'Ubuntu 16.04'
-
-steps:
-- bash: |
-    # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-    git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "${AGENT_BUILDDIRECTORY}/third_party/depot_tools"
-    echo "##vso[task.setvariable variable=PATH]$PATH:${AGENT_BUILDDIRECTORY}/third_party/depot_tools"
-  displayName: Setup Depot Tools
-
-- bash: |
-    chromium_revision="$(grep -A1 chromium_version DEPS | tr -d '\n' | cut -d\' -f4)"
-    buildtools_revision="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep buildtools_revision -A1 | tr -d '\n' | cut -d\' -f4)"
-
-    git clone https://chromium.googlesource.com/chromium/buildtools "${AGENT_TEMPDIRECTORY}/buildtools"
-    (cd "${AGENT_TEMPDIRECTORY}/buildtools" && git checkout "$buildtools_revision")
-    echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]$AGENT_TEMPDIRECTORY/buildtools"
-
-    download_from_google_storage --bucket chromium-gn -s "${AGENT_TEMPDIRECTORY}/buildtools/linux64/gn.sha1"
-  displayName: Download gn binary
-
-- bash: |
-    # gn.py tries to find a gclient root folder starting from the current dir.
-    # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
-    touch .gclient
-    # Another option would be to checkout "buildtools" inside the Electron checkout,
-    # but then we would lint its contents (at least gn format), and it doesn't pass it.
-
-    npm install
-    npm run lint
-  displayName: Run Lint

BUILD.gn

@@ -2,21 +2,27 @@ import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
 import("//pdf/features.gni")
+import("//printing/buildflags/buildflags.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
 import("//tools/generate_library_loader/generate_library_loader.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-import("//v8/snapshot_toolchain.gni")
+import("//v8/gni/snapshot_toolchain.gni")
 import("build/asar.gni")
 import("build/npm.gni")
+import("build/templated_file.gni")
+import("build/tsc.gni")
+import("build/webpack/webpack.gni")
 import("buildflags/buildflags.gni")
 import("electron_paks.gni")
+import("filenames.auto.gni")
 import("filenames.gni")
 
 if (is_mac) {
   import("//build/config/mac/rules.gni")
   import("//third_party/icu/config.gni")
+  import("//ui/gl/features.gni")
   import("//v8/gni/v8.gni")
 }
 
@@ -35,7 +41,7 @@ if (is_linux) {
   }
 }
 
-branding = read_file("atom/app/BRANDING.json", "json")
+branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
 electron_mac_bundle_id = branding.mac_bundle_id
@@ -47,55 +53,90 @@ if (is_mas_build) {
 
 config("branding") {
   defines = [
-    "ATOM_PRODUCT_NAME=\"$electron_product_name\"",
-    "ATOM_PROJECT_NAME=\"$electron_project_name\"",
+    "ELECTRON_PRODUCT_NAME=\"$electron_product_name\"",
+    "ELECTRON_PROJECT_NAME=\"$electron_project_name\"",
   ]
 }
 
-npm_action("atom_browserify_sandbox") {
-  script = "browserify"
-
-  inputs = [
-    # FIXME(zcbenz): The dependencies of these files are not listed here, so
-    # the generated file will be out-dated when dependencies are modified.
-    # Use a script to generate all dependencies and put them here.
-    "lib/sandboxed_renderer/init.js",
-    "lib/sandboxed_renderer/api/exports/electron.js",
-  ]
+# We geneate the definitions twice here, once in //electron/electron.d.ts
+# and once in $target_gen_dir
+# The one in $target_gen_dir is used for the actual TSC build later one
+# and the one in //electron/electron.d.ts is used by your IDE (vscode)
+# for typescript prompting
+npm_action("build_electron_definitions") {
+  script = "gn-typescript-definitions"
+  args = [ rebase_path("$target_gen_dir/tsc/typings/electron.d.ts") ]
+  inputs = auto_filenames.api_docs + [ "yarn.lock" ]
 
   outputs = [
-    "$target_gen_dir/js2c/preload_bundle.js",
-  ]
-
-  args = [
-    "lib/sandboxed_renderer/init.js",
-    "-r",
-    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-    "-t",
-    "aliasify",
-    "-o",
-    rebase_path(outputs[0]),
+    "$target_gen_dir/tsc/typings/electron.d.ts",
   ]
 }
 
-npm_action("atom_browserify_isolated") {
-  script = "browserify"
-
-  inputs = [
-    "lib/isolated_renderer/init.js",
+webpack_build("electron_browser_bundle") {
+  deps = [
+    ":build_electron_definitions",
   ]
 
-  outputs = [
-    "$target_gen_dir/js2c/isolated_bundle.js",
+  inputs = auto_filenames.browser_bundle_deps
+
+  config_file = "//electron/build/webpack/webpack.config.browser.js"
+  out_file = "$target_gen_dir/js2c/browser_init.js"
+}
+
+webpack_build("electron_renderer_bundle") {
+  deps = [
+    ":build_electron_definitions",
   ]
 
-  args = [
-    "lib/isolated_renderer/init.js",
-    "-t",
-    "aliasify",
-    "-o",
-    rebase_path(outputs[0]),
+  inputs = auto_filenames.renderer_bundle_deps
+
+  config_file = "//electron/build/webpack/webpack.config.renderer.js"
+  out_file = "$target_gen_dir/js2c/renderer_init.js"
+}
+
+webpack_build("electron_worker_bundle") {
+  deps = [
+    ":build_electron_definitions",
   ]
+
+  inputs = auto_filenames.worker_bundle_deps
+
+  config_file = "//electron/build/webpack/webpack.config.worker.js"
+  out_file = "$target_gen_dir/js2c/worker_init.js"
+}
+
+webpack_build("electron_sandboxed_renderer_bundle") {
+  deps = [
+    ":build_electron_definitions",
+  ]
+
+  inputs = auto_filenames.sandbox_bundle_deps
+
+  config_file = "//electron/build/webpack/webpack.config.sandboxed_renderer.js"
+  out_file = "$target_gen_dir/js2c/sandbox_bundle.js"
+}
+
+webpack_build("electron_isolated_renderer_bundle") {
+  deps = [
+    ":build_electron_definitions",
+  ]
+
+  inputs = auto_filenames.isolated_bundle_deps
+
+  config_file = "//electron/build/webpack/webpack.config.isolated_renderer.js"
+  out_file = "$target_gen_dir/js2c/isolated_bundle.js"
+}
+
+webpack_build("electron_content_script_bundle") {
+  deps = [
+    ":build_electron_definitions",
+  ]
+
+  inputs = auto_filenames.content_script_bundle_deps
+
+  config_file = "//electron/build/webpack/webpack.config.content_script.js"
+  out_file = "$target_gen_dir/js2c/content_script_bundle.js"
 }
 
 copy("atom_js2c_copy") {
@@ -110,17 +151,25 @@ copy("atom_js2c_copy") {
 
 action("atom_js2c") {
   deps = [
-    ":atom_browserify_isolated",
-    ":atom_browserify_sandbox",
     ":atom_js2c_copy",
+    ":electron_browser_bundle",
+    ":electron_content_script_bundle",
+    ":electron_isolated_renderer_bundle",
+    ":electron_renderer_bundle",
+    ":electron_sandboxed_renderer_bundle",
+    ":electron_worker_bundle",
   ]
 
-  browserify_sources = [
+  webpack_sources = [
+    "$target_gen_dir/js2c/browser_init.js",
+    "$target_gen_dir/js2c/renderer_init.js",
+    "$target_gen_dir/js2c/worker_init.js",
+    "$target_gen_dir/js2c/content_script_bundle.js",
     "$target_gen_dir/js2c/isolated_bundle.js",
-    "$target_gen_dir/js2c/preload_bundle.js",
+    "$target_gen_dir/js2c/sandbox_bundle.js",
   ]
 
-  sources = browserify_sources + [
+  sources = webpack_sources + [
               "$target_gen_dir/js2c/asar.js",
               "$target_gen_dir/js2c/asar_init.js",
             ]
@@ -136,37 +185,49 @@ action("atom_js2c") {
          rebase_path(sources, root_build_dir)
 }
 
-asar("js2asar") {
-  sources = filenames.js_sources
-  if (enable_desktop_capturer) {
-    sources += [
-      "lib/browser/desktop-capturer.js",
-      "lib/renderer/api/desktop-capturer.js",
-    ]
-  }
-  if (enable_view_api) {
-    sources += [
-      "lib/browser/api/views/box-layout.js",
-      "lib/browser/api/views/button.js",
-      "lib/browser/api/views/label-button.js",
-      "lib/browser/api/views/layout-manager.js",
-      "lib/browser/api/views/md-text-button.js",
-      "lib/browser/api/views/resize-area.js",
-      "lib/browser/api/views/text-field.js",
-    ]
-  }
-  outputs = [
-    "$root_out_dir/resources/electron.asar",
+target_gen_default_app_js = "$target_gen_dir/js/default_app"
+
+typescript_build("default_app_js") {
+  deps = [
+    ":build_electron_definitions",
   ]
-  root = "lib"
+  type_root = rebase_path("$target_gen_dir/tsc/electron/typings")
+
+  sources = filenames.default_app_ts_sources
+
+  output_gen_dir = target_gen_default_app_js
+  output_dir_name = "default_app"
+  tsconfig = "tsconfig.default_app.json"
 }
 
-asar("app2asar") {
-  sources = filenames.default_app_sources
+copy("default_app_static") {
+  sources = filenames.default_app_static_sources
+  outputs = [
+    "$target_gen_default_app_js/{{source}}",
+  ]
+}
+
+copy("default_app_octicon_deps") {
+  sources = filenames.default_app_octicon_sources
+  outputs = [
+    "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}",
+  ]
+}
+
+asar("default_app_asar") {
+  deps = [
+    ":default_app_js",
+    ":default_app_octicon_deps",
+    ":default_app_static",
+  ]
+
+  root = "$target_gen_default_app_js/electron/default_app"
+  sources = get_target_outputs(":default_app_js") +
+            get_target_outputs(":default_app_static") +
+            get_target_outputs(":default_app_octicon_deps")
   outputs = [
     "$root_out_dir/resources/default_app.asar",
   ]
-  root = "default_app"
 }
 
 grit("resources") {
@@ -224,6 +285,56 @@ if (is_linux) {
   }
 }
 
+source_set("manifests") {
+  sources = [
+    "//electron/shell/app/manifests.cc",
+    "//electron/shell/app/manifests.h",
+  ]
+
+  include_dirs = [ "//electron" ]
+
+  deps = [
+    "//electron/shell/common/api:mojo",
+    "//printing/buildflags",
+    "//services/proxy_resolver/public/cpp:manifest",
+    "//services/service_manager/public/cpp",
+  ]
+
+  if (enable_basic_printing) {
+    deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
+  }
+
+  if (enable_print_preview) {
+    deps += [ "//chrome/services/printing/public/cpp:manifest" ]
+  }
+}
+
+npm_action("electron_version_args") {
+  script = "generate-version-json"
+
+  outputs = [
+    "$target_gen_dir/electron_version.args",
+  ]
+
+  args = rebase_path(outputs)
+
+  inputs = [
+    "ELECTRON_VERSION",
+    "script/generate-version-json.js",
+  ]
+}
+
+templated_file("electron_version_header") {
+  deps = [
+    ":electron_version_args",
+  ]
+
+  template = "build/templates/electron_version.tmpl"
+  output = "$target_gen_dir/electron_version.h"
+
+  args_files = get_target_outputs(":electron_version_args")
+}
+
 static_library("electron_lib") {
   configs += [ "//v8:external_startup_data" ]
   configs += [ "//third_party/electron_node:node_internals" ]
@@ -232,13 +343,15 @@ static_library("electron_lib") {
 
   deps = [
     ":atom_js2c",
+    ":electron_version_header",
+    ":manifests",
+    ":resources",
     "buildflags",
     "chromium_src:chrome",
-    "manifests",
     "native_mate",
-    "//base",
+    "shell/common/api:mojo",
     "//base:base_static",
-    "//base:i18n",
+    "//base/allocator:buildflags",
     "//chrome/app/resources:platform_locale_settings",
     "//components/certificate_transparency",
     "//components/net_log",
@@ -247,10 +360,13 @@ static_library("electron_lib") {
     "//components/spellcheck/renderer",
     "//components/viz/host",
     "//components/viz/service",
-    "//content/public/app:both",
     "//content/public/browser",
     "//content/public/child",
     "//content/public/common:service_names",
+    "//content/public/gpu",
+    "//content/public/renderer",
+    "//content/public/utility",
+    "//device/bluetooth",
     "//gin",
     "//media/capture/mojom:video_capture",
     "//media/mojo/interfaces",
@@ -260,7 +376,9 @@ static_library("electron_lib") {
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/shared_impl",
+    "//printing/buildflags",
     "//services/audio/public/mojom:constants",
+    "//services/device/public/cpp/geolocation",
     "//services/device/public/mojom",
     "//services/proxy_resolver:lib",
     "//services/video_capture/public/mojom:constants",
@@ -273,10 +391,20 @@ static_library("electron_lib") {
     "//third_party/libyuv",
     "//third_party/webrtc_overrides:init_webrtc",
     "//third_party/widevine/cdm:headers",
+    "//ui/base/idle",
     "//ui/events:dom_keycode_converter",
     "//ui/gl",
+    "//ui/native_theme",
+    "//ui/shell_dialogs",
     "//ui/views",
     "//v8",
+    "//v8:v8_libplatform",
+  ]
+
+  public_deps = [
+    "//base",
+    "//base:i18n",
+    "//content/public/app:both",
   ]
 
   include_dirs = [
@@ -324,8 +452,6 @@ static_library("electron_lib") {
       "*_views.cc",
       "*_views.h",
       "*\bviews/*",
-      "*/autofill_popup.cc",
-      "*/autofill_popup.h",
     ]
   }
 
@@ -340,29 +466,26 @@ static_library("electron_lib") {
 
   if (enable_fake_location_provider) {
     sources += [
-      "atom/browser/fake_location_provider.cc",
-      "atom/browser/fake_location_provider.h",
+      "shell/browser/fake_location_provider.cc",
+      "shell/browser/fake_location_provider.h",
     ]
   }
 
   if (is_mac) {
     deps += [
-      "//third_party/crashpad/crashpad/client",
+      "//components/remote_cocoa/app_shim",
       "//ui/accelerated_widget_mac",
     ]
-    include_dirs += [
-      # NOTE(nornagon): other chromium files use the full path to include
-      # crashpad; this is just here for compatibility between GN and GYP, so that
-      # the #includes can be agnostic about where crashpad is vendored.
-      "//third_party/crashpad",
+    sources += [
+      "shell/browser/ui/views/autofill_popup_view.cc",
+      "shell/browser/ui/views/autofill_popup_view.h",
     ]
     if (is_mas_build) {
-      deps -= [ "//third_party/crashpad/crashpad/client" ]
-      sources += [ "atom/browser/api/atom_api_app_mas.mm" ]
+      sources += [ "shell/browser/api/atom_api_app_mas.mm" ]
       sources -= [
-        "atom/browser/auto_updater_mac.mm",
-        "atom/common/crash_reporter/crash_reporter_mac.h",
-        "atom/common/crash_reporter/crash_reporter_mac.mm",
+        "shell/browser/auto_updater_mac.mm",
+        "shell/common/crash_reporter/crash_reporter_mac.h",
+        "shell/common/crash_reporter/crash_reporter_mac.mm",
       ]
       defines += [ "MAS_BUILD" ]
     } else {
@@ -387,13 +510,14 @@ static_library("electron_lib") {
       "//chrome/browser/ui/libgtkui",
       "//dbus",
       "//device/bluetooth",
+      "//third_party/breakpad:client",
       "//ui/events/devices/x11",
       "//ui/events/platform/x11",
-      "//ui/native_theme",
       "//ui/views/controls/webview",
       "//ui/wm",
     ]
     configs += [ ":gio_unix" ]
+    include_dirs += [ "//third_party/breakpad" ]
     defines += [
       # Disable warnings for g_settings_list_schemas.
       "GLIB_DISABLE_DEPRECATION_WARNINGS",
@@ -403,10 +527,24 @@ static_library("electron_lib") {
   }
   if (is_win) {
     libs += [ "dwmapi.lib" ]
+    deps += [
+      "//ui/native_theme:native_theme_browser",
+      "//ui/views/controls/webview",
+      "//ui/wm",
+      "//ui/wm/public",
+    ]
+    public_deps += [
+      "//sandbox/win:sandbox",
+      "//third_party/crashpad/crashpad/handler",
+    ]
   }
-  if (is_linux || is_win) {
-    deps += [ "//third_party/breakpad:client" ]
-    include_dirs += [ "//third_party/breakpad" ]
+
+  if ((is_mac && !is_mas_build) || is_win) {
+    sources += [
+      "shell/common/crash_reporter/crash_reporter_crashpad.cc",
+      "shell/common/crash_reporter/crash_reporter_crashpad.h",
+    ]
+    deps += [ "//third_party/crashpad/crashpad/client" ]
   }
 
   if (enable_pdf) {
@@ -415,23 +553,25 @@ static_library("electron_lib") {
 
   if (enable_run_as_node) {
     sources += [
-      "atom/app/node_main.cc",
-      "atom/app/node_main.h",
+      "shell/app/node_main.cc",
+      "shell/app/node_main.h",
     ]
   }
 
   if (enable_osr) {
     sources += [
-      "atom/browser/osr/osr_output_device.cc",
-      "atom/browser/osr/osr_output_device.h",
-      "atom/browser/osr/osr_render_widget_host_view.cc",
-      "atom/browser/osr/osr_render_widget_host_view.h",
-      "atom/browser/osr/osr_render_widget_host_view_mac.mm",
-      "atom/browser/osr/osr_view_proxy.cc",
-      "atom/browser/osr/osr_view_proxy.h",
-      "atom/browser/osr/osr_web_contents_view.cc",
-      "atom/browser/osr/osr_web_contents_view.h",
-      "atom/browser/osr/osr_web_contents_view_mac.mm",
+      "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",
+      "shell/browser/osr/osr_video_consumer.h",
+      "shell/browser/osr/osr_view_proxy.cc",
+      "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",
     ]
     deps += [
       "//components/viz/service",
@@ -447,36 +587,36 @@ static_library("electron_lib") {
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
     sources += [
-      "atom/browser/api/atom_api_desktop_capturer.cc",
-      "atom/browser/api/atom_api_desktop_capturer.h",
+      "shell/browser/api/atom_api_desktop_capturer.cc",
+      "shell/browser/api/atom_api_desktop_capturer.h",
     ]
   }
 
   if (enable_view_api) {
     sources += [
-      "atom/browser/api/views/atom_api_box_layout.cc",
-      "atom/browser/api/views/atom_api_box_layout.h",
-      "atom/browser/api/views/atom_api_button.cc",
-      "atom/browser/api/views/atom_api_button.h",
-      "atom/browser/api/views/atom_api_label_button.cc",
-      "atom/browser/api/views/atom_api_label_button.h",
-      "atom/browser/api/views/atom_api_layout_manager.cc",
-      "atom/browser/api/views/atom_api_layout_manager.h",
-      "atom/browser/api/views/atom_api_md_text_button.cc",
-      "atom/browser/api/views/atom_api_md_text_button.h",
-      "atom/browser/api/views/atom_api_resize_area.cc",
-      "atom/browser/api/views/atom_api_resize_area.h",
-      "atom/browser/api/views/atom_api_text_field.cc",
-      "atom/browser/api/views/atom_api_text_field.h",
+      "shell/browser/api/views/atom_api_box_layout.cc",
+      "shell/browser/api/views/atom_api_box_layout.h",
+      "shell/browser/api/views/atom_api_button.cc",
+      "shell/browser/api/views/atom_api_button.h",
+      "shell/browser/api/views/atom_api_label_button.cc",
+      "shell/browser/api/views/atom_api_label_button.h",
+      "shell/browser/api/views/atom_api_layout_manager.cc",
+      "shell/browser/api/views/atom_api_layout_manager.h",
+      "shell/browser/api/views/atom_api_md_text_button.cc",
+      "shell/browser/api/views/atom_api_md_text_button.h",
+      "shell/browser/api/views/atom_api_resize_area.cc",
+      "shell/browser/api/views/atom_api_resize_area.h",
+      "shell/browser/api/views/atom_api_text_field.cc",
+      "shell/browser/api/views/atom_api_text_field.h",
     ]
   }
 
   if (enable_basic_printing) {
     sources += [
-      "atom/browser/printing/print_preview_message_handler.cc",
-      "atom/browser/printing/print_preview_message_handler.h",
-      "atom/renderer/printing/print_render_frame_helper_delegate.cc",
-      "atom/renderer/printing/print_render_frame_helper_delegate.h",
+      "shell/browser/printing/print_preview_message_handler.cc",
+      "shell/browser/printing/print_preview_message_handler.h",
+      "shell/renderer/printing/print_render_frame_helper_delegate.cc",
+      "shell/renderer/printing/print_render_frame_helper_delegate.h",
     ]
   }
 
@@ -500,12 +640,6 @@ if (is_mac) {
   electron_login_helper_name = "$electron_product_name Login Helper"
   electron_framework_version = "A"
 
-  mac_xib_bundle_data("electron_xibs") {
-    sources = [
-      "atom/common/resources/mac/MainMenu.xib",
-    ]
-  }
-
   bundle_data("electron_framework_resources") {
     public_deps = [
       ":packed_resources",
@@ -546,6 +680,50 @@ if (is_mac) {
     group("electron_framework_libraries") {
     }
   }
+  if (use_egl) {
+    # Add the ANGLE .dylibs in the Libraries directory of the Framework.
+    bundle_data("electron_angle_binaries") {
+      sources = [
+        "$root_out_dir/egl_intermediates/libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libGLESv2.dylib",
+      ]
+      outputs = [
+        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
+      ]
+      public_deps = [
+        "//ui/gl:angle_library_copy",
+      ]
+    }
+
+    # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
+    bundle_data("electron_swiftshader_binaries") {
+      sources = [
+        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
+      ]
+      outputs = [
+        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
+      ]
+      public_deps = [
+        "//ui/gl:swiftshader_library_copy",
+      ]
+    }
+  }
+  group("electron_angle_library") {
+    if (use_egl) {
+      deps = [
+        ":electron_angle_binaries",
+      ]
+    }
+  }
+
+  group("electron_swiftshader_library") {
+    if (use_egl) {
+      deps = [
+        ":electron_swiftshader_binaries",
+      ]
+    }
+  }
 
   bundle_data("electron_crashpad_helper") {
     sources = [
@@ -572,18 +750,19 @@ if (is_mac) {
       ":electron_lib",
     ]
     deps = [
+      ":electron_angle_library",
       ":electron_framework_libraries",
       ":electron_framework_resources",
-      ":electron_xibs",
+      ":electron_swiftshader_library",
     ]
     if (!is_mas_build) {
       deps += [ ":electron_crashpad_helper" ]
     }
-    info_plist = "atom/common/resources/mac/Info.plist"
+    info_plist = "shell/common/resources/mac/Info.plist"
 
     electron_version = read_file("ELECTRON_VERSION", "trim string")
     extra_substitutions = [
-      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
+      "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.framework",
       "ELECTRON_VERSION=$electron_version",
     ]
 
@@ -593,6 +772,7 @@ if (is_mac) {
     libs = [
       "AVFoundation.framework",
       "Carbon.framework",
+      "LocalAuthentication.framework",
       "QuartzCore.framework",
       "Quartz.framework",
       "Security.framework",
@@ -600,6 +780,11 @@ if (is_mac) {
       "ServiceManagement.framework",
       "StoreKit.framework",
     ]
+
+    if (enable_osr) {
+      libs += [ "IOSurface.framework" ]
+    }
+
     ldflags = [
       "-F",
       rebase_path("external_binaries", root_build_dir),
@@ -625,9 +810,11 @@ if (is_mac) {
     }
     defines = [ "HELPER_EXECUTABLE" ]
     sources = filenames.app_sources
+    sources += [ "shell/common/atom_constants.cc" ]
     include_dirs = [ "." ]
-    info_plist = "atom/renderer/resources/mac/Info.plist"
-    extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
+    info_plist = "shell/renderer/resources/mac/Info.plist"
+    extra_substitutions =
+        [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
     ldflags = [
       "-rpath",
       "@executable_path/../../..",
@@ -666,9 +853,9 @@ if (is_mac) {
     sources = filenames.login_helper_sources
     include_dirs = [ "." ]
     libs = [ "AppKit.framework" ]
-    info_plist = "atom/app/resources/mac/loginhelper-Info.plist"
+    info_plist = "shell/app/resources/mac/loginhelper-Info.plist"
     extra_substitutions =
-        [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
+        [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
   }
 
   bundle_data("electron_login_helper_app") {
@@ -715,14 +902,12 @@ if (is_mac) {
 
   bundle_data("electron_app_resources") {
     public_deps = [
-      ":app2asar",
+      ":default_app_asar",
       ":electron_app_strings_bundle_data",
-      ":js2asar",
     ]
     sources = [
       "$root_out_dir/resources/default_app.asar",
-      "$root_out_dir/resources/electron.asar",
-      "atom/browser/resources/mac/electron.icns",
+      "shell/browser/resources/mac/electron.icns",
     ]
     outputs = [
       "{{bundle_resources_dir}}/{{source_file_part}}",
@@ -732,6 +917,7 @@ if (is_mac) {
   mac_app_bundle("electron_app") {
     output_name = electron_product_name
     sources = filenames.app_sources
+    sources += [ "shell/common/atom_constants.cc" ]
     include_dirs = [ "." ]
     deps = [
       ":electron_app_framework_bundle_data",
@@ -740,8 +926,12 @@ if (is_mac) {
     if (is_mas_build) {
       deps += [ ":electron_login_helper_app" ]
     }
-    info_plist = "atom/browser/resources/mac/Info.plist"
-    extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id" ]
+    info_plist = "shell/browser/resources/mac/Info.plist"
+    electron_version = read_file("ELECTRON_VERSION", "trim string")
+    extra_substitutions = [
+      "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id",
+      "ELECTRON_VERSION=$electron_version",
+    ]
     ldflags = [
       "-rpath",
       "@executable_path/../Frameworks",
@@ -750,8 +940,8 @@ if (is_mac) {
 } else {
   windows_manifest("electron_app_manifest") {
     sources = [
-      "atom/browser/resources/win/disable_window_filtering.manifest",
-      "atom/browser/resources/win/dpi_aware.manifest",
+      "shell/browser/resources/win/disable_window_filtering.manifest",
+      "shell/browser/resources/win/dpi_aware.manifest",
       as_invoker_manifest,
       common_controls_manifest,
       default_compatibility_manifest,
@@ -763,12 +953,12 @@ if (is_mac) {
     sources = filenames.app_sources
     include_dirs = [ "." ]
     deps = [
-      ":app2asar",
+      ":default_app_asar",
       ":electron_app_manifest",
       ":electron_lib",
-      ":js2asar",
       ":packed_resources",
       "//content:sandbox_helper_win",
+      "//electron/buildflags",
       "//ui/strings",
     ]
 
@@ -785,7 +975,6 @@ if (is_mac) {
 
     if (!is_mac) {
       data += [ "$root_out_dir/resources/default_app.asar" ]
-      data += [ "$root_out_dir/resources/electron.asar" ]
     }
 
     public_deps = [
@@ -795,19 +984,9 @@ if (is_mac) {
     if (is_win) {
       sources += [
         # TODO: we should be generating our .rc files more like how chrome does
-        "atom/browser/resources/win/atom.ico",
-        "atom/browser/resources/win/atom.rc",
-        "atom/browser/resources/win/resources.h",
-      ]
-
-      deps += [
-        "//third_party/breakpad:breakpad_handler",
-        "//third_party/breakpad:breakpad_sender",
-        "//ui/native_theme:native_theme_browser",
-        "//ui/shell_dialogs",
-        "//ui/views/controls/webview",
-        "//ui/wm",
-        "//ui/wm/public",
+        "shell/browser/resources/win/atom.ico",
+        "shell/browser/resources/win/atom.rc",
+        "shell/browser/resources/win/resource.h",
       ]
 
       libs = [
@@ -858,6 +1037,7 @@ template("dist_zip") {
                              "deps",
                              "data_deps",
                              "data",
+                             "testonly",
                            ])
     write_runtime_deps = _runtime_deps_file
   }
@@ -867,7 +1047,11 @@ template("dist_zip") {
     deps = [
       ":$_runtime_deps_target",
     ]
-    forward_variables_from(invoker, [ "outputs" ])
+    forward_variables_from(invoker,
+                           [
+                             "outputs",
+                             "testonly",
+                           ])
     args = rebase_path(outputs + [ _runtime_deps_file ], root_build_dir) + [
              target_cpu,
              target_os,
@@ -917,6 +1101,9 @@ dist_zip("electron_dist_zip") {
     ":licenses",
     ":electron_version",
   ]
+  if (is_linux) {
+    data_deps += [ "//sandbox/linux:chrome_sandbox" ]
+  }
   outputs = [
     "$root_build_dir/dist.zip",
   ]
@@ -932,6 +1119,7 @@ dist_zip("electron_ffmpeg_zip") {
 }
 
 dist_zip("electron_chromedriver_zip") {
+  testonly = true
   data_deps = [
     "//chrome/test/chromedriver",
     ":licenses",

CONTRIBUTING.md

@@ -28,6 +28,18 @@ the issue will be closed.
   * If an issue has been closed and you still feel it's relevant, feel free to
   ping a maintainer or add a comment!
 
+### Languages
+
+We accept issues in *any* language.
+When an issue is posted in a language besides English, it is acceptable and encouraged to post an English-translated copy as a reply. 
+Anyone may post the translated reply.
+In most cases, a quick pass through translation software is sufficient.
+Having the original text _as well as_ the translation can help mitigate translation errors.
+
+Responses to posted issues may or may not be in the original language.
+
+**Please note** that using non-English as an attempt to circumvent our [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) will be an immediate, and possibly indefinite, ban from the project.
+
 ## [Pull Requests](https://electronjs.org/docs/development/pull-requests)
 
 Pull Requests are the way concrete changes are made to the code, documentation,
@@ -57,4 +69,4 @@ See [Coding Style](https://electronjs.org/docs/development/coding-style) for inf
 ## Further Reading
 
 For more in-depth guides on developing Electron, see 
-[/docs/development](/docs/development/README.md)
+[/docs/development](/docs/development/README.md)

DEPS

@@ -10,9 +10,11 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '73.0.3683.54',
+    'f200986dfaabd6aad6a4b37dad7aae42fec349e9',
   'node_version':
-    'fac6d766c143db8db05bb3b0c0871df8f032363c',
+    '0a300f60bce0c8f0cb3d846fcb0e1f55f26013ee',
+  'nan_version':
+    '960dd6c70fc9eb136efdf37b4bef18fadbc3436f',
 
   'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
   'pyyaml_version': '3.12',
@@ -21,9 +23,14 @@ vars = {
   'boto_git': 'https://github.com/boto',
   'chromium_git': 'https://chromium.googlesource.com',
   'electron_git': 'https://github.com/electron',
+  # FIXME: Once https://github.com/nodejs/nan/pull/857 lands this should point at nodejs/nan
+  'nodejs_git': 'https://github.com/marshallofsound',
   'requests_git': 'https://github.com/kennethreitz',
   'yaml_git': 'https://github.com/yaml',
 
+  # KEEP IN SYNC WITH utils.js FILE
+  'yarn_version': '1.15.2',
+
   # To be able to build clean Chromium from sources.
   'apply_patches': True,
 
@@ -33,6 +40,7 @@ vars = {
   # To allow in-house builds to checkout those manually.
   'checkout_chromium': True,
   'checkout_node': True,
+  'checkout_nan': True,
 
   # It's only needed to parse the native tests configurations.
   'checkout_pyyaml': False,
@@ -40,6 +48,9 @@ vars = {
   # Python "requests" module is used for releases only.
   'checkout_requests': False,
 
+  # To allow running hooks without parsing the DEPS tree
+  'process_deps': True,
+
   # It is always needed for normal Electron builds,
   # but might be impossible for custom in-house builds.
   'download_external_binaries': True,
@@ -61,35 +72,39 @@ vars = {
 deps = {
   'src': {
     'url': (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
-    'condition': 'checkout_chromium',
+    'condition': 'checkout_chromium and process_deps',
+  },
+  'src/third_party/nan': {
+    'url': (Var("nodejs_git")) + '/nan.git@' + (Var("nan_version")),
+    'condition': 'checkout_nan and process_deps',
   },
   'src/third_party/electron_node': {
     'url': (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-    'condition': 'checkout_node',
+    'condition': 'checkout_node and process_deps',
   },
   'src/electron/vendor/pyyaml': {
     'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
-    'condition': 'checkout_pyyaml',
+    'condition': 'checkout_pyyaml and process_deps',
   },
   'src/electron/vendor/boto': {
     'url': Var('boto_git') + '/boto.git' + '@' +  Var('boto_version'),
-    'condition': 'checkout_boto',
+    'condition': 'checkout_boto and process_deps',
   },
   'src/electron/vendor/requests': {
     'url': Var('requests_git') + '/requests.git' + '@' +  Var('requests_version'),
-    'condition': 'checkout_requests',
+    'condition': 'checkout_requests and process_deps',
   },
 }
 
 hooks = [
   {
     'name': 'patch_chromium',
-    'condition': 'checkout_chromium and apply_patches',
+    'condition': '(checkout_chromium and apply_patches) and process_deps',
     'pattern': 'src/electron',
     'action': [
       'python',
       'src/electron/script/apply_all_patches.py',
-      'src/electron/patches/common/config.json',
+      'src/electron/patches/config.json',
     ],
   },
   {
@@ -107,29 +122,29 @@ hooks = [
     'action': [
       'python',
       '-c',
-      'import os; os.chdir("src"); os.chdir("electron"); os.system("npm install")',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
     ],
   },
   {
     'name': 'setup_boto',
     'pattern': 'src/electron',
-    'condition': 'checkout_boto',
+    'condition': 'checkout_boto and process_deps',
     'action': [
       'python',
       '-c',
-      'import os; os.chdir("src"); os.chdir("electron"); os.chdir("vendor"); os.chdir("boto"); os.system("python setup.py build");',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "boto")); subprocess.check_call(["python", "setup.py", "build"]);',
     ],
   },
   {
     'name': 'setup_requests',
     'pattern': 'src/electron',
-    'condition': 'checkout_requests',
+    'condition': 'checkout_requests and process_deps',
     'action': [
       'python',
       '-c',
-      'import os; os.chdir("src"); os.chdir("electron"); os.chdir("vendor"); os.chdir("requests"); os.system("python setup.py build");',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "requests")); subprocess.check_call(["python", "setup.py", "build"]);',
     ],
-  }
+  },
 ]
 
 recursedeps = [

Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     locales \
     lsb-release \
     nano \
-    python-dbusmock \
+    python-dbus \
     python-pip \
     python-setuptools \
     sudo \
@@ -33,6 +33,9 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
 # crcmod is required by gsutil, which is used for filling the gclient git cache
 RUN pip install -U crcmod
 
+# dbusmock is needed for Electron tests
+RUN pip install python-dbusmock
+
 RUN mkdir /tmp/workspace
 RUN chown builduser:builduser /tmp/workspace
 

ELECTRON_VERSION

@@ -1 +1 @@
-5.0.0-beta.4
+7.0.0-nightly.20190621

README.md

@@ -7,7 +7,7 @@
 [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev)
 [![Join the Electron Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com/)
 
-:memo: Available Translations: 🇨🇳 🇹🇼 🇧🇷 🇪🇸 🇰🇷 🇯🇵 🇷🇺 🇫🇷 🇹🇭 🇳🇱 🇹🇷 🇮🇩 🇺🇦 🇨🇿 🇮🇹.
+:memo: Available Translations: 🇨🇳 🇹🇼 🇧🇷 🇪🇸 🇰🇷 🇯🇵 🇷🇺 🇫🇷 🇹🇭 🇳🇱 🇹🇷 🇮🇩 🇺🇦 🇨🇿 🇮🇹 🇵🇱.
 View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).
 
 The Electron framework lets you write cross-platform desktop applications
@@ -93,6 +93,10 @@ const child = proc.spawn(electron)
 
 Find documentation translations in [electron/i18n](https://github.com/electron/i18n).
 
+## Contributing
+
+If you are interested in reporting/fixing issues and contributing directly to the code base, please see [CONTRIBUTING.md](CONTRIBUTING.md) for more information on what we're looking for and how to get started.
+
 ## Community
 
 Info on reporting bugs, getting help, finding third-party tools and sample apps,

appveyor.yml

@@ -23,13 +23,27 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
+# Uncomment these lines to enable RDP
+#on_finish:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 version: 1.0.{build}
 build_cloud: libcc-20
-image: libcc-20-vs2017-15.7.4
+image: libcc-20-vs2017-15.9
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
-  DISABLE_CRASH_REPORTER_TESTS: true
   ELECTRON_OUT_DIR: Default
+  ELECTRON_ENABLE_STACK_DUMPING: 1
+notifications:
+  - provider: Webhook
+    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
+    method: POST
+    headers:
+      x-mission-control-secret:
+        secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: false
 build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
@@ -38,13 +52,15 @@ build_script:
   - echo "Building $env:GN_CONFIG build"
   - git config --global core.longpaths true
   - cd ..
-  - md src
+  - ps: if (Test-Path src\electron) { Remove-Item src\electron -Recurse }
   - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
   - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
   - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         $env:GCLIENT_EXTRA_ARGS="--custom-var=checkout_boto=True --custom-var=checkout_requests=True"
+      } else {
+        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
       }
   - >-
       gclient config
@@ -52,11 +68,16 @@ build_script:
       --unmanaged
       %GCLIENT_EXTRA_ARGS%
       "https://github.com/electron/electron"
-  - gclient sync --with_branch_heads --with_tags
+  - gclient sync --with_branch_heads --with_tags --reset
   - cd src
   - ps: $env:BUILD_CONFIG_PATH="//electron/build/args/%GN_CONFIG%.gn"
   - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS%"
+  - gn check out/Default //electron:electron_lib
+  - gn check out/Default //electron:electron_app
+  - gn check out/Default //electron:manifests
+  - gn check out/Default //electron/shell/common/api:mojo
   - ninja -C out/Default electron:electron_app
+  - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default )  
   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
   - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
   - ninja -C out/Default electron:electron_dist_zip
@@ -76,7 +97,10 @@ build_script:
         python electron\script\zip-symbols.py
         appveyor PushArtifact out/Default/symbols.zip
       }
+  - python electron/script/check-zip-manifest.py out/Default/dist.zip electron/script/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:
+  # Workaround for https://github.com/appveyor/ci/issues/2420
+  - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
   - ps: >-
       if ((-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
         $env:RUN_TESTS="true"
@@ -89,7 +113,7 @@ test_script:
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & npm run test -- --ci --enable-logging)
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --ci --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"

atom/app/manifests.cc

@@ -1,44 +0,0 @@
-// Copyright (c) 2019 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/app/manifests.h"
-
-#include "base/no_destructor.h"
-#include "printing/buildflags/buildflags.h"
-#include "services/proxy_resolver/proxy_resolver_manifest.h"
-#include "services/service_manager/public/cpp/manifest_builder.h"
-
-#if BUILDFLAG(ENABLE_PRINTING)
-#include "components/services/pdf_compositor/pdf_compositor_manifest.h"
-#endif
-
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-#include "chrome/services/printing/manifest.h"
-#endif
-
-const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
-  static base::NoDestructor<service_manager::Manifest> manifest{
-      service_manager::ManifestBuilder()
-          .WithDisplayName("Electron (browser process)")
-          .RequireCapability("device", "device:geolocation_control")
-          .RequireCapability("proxy_resolver", "factory")
-          .RequireCapability("chrome_printing", "converter")
-          .RequireCapability("pdf_compositor", "compositor")
-          .Build()};
-  return *manifest;
-}
-
-const std::vector<service_manager::Manifest>&
-GetElectronPackagedServicesOverlayManifest() {
-  static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
-      proxy_resolver::GetManifest(),
-#if BUILDFLAG(ENABLE_PRINTING)
-      pdf_compositor::GetManifest(),
-#endif
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-      chrome_printing::GetManifest(),
-#endif
-  }};
-  return *manifests;
-}

atom/browser/api/atom_api_content_tracing.cc

@@ -1,137 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include <set>
-#include <string>
-
-#include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_path_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/promise_util.h"
-#include "base/bind.h"
-#include "base/files/file_util.h"
-#include "content/public/browser/tracing_controller.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-using content::TracingController;
-
-namespace mate {
-
-template <>
-struct Converter<base::trace_event::TraceConfig> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     base::trace_event::TraceConfig* out) {
-    // (alexeykuzmin): A combination of "categoryFilter" and "traceOptions"
-    // has to be checked first because none of the fields
-    // in the `memory_dump_config` dict below are mandatory
-    // and we cannot check the config format.
-    Dictionary options;
-    if (ConvertFromV8(isolate, val, &options)) {
-      std::string category_filter, trace_options;
-      if (options.Get("categoryFilter", &category_filter) &&
-          options.Get("traceOptions", &trace_options)) {
-        *out = base::trace_event::TraceConfig(category_filter, trace_options);
-        return true;
-      }
-    }
-
-    base::DictionaryValue memory_dump_config;
-    if (ConvertFromV8(isolate, val, &memory_dump_config)) {
-      *out = base::trace_event::TraceConfig(memory_dump_config);
-      return true;
-    }
-
-    return false;
-  }
-};
-
-}  // namespace mate
-
-namespace {
-
-using CompletionCallback = base::Callback<void(const base::FilePath&)>;
-
-scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
-    const base::FilePath& path,
-    const CompletionCallback& callback) {
-  base::FilePath result_file_path = path;
-  if (result_file_path.empty() && !base::CreateTemporaryFile(&result_file_path))
-    LOG(ERROR) << "Creating temporary file failed";
-
-  return TracingController::CreateFileEndpoint(
-      result_file_path, base::Bind(callback, result_file_path));
-}
-
-void OnRecordingStopped(const atom::util::CopyablePromise& promise,
-                        const base::FilePath& path) {
-  promise.GetPromise().Resolve(path);
-}
-
-v8::Local<v8::Promise> StopRecording(v8::Isolate* isolate,
-                                     const base::FilePath& path) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  // TODO(zcbenz): Remove the use of CopyablePromise when the
-  // CreateFileEndpoint API accepts OnceCallback.
-  TracingController::GetInstance()->StopTracing(GetTraceDataEndpoint(
-      path,
-      base::Bind(&OnRecordingStopped, atom::util::CopyablePromise(promise))));
-  return handle;
-}
-
-void OnCategoriesAvailable(atom::util::Promise promise,
-                           const std::set<std::string>& categories) {
-  promise.Resolve(categories);
-}
-
-v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  // Note: This method always succeeds.
-  TracingController::GetInstance()->GetCategories(
-      base::BindOnce(&OnCategoriesAvailable, std::move(promise)));
-  return handle;
-}
-
-void OnTracingStarted(atom::util::Promise promise) {
-  promise.Resolve();
-}
-
-v8::Local<v8::Promise> StartTracing(
-    v8::Isolate* isolate,
-    const base::trace_event::TraceConfig& trace_config) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  // Note: This method always succeeds.
-  TracingController::GetInstance()->StartTracing(
-      trace_config, base::BindOnce(&OnTracingStarted, std::move(promise)));
-  return handle;
-}
-
-bool GetTraceBufferUsage(
-    const base::RepeatingCallback<void(float, size_t)>& callback) {
-  return TracingController::GetInstance()->GetTraceBufferUsage(
-      base::BindOnce(callback));
-}
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("getCategories", &GetCategories);
-  dict.SetMethod("startRecording", &StartTracing);
-  dict.SetMethod("stopRecording", &StopRecording);
-  dict.SetMethod("getTraceBufferUsage", &GetTraceBufferUsage);
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)

atom/browser/api/atom_api_cookies.cc

@@ -1,379 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_cookies.h"
-
-#include <memory>
-#include <utility>
-
-#include "atom/browser/atom_browser_context.h"
-#include "atom/browser/cookie_change_notifier.h"
-#include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/gurl_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "base/task/post_task.h"
-#include "base/time/time.h"
-#include "base/values.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "native_mate/dictionary.h"
-#include "native_mate/object_template_builder.h"
-#include "net/cookies/canonical_cookie.h"
-#include "net/cookies/cookie_store.h"
-#include "net/cookies/cookie_util.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
-
-using content::BrowserThread;
-
-namespace mate {
-
-template <>
-struct Converter<atom::api::Cookies::Error> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   atom::api::Cookies::Error val) {
-    if (val == atom::api::Cookies::SUCCESS)
-      return v8::Null(isolate);
-    else
-      return v8::Exception::Error(StringToV8(isolate, "Setting cookie failed"));
-  }
-};
-
-template <>
-struct Converter<net::CanonicalCookie> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const net::CanonicalCookie& val) {
-    mate::Dictionary dict(isolate, v8::Object::New(isolate));
-    dict.Set("name", val.Name());
-    dict.Set("value", val.Value());
-    dict.Set("domain", val.Domain());
-    dict.Set("hostOnly", net::cookie_util::DomainIsHostOnly(val.Domain()));
-    dict.Set("path", val.Path());
-    dict.Set("secure", val.IsSecure());
-    dict.Set("httpOnly", val.IsHttpOnly());
-    dict.Set("session", !val.IsPersistent());
-    if (val.IsPersistent())
-      dict.Set("expirationDate", val.ExpiryDate().ToDoubleT());
-    return dict.GetHandle();
-  }
-};
-
-template <>
-struct Converter<network::mojom::CookieChangeCause> {
-  static v8::Local<v8::Value> ToV8(
-      v8::Isolate* isolate,
-      const network::mojom::CookieChangeCause& val) {
-    switch (val) {
-      case network::mojom::CookieChangeCause::INSERTED:
-      case network::mojom::CookieChangeCause::EXPLICIT:
-        return mate::StringToV8(isolate, "explicit");
-      case network::mojom::CookieChangeCause::OVERWRITE:
-        return mate::StringToV8(isolate, "overwrite");
-      case network::mojom::CookieChangeCause::EXPIRED:
-        return mate::StringToV8(isolate, "expired");
-      case network::mojom::CookieChangeCause::EVICTED:
-        return mate::StringToV8(isolate, "evicted");
-      case network::mojom::CookieChangeCause::EXPIRED_OVERWRITE:
-        return mate::StringToV8(isolate, "expired-overwrite");
-      default:
-        return mate::StringToV8(isolate, "unknown");
-    }
-  }
-};
-
-}  // namespace mate
-
-namespace atom {
-
-namespace api {
-
-namespace {
-
-// Returns whether |domain| matches |filter|.
-bool MatchesDomain(std::string filter, const std::string& domain) {
-  // Add a leading '.' character to the filter domain if it doesn't exist.
-  if (net::cookie_util::DomainIsHostOnly(filter))
-    filter.insert(0, ".");
-
-  std::string sub_domain(domain);
-  // Strip any leading '.' character from the input cookie domain.
-  if (!net::cookie_util::DomainIsHostOnly(sub_domain))
-    sub_domain = sub_domain.substr(1);
-
-  // Now check whether the domain argument is a subdomain of the filter domain.
-  for (sub_domain.insert(0, "."); sub_domain.length() >= filter.length();) {
-    if (sub_domain == filter)
-      return true;
-    const size_t next_dot = sub_domain.find('.', 1);  // Skip over leading dot.
-    sub_domain.erase(0, next_dot);
-  }
-  return false;
-}
-
-// Returns whether |cookie| matches |filter|.
-bool MatchesCookie(const base::DictionaryValue* filter,
-                   const net::CanonicalCookie& cookie) {
-  std::string str;
-  bool b;
-  if (filter->GetString("name", &str) && str != cookie.Name())
-    return false;
-  if (filter->GetString("path", &str) && str != cookie.Path())
-    return false;
-  if (filter->GetString("domain", &str) && !MatchesDomain(str, cookie.Domain()))
-    return false;
-  if (filter->GetBoolean("secure", &b) && b != cookie.IsSecure())
-    return false;
-  if (filter->GetBoolean("session", &b) && b != !cookie.IsPersistent())
-    return false;
-  return true;
-}
-
-// Helper to returns the CookieStore.
-inline net::CookieStore* GetCookieStore(
-    scoped_refptr<net::URLRequestContextGetter> getter) {
-  return getter->GetURLRequestContext()->cookie_store();
-}
-
-void ResolvePromiseWithCookies(util::Promise promise,
-                               const net::CookieList& cookie_list) {
-  promise.Resolve(cookie_list);
-}
-
-void ResolvePromise(util::Promise promise) {
-  promise.Resolve();
-}
-
-// Resolve |promise| in UI thread.
-void ResolvePromiseInUI(util::Promise promise) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::BindOnce(ResolvePromise, std::move(promise)));
-}
-
-// Run |callback| on UI thread.
-void RunCallbackInUI(base::OnceClosure callback) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, std::move(callback));
-}
-
-// Remove cookies from |list| not matching |filter|, and pass it to |callback|.
-void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,
-                   util::Promise promise,
-                   const net::CookieList& list) {
-  net::CookieList result;
-  for (const auto& cookie : list) {
-    if (MatchesCookie(filter.get(), cookie))
-      result.push_back(cookie);
-  }
-
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(ResolvePromiseWithCookies, std::move(promise), result));
-}
-
-// Receives cookies matching |filter| in IO thread.
-void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                    std::unique_ptr<base::DictionaryValue> filter,
-                    util::Promise promise) {
-  std::string url;
-  filter->GetString("url", &url);
-
-  auto filtered_callback =
-      base::BindOnce(FilterCookies, std::move(filter), std::move(promise));
-
-  // Empty url will match all url cookies.
-  if (url.empty())
-    GetCookieStore(getter)->GetAllCookiesAsync(std::move(filtered_callback));
-  else
-    GetCookieStore(getter)->GetAllCookiesForURLAsync(
-        GURL(url), std::move(filtered_callback));
-}
-
-// Removes cookie with |url| and |name| in IO thread.
-void RemoveCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                      const GURL& url,
-                      const std::string& name,
-                      util::Promise promise) {
-  GetCookieStore(getter)->DeleteCookieAsync(
-      url, name, base::BindOnce(ResolvePromiseInUI, std::move(promise)));
-}
-
-// Resolves/rejects the |promise| in UI thread.
-void SettlePromiseInUI(util::Promise promise, const std::string& errmsg) {
-  if (errmsg.empty()) {
-    promise.Resolve();
-  } else {
-    promise.RejectWithErrorMessage(errmsg);
-  }
-}
-
-// Callback of SetCookie.
-void OnSetCookie(util::Promise promise, bool success) {
-  const std::string errmsg = success ? "" : "Setting cookie failed";
-  RunCallbackInUI(
-      base::BindOnce(SettlePromiseInUI, std::move(promise), errmsg));
-}
-
-// Flushes cookie store in IO thread.
-void FlushCookieStoreOnIOThread(
-    scoped_refptr<net::URLRequestContextGetter> getter,
-    util::Promise promise) {
-  GetCookieStore(getter)->FlushStore(
-      base::BindOnce(ResolvePromiseInUI, std::move(promise)));
-}
-
-// Sets cookie with |details| in IO thread.
-void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                   std::unique_ptr<base::DictionaryValue> details,
-                   util::Promise promise) {
-  std::string url, name, value, domain, path;
-  bool secure = false;
-  bool http_only = false;
-  double creation_date;
-  double expiration_date;
-  double last_access_date;
-  details->GetString("url", &url);
-  details->GetString("name", &name);
-  details->GetString("value", &value);
-  details->GetString("domain", &domain);
-  details->GetString("path", &path);
-  details->GetBoolean("secure", &secure);
-  details->GetBoolean("httpOnly", &http_only);
-
-  base::Time creation_time;
-  if (details->GetDouble("creationDate", &creation_date)) {
-    creation_time = (creation_date == 0)
-                        ? base::Time::UnixEpoch()
-                        : base::Time::FromDoubleT(creation_date);
-  }
-
-  base::Time expiration_time;
-  if (details->GetDouble("expirationDate", &expiration_date)) {
-    expiration_time = (expiration_date == 0)
-                          ? base::Time::UnixEpoch()
-                          : base::Time::FromDoubleT(expiration_date);
-  }
-
-  base::Time last_access_time;
-  if (details->GetDouble("lastAccessDate", &last_access_date)) {
-    last_access_time = (last_access_date == 0)
-                           ? base::Time::UnixEpoch()
-                           : base::Time::FromDoubleT(last_access_date);
-  }
-
-  std::unique_ptr<net::CanonicalCookie> canonical_cookie(
-      net::CanonicalCookie::CreateSanitizedCookie(
-          GURL(url), name, value, domain, path, creation_time, expiration_time,
-          last_access_time, secure, http_only,
-          net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
-  auto completion_callback = base::BindOnce(OnSetCookie, std::move(promise));
-  if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
-    std::move(completion_callback).Run(false);
-    return;
-  }
-  if (url.empty()) {
-    std::move(completion_callback).Run(false);
-    return;
-  }
-  if (name.empty()) {
-    std::move(completion_callback).Run(false);
-    return;
-  }
-  GetCookieStore(getter)->SetCanonicalCookieAsync(
-      std::move(canonical_cookie), secure, http_only,
-      std::move(completion_callback));
-}
-
-}  // namespace
-
-Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
-    : browser_context_(browser_context) {
-  Init(isolate);
-  cookie_change_subscription_ =
-      browser_context_->cookie_change_notifier()->RegisterCookieChangeCallback(
-          base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
-}
-
-Cookies::~Cookies() {}
-
-v8::Local<v8::Promise> Cookies::Get(const base::DictionaryValue& filter) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  auto copy = base::DictionaryValue::From(
-      base::Value::ToUniquePtrValue(filter.Clone()));
-  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
-                     std::move(promise)));
-
-  return handle;
-}
-
-v8::Local<v8::Promise> Cookies::Remove(const GURL& url,
-                                       const std::string& name) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(RemoveCookieOnIO, base::RetainedRef(getter), url, name,
-                     std::move(promise)));
-
-  return handle;
-}
-
-v8::Local<v8::Promise> Cookies::Set(const base::DictionaryValue& details) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  auto copy = base::DictionaryValue::From(
-      base::Value::ToUniquePtrValue(details.Clone()));
-  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
-                     std::move(promise)));
-
-  return handle;
-}
-
-v8::Local<v8::Promise> Cookies::FlushStore() {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(FlushCookieStoreOnIOThread, base::RetainedRef(getter),
-                     std::move(promise)));
-
-  return handle;
-}
-
-void Cookies::OnCookieChanged(const CookieDetails* details) {
-  Emit("changed", *(details->cookie), details->cause, details->removed);
-}
-
-// static
-mate::Handle<Cookies> Cookies::Create(v8::Isolate* isolate,
-                                      AtomBrowserContext* browser_context) {
-  return mate::CreateHandle(isolate, new Cookies(isolate, browser_context));
-}
-
-// static
-void Cookies::BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Cookies"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("get", &Cookies::Get)
-      .SetMethod("remove", &Cookies::Remove)
-      .SetMethod("set", &Cookies::Set)
-      .SetMethod("flushStore", &Cookies::FlushStore);
-}
-
-}  // namespace api
-
-}  // namespace atom

atom/browser/api/atom_api_dialog.cc

@@ -1,99 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "atom/browser/api/atom_api_browser_window.h"
-#include "atom/browser/native_window.h"
-#include "atom/browser/ui/certificate_trust.h"
-#include "atom/browser/ui/file_dialog.h"
-#include "atom/browser/ui/message_box.h"
-#include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_dialog_converter.h"
-#include "atom/common/native_mate_converters/file_path_converter.h"
-#include "atom/common/native_mate_converters/image_converter.h"
-#include "atom/common/native_mate_converters/net_converter.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-namespace {
-
-void ShowMessageBox(int type,
-                    const std::vector<std::string>& buttons,
-                    int default_id,
-                    int cancel_id,
-                    int options,
-                    const std::string& title,
-                    const std::string& message,
-                    const std::string& detail,
-                    const std::string& checkbox_label,
-                    bool checkbox_checked,
-                    const gfx::ImageSkia& icon,
-                    atom::NativeWindow* window,
-                    mate::Arguments* args) {
-  v8::Local<v8::Value> peek = args->PeekNext();
-  atom::MessageBoxCallback callback;
-  if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(), peek,
-                                                        &callback)) {
-    atom::ShowMessageBox(window, static_cast<atom::MessageBoxType>(type),
-                         buttons, default_id, cancel_id, options, title,
-                         message, detail, checkbox_label, checkbox_checked,
-                         icon, callback);
-  } else {
-    int chosen = atom::ShowMessageBox(
-        window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
-        cancel_id, options, title, message, detail, icon);
-    args->Return(chosen);
-  }
-}
-
-void ShowOpenDialog(const file_dialog::DialogSettings& settings,
-                    mate::Arguments* args) {
-  v8::Local<v8::Value> peek = args->PeekNext();
-  file_dialog::OpenDialogCallback callback;
-  if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(
-          args->isolate(), peek, &callback)) {
-    file_dialog::ShowOpenDialog(settings, callback);
-  } else {
-    std::vector<base::FilePath> paths;
-    if (file_dialog::ShowOpenDialog(settings, &paths))
-      args->Return(paths);
-  }
-}
-
-void ShowSaveDialog(const file_dialog::DialogSettings& settings,
-                    mate::Arguments* args) {
-  v8::Local<v8::Value> peek = args->PeekNext();
-  file_dialog::SaveDialogCallback callback;
-  if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(
-          args->isolate(), peek, &callback)) {
-    file_dialog::ShowSaveDialog(settings, callback);
-  } else {
-    base::FilePath path;
-    if (file_dialog::ShowSaveDialog(settings, &path))
-      args->Return(path);
-  }
-}
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("showMessageBox", &ShowMessageBox);
-  dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
-  dict.SetMethod("showOpenDialog", &ShowOpenDialog);
-  dict.SetMethod("showSaveDialog", &ShowSaveDialog);
-#if defined(OS_MACOSX) || defined(OS_WIN)
-  dict.SetMethod("showCertificateTrustDialog",
-                 &certificate_trust::ShowCertificateTrust);
-#endif
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_dialog, Initialize)

atom/browser/api/atom_api_net_log.cc

@@ -1,139 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_net_log.h"
-
-#include <utility>
-
-#include "atom/browser/atom_browser_context.h"
-#include "atom/browser/net/system_network_context_manager.h"
-#include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_path_converter.h"
-#include "base/command_line.h"
-#include "chrome/browser/browser_process.h"
-#include "components/net_log/chrome_net_log.h"
-#include "content/public/browser/storage_partition.h"
-#include "native_mate/dictionary.h"
-#include "native_mate/handle.h"
-#include "net/url_request/url_request_context_getter.h"
-
-#include "atom/common/node_includes.h"
-
-namespace atom {
-
-namespace api {
-
-NetLog::NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context)
-    : browser_context_(browser_context) {
-  Init(isolate);
-
-  net_log_writer_ = g_browser_process->system_network_context_manager()
-                        ->GetNetExportFileWriter();
-  net_log_writer_->AddObserver(this);
-}
-
-NetLog::~NetLog() {
-  net_log_writer_->RemoveObserver(this);
-}
-
-void NetLog::StartLogging(mate::Arguments* args) {
-  base::FilePath log_path;
-  if (!args->GetNext(&log_path) || log_path.empty()) {
-    args->ThrowError("The first parameter must be a valid string");
-    return;
-  }
-
-  auto* network_context =
-      content::BrowserContext::GetDefaultStoragePartition(browser_context_)
-          ->GetNetworkContext();
-
-  // TODO(deepak1556): Provide more flexibility to this module
-  // by allowing customizations on the capturing options.
-  net_log_writer_->StartNetLog(
-      log_path, net::NetLogCaptureMode::Default(),
-      net_log::NetExportFileWriter::kNoLimit /* file size limit */,
-      base::CommandLine::ForCurrentProcess()->GetCommandLineString(),
-      std::string(), network_context);
-}
-
-std::string NetLog::GetLoggingState() const {
-  if (!net_log_state_)
-    return std::string();
-  const base::Value* current_log_state =
-      net_log_state_->FindKeyOfType("state", base::Value::Type::STRING);
-  if (!current_log_state)
-    return std::string();
-  return current_log_state->GetString();
-}
-
-bool NetLog::IsCurrentlyLogging() const {
-  const std::string log_state = GetLoggingState();
-  return (log_state == "STARTING_LOG") || (log_state == "LOGGING");
-}
-
-std::string NetLog::GetCurrentlyLoggingPath() const {
-  // Net log exporter has a default path which will be used
-  // when no log path is provided, but since we don't allow
-  // net log capture without user provided file path, this
-  // check is completely safe.
-  if (IsCurrentlyLogging()) {
-    const base::Value* current_log_path =
-        net_log_state_->FindKeyOfType("file", base::Value::Type::STRING);
-    if (current_log_path)
-      return current_log_path->GetString();
-  }
-
-  return std::string();
-}
-
-void NetLog::StopLogging(mate::Arguments* args) {
-  net_log::NetExportFileWriter::FilePathCallback callback;
-  if (!args->GetNext(&callback)) {
-    args->ThrowError("Invalid callback function");
-    return;
-  }
-
-  if (IsCurrentlyLogging()) {
-    stop_callback_queue_.emplace_back(callback);
-    net_log_writer_->StopNetLog(nullptr);
-  } else {
-    callback.Run(base::FilePath());
-  }
-}
-
-void NetLog::OnNewState(const base::DictionaryValue& state) {
-  net_log_state_ = state.CreateDeepCopy();
-
-  if (stop_callback_queue_.empty())
-    return;
-
-  if (GetLoggingState() == "NOT_LOGGING") {
-    for (auto& callback : stop_callback_queue_) {
-      if (!callback.is_null())
-        net_log_writer_->GetFilePathToCompletedLog(callback);
-    }
-    stop_callback_queue_.clear();
-  }
-}
-
-// static
-mate::Handle<NetLog> NetLog::Create(v8::Isolate* isolate,
-                                    AtomBrowserContext* browser_context) {
-  return mate::CreateHandle(isolate, new NetLog(isolate, browser_context));
-}
-
-// static
-void NetLog::BuildPrototype(v8::Isolate* isolate,
-                            v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "NetLog"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetProperty("currentlyLogging", &NetLog::IsCurrentlyLogging)
-      .SetProperty("currentlyLoggingPath", &NetLog::GetCurrentlyLoggingPath)
-      .SetMethod("startLogging", &NetLog::StartLogging)
-      .SetMethod("stopLogging", &NetLog::StopLogging);
-}
-
-}  // namespace api
-
-}  // namespace atom

atom/browser/api/atom_api_net_log.h

@@ -1,60 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_NET_LOG_H_
-#define ATOM_BROWSER_API_ATOM_API_NET_LOG_H_
-
-#include <list>
-#include <memory>
-#include <string>
-
-#include "atom/browser/api/trackable_object.h"
-#include "base/callback.h"
-#include "base/values.h"
-#include "components/net_log/net_export_file_writer.h"
-#include "native_mate/handle.h"
-
-namespace atom {
-
-class AtomBrowserContext;
-
-namespace api {
-
-class NetLog : public mate::TrackableObject<NetLog>,
-               public net_log::NetExportFileWriter::StateObserver {
- public:
-  static mate::Handle<NetLog> Create(v8::Isolate* isolate,
-                                     AtomBrowserContext* browser_context);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  void StartLogging(mate::Arguments* args);
-  std::string GetLoggingState() const;
-  bool IsCurrentlyLogging() const;
-  std::string GetCurrentlyLoggingPath() const;
-  void StopLogging(mate::Arguments* args);
-
- protected:
-  explicit NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~NetLog() override;
-
-  // net_log::NetExportFileWriter::StateObserver implementation
-  void OnNewState(const base::DictionaryValue& state) override;
-
- private:
-  AtomBrowserContext* browser_context_;
-  net_log::NetExportFileWriter* net_log_writer_;
-  std::list<net_log::NetExportFileWriter::FilePathCallback>
-      stop_callback_queue_;
-  std::unique_ptr<base::DictionaryValue> net_log_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(NetLog);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_NET_LOG_H_

atom/browser/api/atom_api_render_process_preferences.cc

@@ -1,91 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_render_process_preferences.h"
-
-#include "atom/browser/api/atom_api_web_contents.h"
-#include "atom/browser/atom_browser_client.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "content/public/browser/render_process_host.h"
-#include "native_mate/dictionary.h"
-#include "native_mate/object_template_builder.h"
-
-#include "atom/common/node_includes.h"
-
-namespace atom {
-
-namespace api {
-
-namespace {
-
-bool IsWebContents(v8::Isolate* isolate, content::RenderProcessHost* process) {
-  content::WebContents* web_contents =
-      static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
-          ->GetWebContentsFromProcessID(process->GetID());
-  if (!web_contents)
-    return false;
-
-  auto api_web_contents = WebContents::FromOrCreate(isolate, web_contents);
-  auto type = api_web_contents->GetType();
-  return type == WebContents::Type::BROWSER_WINDOW ||
-         type == WebContents::Type::WEB_VIEW;
-}
-
-}  // namespace
-
-RenderProcessPreferences::RenderProcessPreferences(
-    v8::Isolate* isolate,
-    const atom::RenderProcessPreferences::Predicate& predicate)
-    : preferences_(predicate) {
-  Init(isolate);
-}
-
-RenderProcessPreferences::~RenderProcessPreferences() {}
-
-int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
-  return preferences_.AddEntry(entry);
-}
-
-void RenderProcessPreferences::RemoveEntry(int id) {
-  preferences_.RemoveEntry(id);
-}
-
-// static
-void RenderProcessPreferences::BuildPrototype(
-    v8::Isolate* isolate,
-    v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(
-      mate::StringToV8(isolate, "RenderProcessPreferences"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("addEntry", &RenderProcessPreferences::AddEntry)
-      .SetMethod("removeEntry", &RenderProcessPreferences::RemoveEntry);
-}
-
-// static
-mate::Handle<RenderProcessPreferences>
-RenderProcessPreferences::ForAllWebContents(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate,
-                            new RenderProcessPreferences(
-                                isolate, base::Bind(&IsWebContents, isolate)));
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("forAllWebContents",
-                 &atom::api::RenderProcessPreferences::ForAllWebContents);
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_render_process_preferences,
-                                  Initialize)

atom/browser/api/atom_api_render_process_preferences.h

@@ -1,44 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
-#define ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
-
-#include "atom/browser/render_process_preferences.h"
-#include "native_mate/handle.h"
-#include "native_mate/wrappable.h"
-
-namespace atom {
-
-namespace api {
-
-class RenderProcessPreferences
-    : public mate::Wrappable<RenderProcessPreferences> {
- public:
-  static mate::Handle<RenderProcessPreferences> ForAllWebContents(
-      v8::Isolate* isolate);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  int AddEntry(const base::DictionaryValue& entry);
-  void RemoveEntry(int id);
-
- protected:
-  RenderProcessPreferences(
-      v8::Isolate* isolate,
-      const atom::RenderProcessPreferences::Predicate& predicate);
-  ~RenderProcessPreferences() override;
-
- private:
-  atom::RenderProcessPreferences preferences_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderProcessPreferences);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_

atom/browser/atom_browser_main_parts_mac.mm

@@ -1,63 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/atom_browser_main_parts.h"
-
-#include "atom/browser/atom_paths.h"
-#include "atom/browser/mac/atom_application_delegate.h"
-#include "base/mac/bundle_locations.h"
-#include "base/mac/foundation_util.h"
-#include "base/path_service.h"
-#include "ui/base/l10n/l10n_util_mac.h"
-
-namespace atom {
-
-void AtomBrowserMainParts::PreMainMessageLoopStart() {
-  // Set our own application delegate.
-  AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init];
-  [NSApp setDelegate:delegate];
-
-  PreMainMessageLoopStartCommon();
-
-  // Prevent Cocoa from turning command-line arguments into
-  // |-application:openFiles:|, since we already handle them directly.
-  [[NSUserDefaults standardUserDefaults]
-      setObject:@"NO"
-         forKey:@"NSTreatUnknownArgumentsAsOpen"];
-}
-
-void AtomBrowserMainParts::FreeAppDelegate() {
-  [[NSApp delegate] release];
-  [NSApp setDelegate:nil];
-}
-
-void AtomBrowserMainParts::OverrideAppLogsPath() {
-  base::FilePath path;
-  NSString* bundleName =
-      [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
-  NSString* logsPath =
-      [NSString stringWithFormat:@"Library/Logs/%@", bundleName];
-  NSString* libraryPath =
-      [NSHomeDirectory() stringByAppendingPathComponent:logsPath];
-
-  base::PathService::Override(DIR_APP_LOGS,
-                              base::FilePath([libraryPath UTF8String]));
-}
-
-// Replicates NSApplicationMain, but doesn't start a run loop.
-void AtomBrowserMainParts::InitializeMainNib() {
-  auto infoDictionary = base::mac::OuterBundle().infoDictionary;
-
-  auto principalClass =
-      NSClassFromString([infoDictionary objectForKey:@"NSPrincipalClass"]);
-  auto application = [principalClass sharedApplication];
-
-  NSString* mainNibName = [infoDictionary objectForKey:@"NSMainNibFile"];
-  auto mainNib = [[NSNib alloc] initWithNibNamed:mainNibName
-                                          bundle:base::mac::FrameworkBundle()];
-  [mainNib instantiateWithOwner:application topLevelObjects:nil];
-  [mainNib release];
-}
-
-}  // namespace atom

atom/browser/atom_resource_dispatcher_host_delegate.cc

@@ -1,106 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/atom_resource_dispatcher_host_delegate.h"
-
-#include "atom/browser/atom_browser_context.h"
-#include "atom/browser/web_contents_preferences.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/download_manager.h"
-#include "content/public/browser/render_frame_host.h"
-#include "electron/buildflags/buildflags.h"
-#include "net/base/escape.h"
-#include "url/gurl.h"
-
-#if BUILDFLAG(ENABLE_PDF_VIEWER)
-#include "atom/common/atom_constants.h"
-#include "base/strings/stringprintf.h"
-#include "content/public/browser/stream_info.h"
-#include "net/url_request/url_request.h"
-#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
-
-using content::BrowserThread;
-
-namespace atom {
-
-namespace {
-
-#if BUILDFLAG(ENABLE_PDF_VIEWER)
-void OnPdfResourceIntercepted(
-    const GURL& original_url,
-    int render_process_host_id,
-    int render_frame_id,
-    const content::ResourceRequestInfo::WebContentsGetter&
-        web_contents_getter) {
-  content::WebContents* web_contents = web_contents_getter.Run();
-  if (!web_contents)
-    return;
-
-  auto* web_preferences = WebContentsPreferences::From(web_contents);
-  if (!web_preferences || !web_preferences->IsEnabled(options::kPlugins)) {
-    auto* browser_context = web_contents->GetBrowserContext();
-    auto* download_manager =
-        content::BrowserContext::GetDownloadManager(browser_context);
-
-    download_manager->DownloadUrl(
-        content::DownloadUrlParameters::CreateForWebContentsMainFrame(
-            web_contents, original_url, NO_TRAFFIC_ANNOTATION_YET));
-    return;
-  }
-
-  // The URL passes the original pdf resource url, that will be requested
-  // by the webui page.
-  // chrome://pdf-viewer/index.html?src=https://somepage/123.pdf
-  content::NavigationController::LoadURLParams params(GURL(base::StringPrintf(
-      "%sindex.html?%s=%s", kPdfViewerUIOrigin, kPdfPluginSrc,
-      net::EscapeUrlEncodedData(original_url.spec(), false).c_str())));
-
-  content::RenderFrameHost* frame_host =
-      content::RenderFrameHost::FromID(render_process_host_id, render_frame_id);
-  if (!frame_host) {
-    return;
-  }
-
-  params.frame_tree_node_id = frame_host->GetFrameTreeNodeId();
-  web_contents->GetController().LoadURLWithParams(params);
-}
-#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
-
-}  // namespace
-
-AtomResourceDispatcherHostDelegate::AtomResourceDispatcherHostDelegate() {}
-
-bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
-    net::URLRequest* request,
-    const std::string& mime_type,
-    GURL* origin,
-    std::string* payload) {
-#if BUILDFLAG(ENABLE_PDF_VIEWER)
-  const content::ResourceRequestInfo* info =
-      content::ResourceRequestInfo::ForRequest(request);
-
-  int render_process_host_id;
-  int render_frame_id;
-  if (!info->GetAssociatedRenderFrame(&render_process_host_id,
-                                      &render_frame_id)) {
-    return false;
-  }
-
-  if (mime_type == "application/pdf") {
-    *origin = GURL(kPdfViewerUIOrigin);
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::UI},
-        base::Bind(&OnPdfResourceIntercepted, request->url(),
-                   render_process_host_id, render_frame_id,
-                   info->GetWebContentsGetterForRequest()));
-    return true;
-  }
-#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
-  return false;
-}
-
-}  // namespace atom

atom/browser/atom_resource_dispatcher_host_delegate.h

@@ -1,31 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_ATOM_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
-#define ATOM_BROWSER_ATOM_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
-
-#include <string>
-
-#include "content/public/browser/resource_dispatcher_host_delegate.h"
-
-namespace atom {
-
-class AtomResourceDispatcherHostDelegate
-    : public content::ResourceDispatcherHostDelegate {
- public:
-  AtomResourceDispatcherHostDelegate();
-
-  // content::ResourceDispatcherHostDelegate:
-  bool ShouldInterceptResourceAsStream(net::URLRequest* request,
-                                       const std::string& mime_type,
-                                       GURL* origin,
-                                       std::string* payload) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AtomResourceDispatcherHostDelegate);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_ATOM_RESOURCE_DISPATCHER_HOST_DELEGATE_H_

atom/browser/io_thread.cc

@@ -1,66 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/io_thread.h"
-
-#include <utility>
-
-#include "components/net_log/chrome_net_log.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/network_service_instance.h"
-#include "net/cert/caching_cert_verifier.h"
-#include "net/cert/cert_verifier.h"
-#include "net/cert/cert_verify_proc.h"
-#include "net/cert/multi_threaded_cert_verifier.h"
-#include "net/proxy_resolution/proxy_resolution_service.h"
-#include "net/url_request/url_request_context.h"
-#include "services/network/network_service.h"
-#include "services/network/url_request_context_builder_mojo.h"
-
-using content::BrowserThread;
-
-IOThread::IOThread(net_log::ChromeNetLog* net_log,
-                   SystemNetworkContextManager* system_network_context_manager)
-    : net_log_(net_log) {
-  BrowserThread::SetIOThreadDelegate(this);
-
-  system_network_context_manager->SetUp(
-      &network_context_request_, &network_context_params_,
-      &http_auth_static_params_, &http_auth_dynamic_params_);
-}
-
-IOThread::~IOThread() {
-  BrowserThread::SetIOThreadDelegate(nullptr);
-}
-
-void IOThread::Init() {
-  std::unique_ptr<network::URLRequestContextBuilderMojo> builder =
-      std::make_unique<network::URLRequestContextBuilderMojo>();
-
-  auto cert_verifier = std::make_unique<net::CachingCertVerifier>(
-      std::make_unique<net::MultiThreadedCertVerifier>(
-          net::CertVerifyProc::CreateDefault()));
-  builder->SetCertVerifier(std::move(cert_verifier));
-
-  // Create the network service, so that shared host resolver
-  // gets created which is required to set the auth preferences below.
-  network::NetworkService* network_service = content::GetNetworkServiceImpl();
-  network_service->SetUpHttpAuth(std::move(http_auth_static_params_));
-  network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params_));
-
-  system_network_context_ =
-      network_service
-          ->CreateNetworkContextWithBuilder(std::move(network_context_request_),
-                                            std::move(network_context_params_),
-                                            std::move(builder),
-                                            &system_request_context_)
-          .release();
-}
-
-void IOThread::CleanUp() {
-  system_request_context_->proxy_resolution_service()->OnShutdown();
-
-  if (net_log_)
-    net_log_->ShutDownBeforeTaskScheduler();
-}

atom/browser/native_browser_view_views.cc

@@ -1,41 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/native_browser_view_views.h"
-
-#include "atom/browser/ui/inspectable_web_contents_view.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/views/background.h"
-#include "ui/views/view.h"
-
-namespace atom {
-
-NativeBrowserViewViews::NativeBrowserViewViews(
-    InspectableWebContents* inspectable_web_contents)
-    : NativeBrowserView(inspectable_web_contents) {}
-
-NativeBrowserViewViews::~NativeBrowserViewViews() {}
-
-void NativeBrowserViewViews::SetAutoResizeFlags(uint8_t flags) {
-  auto_resize_flags_ = flags;
-}
-
-void NativeBrowserViewViews::SetBounds(const gfx::Rect& bounds) {
-  auto* view = GetInspectableWebContentsView()->GetView();
-  view->SetBoundsRect(bounds);
-}
-
-void NativeBrowserViewViews::SetBackgroundColor(SkColor color) {
-  auto* view = GetInspectableWebContentsView()->GetView();
-  view->SetBackground(views::CreateSolidBackground(color));
-  view->SchedulePaint();
-}
-
-// static
-NativeBrowserView* NativeBrowserView::Create(
-    InspectableWebContents* inspectable_web_contents) {
-  return new NativeBrowserViewViews(inspectable_web_contents);
-}
-
-}  // namespace atom

atom/browser/native_browser_view_views.h

@@ -1,31 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
-#define ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
-
-#include "atom/browser/native_browser_view.h"
-
-namespace atom {
-
-class NativeBrowserViewViews : public NativeBrowserView {
- public:
-  explicit NativeBrowserViewViews(
-      InspectableWebContents* inspectable_web_contents);
-  ~NativeBrowserViewViews() override;
-
-  uint8_t GetAutoResizeFlags() { return auto_resize_flags_; }
-  void SetAutoResizeFlags(uint8_t flags) override;
-  void SetBounds(const gfx::Rect& bounds) override;
-  void SetBackgroundColor(SkColor color) override;
-
- private:
-  uint8_t auto_resize_flags_;
-
-  DISALLOW_COPY_AND_ASSIGN(NativeBrowserViewViews);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_

atom/browser/notifications/mac/notification_center_delegate.h

@@ -1,22 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
-#define ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
-
-#import <Foundation/Foundation.h>
-
-namespace atom {
-class NotificationPresenterMac;
-}
-
-@interface NotificationCenterDelegate
-    : NSObject <NSUserNotificationCenterDelegate> {
- @private
-  atom::NotificationPresenterMac* presenter_;
-}
-- (instancetype)initWithPresenter:(atom::NotificationPresenterMac*)presenter;
-@end
-
-#endif  // ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_

atom/browser/osr/osr_output_device.cc

@@ -1,101 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/osr/osr_output_device.h"
-
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/skia/src/core/SkDevice.h"
-#include "ui/gfx/skia_util.h"
-
-namespace atom {
-
-OffScreenOutputDevice::OffScreenOutputDevice(bool transparent,
-                                             const OnPaintCallback& callback)
-    : transparent_(transparent), callback_(callback) {
-  DCHECK(!callback_.is_null());
-}
-
-OffScreenOutputDevice::~OffScreenOutputDevice() {}
-
-void OffScreenOutputDevice::Resize(const gfx::Size& pixel_size,
-                                   float scale_factor) {
-  if (viewport_pixel_size_ == pixel_size)
-    return;
-  viewport_pixel_size_ = pixel_size;
-
-  canvas_.reset();
-  bitmap_.reset(new SkBitmap);
-  bitmap_->allocN32Pixels(viewport_pixel_size_.width(),
-                          viewport_pixel_size_.height(), !transparent_);
-  if (bitmap_->drawsNothing()) {
-    NOTREACHED();
-    bitmap_.reset();
-    return;
-  }
-
-  if (transparent_) {
-    bitmap_->eraseColor(SK_ColorTRANSPARENT);
-  } else {
-    bitmap_->eraseColor(SK_ColorWHITE);
-  }
-
-  canvas_.reset(new SkCanvas(*bitmap_));
-}
-
-SkCanvas* OffScreenOutputDevice::BeginPaint(const gfx::Rect& damage_rect) {
-  DCHECK(canvas_.get());
-  DCHECK(bitmap_.get());
-
-  damage_rect_ = damage_rect;
-  SkIRect damage =
-      SkIRect::MakeXYWH(damage_rect_.x(), damage_rect_.y(),
-                        damage_rect_.width(), damage_rect_.height());
-
-  if (transparent_) {
-    bitmap_->erase(SK_ColorTRANSPARENT, damage);
-  } else {
-    bitmap_->erase(SK_ColorWHITE, damage);
-  }
-
-  return canvas_.get();
-}
-
-void OffScreenOutputDevice::EndPaint() {
-  DCHECK(canvas_.get());
-  DCHECK(bitmap_.get());
-
-  if (!bitmap_.get())
-    return;
-
-  viz::SoftwareOutputDevice::EndPaint();
-
-  if (active_)
-    OnPaint(damage_rect_);
-}
-
-void OffScreenOutputDevice::SetActive(bool active, bool paint) {
-  if (active == active_)
-    return;
-  active_ = active;
-
-  if (!active_ && !pending_damage_rect_.IsEmpty() && paint)
-    OnPaint(gfx::Rect(viewport_pixel_size_));
-}
-
-void OffScreenOutputDevice::OnPaint(const gfx::Rect& damage_rect) {
-  gfx::Rect rect = damage_rect;
-  if (!pending_damage_rect_.IsEmpty()) {
-    rect.Union(pending_damage_rect_);
-    pending_damage_rect_.SetRect(0, 0, 0, 0);
-  }
-
-  rect.Intersect(gfx::Rect(viewport_pixel_size_));
-  if (rect.IsEmpty())
-    return;
-
-  callback_.Run(rect, *bitmap_);
-}
-
-}  // namespace atom

atom/browser/osr/osr_output_device.h

@@ -1,47 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
-#define ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
-
-#include <memory>
-
-#include "base/callback.h"
-#include "components/viz/service/display/software_output_device.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-
-namespace atom {
-
-typedef base::Callback<void(const gfx::Rect&, const SkBitmap&)> OnPaintCallback;
-
-class OffScreenOutputDevice : public viz::SoftwareOutputDevice {
- public:
-  OffScreenOutputDevice(bool transparent, const OnPaintCallback& callback);
-  ~OffScreenOutputDevice() override;
-
-  // viz::SoftwareOutputDevice:
-  void Resize(const gfx::Size& pixel_size, float scale_factor) override;
-  SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;
-  void EndPaint() override;
-
-  void SetActive(bool active, bool paint);
-  void OnPaint(const gfx::Rect& damage_rect);
-
- private:
-  const bool transparent_;
-  OnPaintCallback callback_;
-
-  bool active_ = false;
-
-  std::unique_ptr<SkCanvas> canvas_;
-  std::unique_ptr<SkBitmap> bitmap_;
-  gfx::Rect pending_damage_rect_;
-
-  DISALLOW_COPY_AND_ASSIGN(OffScreenOutputDevice);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_

atom/browser/osr/osr_render_widget_host_view_mac.mm

@@ -1,150 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/osr/osr_render_widget_host_view.h"
-
-#import <Cocoa/Cocoa.h>
-
-#include "base/strings/utf_string_conversions.h"
-#include "content/common/view_messages.h"
-#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
-#include "ui/display/screen.h"
-
-#include "components/viz/common/features.h"
-
-namespace atom {
-
-class MacHelper : public content::BrowserCompositorMacClient,
-                  public ui::AcceleratedWidgetMacNSView {
- public:
-  explicit MacHelper(OffScreenRenderWidgetHostView* view) : view_(view) {
-    [view_->GetNativeView().GetNativeNSView() setWantsLayer:YES];
-  }
-
-  virtual ~MacHelper() {}
-
-  // content::BrowserCompositorMacClient:
-  SkColor BrowserCompositorMacGetGutterColor() const override {
-    // When making an element on the page fullscreen the element's background
-    // may not match the page's, so use black as the gutter color to avoid
-    // flashes of brighter colors during the transition.
-    if (view_->render_widget_host()->delegate() &&
-        view_->render_widget_host()->delegate()->IsFullscreenForCurrentTab()) {
-      return SK_ColorBLACK;
-    }
-    return view_->last_frame_root_background_color();
-  }
-
-  void BrowserCompositorMacOnBeginFrame(base::TimeTicks frame_time) override {}
-
-  void OnFrameTokenChanged(uint32_t frame_token) override {
-    view_->render_widget_host()->DidProcessFrame(frame_token);
-  }
-
-  void AcceleratedWidgetCALayerParamsUpdated() override {}
-
-  void DestroyCompositorForShutdown() override {}
-
-  bool OnBrowserCompositorSurfaceIdChanged() override {
-    return view_->render_widget_host()->SynchronizeVisualProperties();
-  }
-
-  std::vector<viz::SurfaceId> CollectSurfaceIdsForEviction() override {
-    return view_->render_widget_host()->CollectSurfaceIdsForEviction();
-  }
-
- private:
-  OffScreenRenderWidgetHostView* view_;
-
-  DISALLOW_COPY_AND_ASSIGN(MacHelper);
-};
-
-void OffScreenRenderWidgetHostView::SetActive(bool active) {}
-
-void OffScreenRenderWidgetHostView::ShowDefinitionForSelection() {}
-
-void OffScreenRenderWidgetHostView::SpeakSelection() {}
-
-bool OffScreenRenderWidgetHostView::UpdateNSViewAndDisplay() {
-  return browser_compositor_->UpdateSurfaceFromNSView(
-      GetRootLayer()->bounds().size(), GetDisplay());
-}
-
-void OffScreenRenderWidgetHostView::CreatePlatformWidget(
-    bool is_guest_view_hack) {
-  mac_helper_ = new MacHelper(this);
-  browser_compositor_.reset(new content::BrowserCompositorMac(
-      mac_helper_, mac_helper_, render_widget_host_->is_hidden(), GetDisplay(),
-      AllocateFrameSinkId(is_guest_view_hack)));
-
-  if (!base::FeatureList::IsEnabled(features::kVizDisplayCompositor)) {
-    SetNeedsBeginFrames(true);
-  }
-}
-
-void OffScreenRenderWidgetHostView::DestroyPlatformWidget() {
-  browser_compositor_.reset();
-  delete mac_helper_;
-}
-
-viz::ScopedSurfaceIdAllocator
-OffScreenRenderWidgetHostView::DidUpdateVisualProperties(
-    const cc::RenderFrameMetadata& metadata) {
-  base::OnceCallback<void()> allocation_task = base::BindOnce(
-      base::IgnoreResult(
-          &OffScreenRenderWidgetHostView::OnDidUpdateVisualPropertiesComplete),
-      weak_ptr_factory_.GetWeakPtr(), metadata);
-  return browser_compositor_->GetScopedRendererSurfaceIdAllocator(
-      std::move(allocation_task));
-}
-
-display::Display OffScreenRenderWidgetHostView::GetDisplay() {
-  content::ScreenInfo screen_info;
-  GetScreenInfo(&screen_info);
-
-  // Start with a reasonable display representation.
-  display::Display display =
-      display::Screen::GetScreen()->GetDisplayNearestView(nullptr);
-
-  // Populate attributes based on |screen_info|.
-  display.set_bounds(screen_info.rect);
-  display.set_work_area(screen_info.available_rect);
-  display.set_device_scale_factor(screen_info.device_scale_factor);
-  display.set_color_space(screen_info.color_space);
-  display.set_color_depth(screen_info.depth);
-  display.set_depth_per_component(screen_info.depth_per_component);
-  display.set_is_monochrome(screen_info.is_monochrome);
-  display.SetRotationAsDegree(screen_info.orientation_angle);
-
-  return display;
-}
-
-void OffScreenRenderWidgetHostView::OnDidUpdateVisualPropertiesComplete(
-    const cc::RenderFrameMetadata& metadata) {
-  DCHECK_EQ(current_device_scale_factor_, metadata.device_scale_factor);
-  browser_compositor_->UpdateSurfaceFromChild(
-      metadata.device_scale_factor, metadata.viewport_size_in_pixels,
-      metadata.local_surface_id_allocation.value_or(
-          viz::LocalSurfaceIdAllocation()));
-}
-
-const viz::LocalSurfaceIdAllocation&
-OffScreenRenderWidgetHostView::GetLocalSurfaceIdAllocation() const {
-  return browser_compositor_->GetRendererLocalSurfaceIdAllocation();
-}
-
-ui::Compositor* OffScreenRenderWidgetHostView::GetCompositor() const {
-  return browser_compositor_->GetCompositor();
-}
-
-ui::Layer* OffScreenRenderWidgetHostView::GetRootLayer() const {
-  return browser_compositor_->GetRootLayer();
-}
-
-content::DelegatedFrameHost*
-OffScreenRenderWidgetHostView::GetDelegatedFrameHost() const {
-  return browser_compositor_->GetDelegatedFrameHost();
-}
-
-}  // namespace atom

atom/browser/render_process_preferences.cc

@@ -1,60 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/render_process_preferences.h"
-
-#include "atom/common/api/api_messages.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
-#include "content/public/browser/render_process_host.h"
-
-namespace atom {
-
-RenderProcessPreferences::RenderProcessPreferences(const Predicate& predicate)
-    : predicate_(predicate) {
-  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED,
-                 content::NotificationService::AllBrowserContextsAndSources());
-}
-
-RenderProcessPreferences::~RenderProcessPreferences() {}
-
-int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
-  int id = ++next_id_;
-  entries_[id] =
-      base::DictionaryValue::From(base::Value::ToUniquePtrValue(entry.Clone()));
-  cache_needs_update_ = true;
-  return id;
-}
-
-void RenderProcessPreferences::RemoveEntry(int id) {
-  cache_needs_update_ = true;
-  entries_.erase(id);
-}
-
-void RenderProcessPreferences::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(type, content::NOTIFICATION_RENDERER_PROCESS_CREATED);
-  content::RenderProcessHost* process =
-      content::Source<content::RenderProcessHost>(source).ptr();
-
-  if (!predicate_.Run(process))
-    return;
-
-  UpdateCache();
-  process->Send(new AtomMsg_UpdatePreferences(cached_entries_));
-}
-
-void RenderProcessPreferences::UpdateCache() {
-  if (!cache_needs_update_)
-    return;
-
-  cached_entries_.Clear();
-  for (const auto& iter : entries_)
-    cached_entries_.Append(base::Value::ToUniquePtrValue(iter.second->Clone()));
-  cache_needs_update_ = false;
-}
-
-}  // namespace atom

atom/browser/render_process_preferences.h

@@ -1,61 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_RENDER_PROCESS_PREFERENCES_H_
-#define ATOM_BROWSER_RENDER_PROCESS_PREFERENCES_H_
-
-#include <memory>
-#include <unordered_map>
-
-#include "base/callback.h"
-#include "base/values.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-
-namespace content {
-class RenderProcessHost;
-}
-
-namespace atom {
-
-// Sets user preferences for render processes.
-class RenderProcessPreferences : public content::NotificationObserver {
- public:
-  using Predicate = base::Callback<bool(content::RenderProcessHost*)>;
-
-  // The |predicate| is used to determine whether to set preferences for a
-  // render process.
-  explicit RenderProcessPreferences(const Predicate& predicate);
-  ~RenderProcessPreferences() override;
-
-  int AddEntry(const base::DictionaryValue& entry);
-  void RemoveEntry(int id);
-
- private:
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
-  void UpdateCache();
-
-  // Manages our notification registrations.
-  content::NotificationRegistrar registrar_;
-
-  Predicate predicate_;
-
-  int next_id_ = 0;
-  std::unordered_map<int, std::unique_ptr<base::DictionaryValue>> entries_;
-
-  // We need to convert the |entries_| to ListValue for multiple times, this
-  // caches is only updated when we are sending messages.
-  bool cache_needs_update_ = true;
-  base::ListValue cached_entries_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderProcessPreferences);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_RENDER_PROCESS_PREFERENCES_H_

atom/browser/ui/certificate_trust.h

@@ -1,29 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_
-#define ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_
-
-#include <string>
-
-#include "base/callback_forward.h"
-#include "base/memory/ref_counted.h"
-#include "net/cert/x509_certificate.h"
-
-namespace atom {
-class NativeWindow;
-}  // namespace atom
-
-namespace certificate_trust {
-
-typedef base::Callback<void(void)> ShowTrustCallback;
-
-void ShowCertificateTrust(atom::NativeWindow* parent_window,
-                          const scoped_refptr<net::X509Certificate>& cert,
-                          const std::string& message,
-                          const ShowTrustCallback& callback);
-
-}  // namespace certificate_trust
-
-#endif  // ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_

atom/browser/ui/cocoa/NSColor+Hex.mm

@@ -1,29 +0,0 @@
-// Created by Mathias Leppich on 03/02/14.
-// Copyright (c) 2014 Bit Bar. All rights reserved.
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/ui/cocoa/NSColor+Hex.h"
-
-@implementation NSColor (Hex)
-
-+ (NSColor*)colorWithHexColorString:(NSString*)inColorString {
-  unsigned colorCode = 0;
-  unsigned char redByte, greenByte, blueByte;
-
-  if (inColorString) {
-    NSScanner* scanner = [NSScanner scannerWithString:inColorString];
-    (void)[scanner scanHexInt:&colorCode];  // ignore error
-  }
-  redByte = (unsigned char)(colorCode >> 16);
-  greenByte = (unsigned char)(colorCode >> 8);
-  blueByte = (unsigned char)(colorCode);  // masks off high bits
-
-  return [NSColor colorWithCalibratedRed:(CGFloat)redByte / 0xff
-                                   green:(CGFloat)greenByte / 0xff
-                                    blue:(CGFloat)blueByte / 0xff
-                                   alpha:1.0];
-}
-
-@end

atom/browser/ui/message_box.h

@@ -1,69 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_UI_MESSAGE_BOX_H_
-#define ATOM_BROWSER_UI_MESSAGE_BOX_H_
-
-#include <string>
-#include <vector>
-
-#include "base/callback_forward.h"
-#include "base/strings/string16.h"
-
-namespace gfx {
-class ImageSkia;
-}
-
-namespace atom {
-
-class NativeWindow;
-
-enum MessageBoxType {
-  MESSAGE_BOX_TYPE_NONE = 0,
-  MESSAGE_BOX_TYPE_INFORMATION,
-  MESSAGE_BOX_TYPE_WARNING,
-  MESSAGE_BOX_TYPE_ERROR,
-  MESSAGE_BOX_TYPE_QUESTION,
-};
-
-enum MessageBoxOptions {
-  MESSAGE_BOX_NONE = 0,
-  MESSAGE_BOX_NO_LINK = 1 << 0,
-};
-
-typedef base::Callback<void(int code, bool checkbox_checked)>
-    MessageBoxCallback;
-
-int ShowMessageBox(NativeWindow* parent_window,
-                   MessageBoxType type,
-                   const std::vector<std::string>& buttons,
-                   int default_id,
-                   int cancel_id,
-                   int options,
-                   const std::string& title,
-                   const std::string& message,
-                   const std::string& detail,
-                   const gfx::ImageSkia& icon);
-
-void ShowMessageBox(NativeWindow* parent_window,
-                    MessageBoxType type,
-                    const std::vector<std::string>& buttons,
-                    int default_id,
-                    int cancel_id,
-                    int options,
-                    const std::string& title,
-                    const std::string& message,
-                    const std::string& detail,
-                    const std::string& checkbox_label,
-                    bool checkbox_checked,
-                    const gfx::ImageSkia& icon,
-                    const MessageBoxCallback& callback);
-
-// Like ShowMessageBox with simplest settings, but safe to call at very early
-// stage of application.
-void ShowErrorBox(const base::string16& title, const base::string16& content);
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_UI_MESSAGE_BOX_H_

atom/browser/ui/message_box_mac.mm

@@ -1,222 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/ui/message_box.h"
-
-#import <Cocoa/Cocoa.h>
-
-#include "atom/browser/native_window.h"
-#include "base/callback.h"
-#include "base/mac/mac_util.h"
-#include "base/strings/sys_string_conversions.h"
-#include "skia/ext/skia_utils_mac.h"
-#include "ui/gfx/image/image_skia.h"
-
-@interface ModalDelegate : NSObject {
- @private
-  atom::MessageBoxCallback callback_;
-  NSAlert* alert_;
-  bool callEndModal_;
-}
-- (id)initWithCallback:(const atom::MessageBoxCallback&)callback
-              andAlert:(NSAlert*)alert
-          callEndModal:(bool)flag;
-@end
-
-@implementation ModalDelegate
-
-- (id)initWithCallback:(const atom::MessageBoxCallback&)callback
-              andAlert:(NSAlert*)alert
-          callEndModal:(bool)flag {
-  if ((self = [super init])) {
-    callback_ = callback;
-    alert_ = alert;
-    callEndModal_ = flag;
-  }
-  return self;
-}
-
-- (void)alertDidEnd:(NSAlert*)alert
-         returnCode:(NSInteger)returnCode
-        contextInfo:(void*)contextInfo {
-  callback_.Run(returnCode, alert.suppressionButton.state == NSOnState);
-  [alert_ release];
-  [self release];
-
-  if (callEndModal_)
-    [NSApp stopModal];
-}
-
-@end
-
-namespace atom {
-
-namespace {
-
-NSAlert* CreateNSAlert(NativeWindow* parent_window,
-                       MessageBoxType type,
-                       const std::vector<std::string>& buttons,
-                       int default_id,
-                       int cancel_id,
-                       const std::string& title,
-                       const std::string& message,
-                       const std::string& detail,
-                       const std::string& checkbox_label,
-                       bool checkbox_checked,
-                       const gfx::ImageSkia& icon) {
-  // Ignore the title; it's the window title on other platforms and ignorable.
-  NSAlert* alert = [[NSAlert alloc] init];
-  [alert setMessageText:base::SysUTF8ToNSString(message)];
-  [alert setInformativeText:base::SysUTF8ToNSString(detail)];
-
-  switch (type) {
-    case MESSAGE_BOX_TYPE_INFORMATION:
-      alert.alertStyle = NSInformationalAlertStyle;
-      break;
-    case MESSAGE_BOX_TYPE_WARNING:
-    case MESSAGE_BOX_TYPE_ERROR:
-      // NSWarningAlertStyle shows the app icon while NSCriticalAlertStyle
-      // shows a warning icon with an app icon badge. Since there is no
-      // error variant, lets just use NSCriticalAlertStyle.
-      alert.alertStyle = NSCriticalAlertStyle;
-      break;
-    default:
-      break;
-  }
-
-  for (size_t i = 0; i < buttons.size(); ++i) {
-    NSString* title = base::SysUTF8ToNSString(buttons[i]);
-    // An empty title causes crash on macOS.
-    if (buttons[i].empty())
-      title = @"(empty)";
-    NSButton* button = [alert addButtonWithTitle:title];
-    [button setTag:i];
-  }
-
-  NSArray* ns_buttons = [alert buttons];
-  int button_count = static_cast<int>([ns_buttons count]);
-
-  if (default_id >= 0 && default_id < button_count) {
-    // Focus the button at default_id if the user opted to do so.
-    // The first button added gets set as the default selected.
-    // So remove that default, and make the requested button the default.
-    [[ns_buttons objectAtIndex:0] setKeyEquivalent:@""];
-    [[ns_buttons objectAtIndex:default_id] setKeyEquivalent:@"\r"];
-  }
-
-  // Bind cancel id button to escape key if there is more than one button
-  if (button_count > 1 && cancel_id >= 0 && cancel_id < button_count) {
-    [[ns_buttons objectAtIndex:cancel_id] setKeyEquivalent:@"\e"];
-  }
-
-  if (!checkbox_label.empty()) {
-    alert.showsSuppressionButton = YES;
-    alert.suppressionButton.title = base::SysUTF8ToNSString(checkbox_label);
-    alert.suppressionButton.state = checkbox_checked ? NSOnState : NSOffState;
-  }
-
-  if (!icon.isNull()) {
-    NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
-        *icon.bitmap(), base::mac::GetGenericRGBColorSpace());
-    [alert setIcon:image];
-  }
-
-  return alert;
-}
-
-void SetReturnCode(int* ret_code, int result, bool checkbox_checked) {
-  *ret_code = result;
-}
-
-}  // namespace
-
-int ShowMessageBox(NativeWindow* parent_window,
-                   MessageBoxType type,
-                   const std::vector<std::string>& buttons,
-                   int default_id,
-                   int cancel_id,
-                   int options,
-                   const std::string& title,
-                   const std::string& message,
-                   const std::string& detail,
-                   const gfx::ImageSkia& icon) {
-  NSAlert* alert =
-      CreateNSAlert(parent_window, type, buttons, default_id, cancel_id, title,
-                    message, detail, "", false, icon);
-
-  // Use runModal for synchronous alert without parent, since we don't have a
-  // window to wait for.
-  if (!parent_window)
-    return [[alert autorelease] runModal];
-
-  int ret_code = -1;
-  ModalDelegate* delegate = [[ModalDelegate alloc]
-      initWithCallback:base::Bind(&SetReturnCode, &ret_code)
-              andAlert:alert
-          callEndModal:true];
-
-  NSWindow* window = parent_window->GetNativeWindow().GetNativeNSWindow();
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [alert beginSheetModalForWindow:window
-                    modalDelegate:delegate
-                   didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
-                      contextInfo:nil];
-#pragma clang diagnostic pop
-
-  [NSApp runModalForWindow:window];
-  return ret_code;
-}
-
-void ShowMessageBox(NativeWindow* parent_window,
-                    MessageBoxType type,
-                    const std::vector<std::string>& buttons,
-                    int default_id,
-                    int cancel_id,
-                    int options,
-                    const std::string& title,
-                    const std::string& message,
-                    const std::string& detail,
-                    const std::string& checkbox_label,
-                    bool checkbox_checked,
-                    const gfx::ImageSkia& icon,
-                    const MessageBoxCallback& callback) {
-  NSAlert* alert =
-      CreateNSAlert(parent_window, type, buttons, default_id, cancel_id, title,
-                    message, detail, checkbox_label, checkbox_checked, icon);
-
-  // Use runModal for synchronous alert without parent, since we don't have a
-  // window to wait for.
-  if (!parent_window) {
-    int ret = [[alert autorelease] runModal];
-    callback.Run(ret, alert.suppressionButton.state == NSOnState);
-  } else {
-    ModalDelegate* delegate = [[ModalDelegate alloc] initWithCallback:callback
-                                                             andAlert:alert
-                                                         callEndModal:false];
-
-    NSWindow* window =
-        parent_window ? parent_window->GetNativeWindow().GetNativeNSWindow()
-                      : nil;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [alert
-        beginSheetModalForWindow:window
-                   modalDelegate:delegate
-                  didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
-                     contextInfo:nil];
-#pragma clang diagnostic pop
-  }
-}
-
-void ShowErrorBox(const base::string16& title, const base::string16& content) {
-  NSAlert* alert = [[NSAlert alloc] init];
-  [alert setMessageText:base::SysUTF16ToNSString(title)];
-  [alert setInformativeText:base::SysUTF16ToNSString(content)];
-  [alert setAlertStyle:NSCriticalAlertStyle];
-  [alert runModal];
-  [alert release];
-}
-
-}  // namespace atom

atom/browser/ui/win/atom_desktop_native_widget_aura.h

@@ -1,30 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
-#define ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
-
-#include "atom/browser/native_window_views.h"
-#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-
-namespace atom {
-
-class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
- public:
-  explicit AtomDesktopNativeWidgetAura(
-      views::internal::NativeWidgetDelegate* delegate);
-
-  // internal::NativeWidgetPrivate:
-  void Activate() override;
-
- private:
-  void OnWindowActivated(wm::ActivationChangeObserver::ActivationReason reason,
-                         aura::Window* gained_active,
-                         aura::Window* lost_active) override;
-  DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_

atom/browser/ui/win/message_handler_delegate.cc

@@ -1,16 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/ui/win/message_handler_delegate.h"
-
-namespace atom {
-
-bool MessageHandlerDelegate::PreHandleMSG(UINT message,
-                                          WPARAM w_param,
-                                          LPARAM l_param,
-                                          LRESULT* result) {
-  return false;
-}
-
-}  // namespace atom

atom/browser/ui/win/message_handler_delegate.h

@@ -1,28 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-#define ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-
-#include <windows.h>
-
-namespace atom {
-
-class MessageHandlerDelegate {
- public:
-  // Catch-all message handling and filtering. Called before
-  // HWNDMessageHandler's built-in handling, which may pre-empt some
-  // expectations in Views/Aura if messages are consumed. Returns true if the
-  // message was consumed by the delegate and should not be processed further
-  // by the HWNDMessageHandler. In this case, |result| is returned. |result| is
-  // not modified otherwise.
-  virtual bool PreHandleMSG(UINT message,
-                            WPARAM w_param,
-                            LPARAM l_param,
-                            LRESULT* result);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_

atom/common/api/api_messages.h

@@ -1,85 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-// Multiply-included file, no traditional include guard.
-
-#include "atom/common/draggable_region.h"
-#include "base/strings/string16.h"
-#include "base/values.h"
-#include "content/public/common/common_param_traits.h"
-#include "content/public/common/referrer.h"
-#include "ipc/ipc_message_macros.h"
-#include "ipc/ipc_platform_file.h"
-#include "ui/gfx/geometry/rect_f.h"
-#include "ui/gfx/ipc/gfx_param_traits.h"
-#include "url/gurl.h"
-
-// The message starter should be declared in ipc/ipc_message_start.h. Since
-// we don't want to patch Chromium, we just pretend to be Content Shell.
-
-#define IPC_MESSAGE_START ShellMsgStart
-
-IPC_STRUCT_TRAITS_BEGIN(atom::DraggableRegion)
-  IPC_STRUCT_TRAITS_MEMBER(draggable)
-  IPC_STRUCT_TRAITS_MEMBER(bounds)
-IPC_STRUCT_TRAITS_END()
-
-IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_Message,
-                    std::string /* channel */,
-                    base::ListValue /* arguments */)
-
-IPC_SYNC_MESSAGE_ROUTED2_1(AtomFrameHostMsg_Message_Sync,
-                           std::string /* channel */,
-                           base::ListValue /* arguments */,
-                           base::ListValue /* result */)
-
-IPC_MESSAGE_ROUTED5(AtomFrameHostMsg_Message_To,
-                    bool /* internal */,
-                    bool /* send_to_all */,
-                    int32_t /* web_contents_id */,
-                    std::string /* channel */,
-                    base::ListValue /* arguments */)
-
-IPC_MESSAGE_ROUTED5(AtomFrameMsg_Message,
-                    bool /* internal */,
-                    bool /* send_to_all */,
-                    std::string /* channel */,
-                    base::ListValue /* arguments */,
-                    int32_t /* sender_id */)
-
-IPC_MESSAGE_ROUTED0(AtomViewMsg_Offscreen)
-
-IPC_MESSAGE_ROUTED3(AtomAutofillFrameHostMsg_ShowPopup,
-                    gfx::RectF /* bounds */,
-                    std::vector<base::string16> /* values */,
-                    std::vector<base::string16> /* labels */)
-
-IPC_MESSAGE_ROUTED0(AtomAutofillFrameHostMsg_HidePopup)
-
-IPC_MESSAGE_ROUTED1(AtomAutofillFrameMsg_AcceptSuggestion,
-                    base::string16 /* suggestion */)
-
-// Sent by the renderer when the draggable regions are updated.
-IPC_MESSAGE_ROUTED1(AtomFrameHostMsg_UpdateDraggableRegions,
-                    std::vector<atom::DraggableRegion> /* regions */)
-
-// Update renderer process preferences.
-IPC_MESSAGE_CONTROL1(AtomMsg_UpdatePreferences, base::ListValue)
-
-// Sent by renderer to set the temporary zoom level.
-IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-                           double /* zoom level */,
-                           double /* result */)
-
-// Sent by renderer to get the zoom level.
-IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-
-// Brings up SaveAs... dialog to save specified URL.
-IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                    GURL /* url */,
-                    content::Referrer /* referrer */)
-
-IPC_MESSAGE_ROUTED2(AtomFrameMsg_TakeHeapSnapshot,
-                    IPC::PlatformFileForTransit /* file_handle */,
-                    std::string /* channel */)

atom/common/api/atom_api_crash_reporter.cc

@@ -1,69 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include <map>
-#include <string>
-
-#include "atom/common/crash_reporter/crash_reporter.h"
-#include "atom/common/native_mate_converters/file_path_converter.h"
-#include "base/bind.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-using crash_reporter::CrashReporter;
-
-namespace mate {
-
-template <>
-struct Converter<CrashReporter::UploadReportResult> {
-  static v8::Local<v8::Value> ToV8(
-      v8::Isolate* isolate,
-      const CrashReporter::UploadReportResult& reports) {
-    mate::Dictionary dict(isolate, v8::Object::New(isolate));
-    dict.Set("date",
-             v8::Date::New(isolate->GetCurrentContext(), reports.first * 1000.0)
-                 .ToLocalChecked());
-    dict.Set("id", reports.second);
-    return dict.GetHandle();
-  }
-};
-
-}  // namespace mate
-
-namespace {
-
-void AddExtraParameter(const std::string& key, const std::string& value) {
-  CrashReporter::GetInstance()->AddExtraParameter(key, value);
-}
-
-void RemoveExtraParameter(const std::string& key) {
-  CrashReporter::GetInstance()->RemoveExtraParameter(key);
-}
-
-std::map<std::string, std::string> GetParameters() {
-  return CrashReporter::GetInstance()->GetParameters();
-}
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  auto reporter = base::Unretained(CrashReporter::GetInstance());
-  dict.SetMethod("start", base::Bind(&CrashReporter::Start, reporter));
-  dict.SetMethod("addExtraParameter", &AddExtraParameter);
-  dict.SetMethod("removeExtraParameter", &RemoveExtraParameter);
-  dict.SetMethod("getParameters", &GetParameters);
-  dict.SetMethod("getUploadedReports",
-                 base::Bind(&CrashReporter::GetUploadedReports, reporter));
-  dict.SetMethod("setUploadToServer",
-                 base::Bind(&CrashReporter::SetUploadToServer, reporter));
-  dict.SetMethod("getUploadToServer",
-                 base::Bind(&CrashReporter::GetUploadToServer, reporter));
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_crash_reporter, Initialize)

atom/common/atom_version.h

@@ -1,33 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_ATOM_VERSION_H_
-#define ATOM_COMMON_ATOM_VERSION_H_
-
-#define ATOM_MAJOR_VERSION 5
-#define ATOM_MINOR_VERSION 0
-#define ATOM_PATCH_VERSION 0
-// clang-format off
-#define ATOM_PRE_RELEASE_VERSION -beta.4
-// clang-format on
-
-#ifndef ATOM_STRINGIFY
-#define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-#define ATOM_STRINGIFY_HELPER(n) #n
-#endif
-
-#ifndef ATOM_PRE_RELEASE_VERSION
-#define ATOM_VERSION_STRING          \
-  ATOM_STRINGIFY(ATOM_MAJOR_VERSION) \
-  "." ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." ATOM_STRINGIFY(ATOM_PATCH_VERSION)
-#else
-#define ATOM_VERSION_STRING                                  \
-  ATOM_STRINGIFY(ATOM_MAJOR_VERSION)                         \
-  "." ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." ATOM_STRINGIFY( \
-      ATOM_PATCH_VERSION) ATOM_STRINGIFY(ATOM_PRE_RELEASE_VERSION)
-#endif
-
-#define ATOM_VERSION "v" ATOM_VERSION_STRING
-
-#endif  // ATOM_COMMON_ATOM_VERSION_H_

atom/common/common_message_generator.cc

@@ -1,31 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-// Get basic type definitions.
-#define IPC_MESSAGE_IMPL
-#include "atom/common/common_message_generator.h"
-
-// Generate constructors.
-#include "ipc/struct_constructor_macros.h"
-
-// lint: must come after struct_constructor_macros.
-#include "atom/common/common_message_generator.h"
-
-// Generate param traits write methods.
-#include "ipc/param_traits_write_macros.h"
-namespace IPC {
-#include "atom/common/common_message_generator.h"
-}  // namespace IPC
-
-// Generate param traits read methods.
-#include "ipc/param_traits_read_macros.h"
-namespace IPC {
-#include "atom/common/common_message_generator.h"
-}  // namespace IPC
-
-// Generate param traits log methods.
-#include "ipc/param_traits_log_macros.h"
-namespace IPC {
-#include "atom/common/common_message_generator.h"
-}  // namespace IPC

atom/common/common_message_generator.h

@@ -1,7 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-// Multiply-included file, no traditional include guard.
-
-#include "atom/common/api/api_messages.h"

atom/common/crash_reporter/crash_reporter_mac.mm

@@ -1,182 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/crash_reporter/crash_reporter_mac.h"
-
-#include <memory>
-
-#include "base/files/file_util.h"
-#include "base/mac/bundle_locations.h"
-#include "base/mac/mac_util.h"
-#include "base/memory/singleton.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/stringprintf.h"
-#include "base/strings/sys_string_conversions.h"
-#include "base/threading/thread_restrictions.h"
-#include "crashpad/client/crashpad_client.h"
-#include "crashpad/client/crashpad_info.h"
-#include "crashpad/client/settings.h"
-
-namespace crash_reporter {
-
-CrashReporterMac::CrashReporterMac() {}
-
-CrashReporterMac::~CrashReporterMac() {}
-
-void CrashReporterMac::InitBreakpad(const std::string& product_name,
-                                    const std::string& version,
-                                    const std::string& company_name,
-                                    const std::string& submit_url,
-                                    const base::FilePath& crashes_dir,
-                                    bool upload_to_server,
-                                    bool skip_system_crash_handler) {
-  // check whether crashpad has been initialized.
-  // Only need to initialize once.
-  if (simple_string_dictionary_)
-    return;
-
-  if (is_browser_) {
-    @autoreleasepool {
-      base::FilePath framework_bundle_path = base::mac::FrameworkBundlePath();
-      base::FilePath handler_path =
-          framework_bundle_path.Append("Resources").Append("crashpad_handler");
-
-      std::vector<std::string> args = {
-          "--no-rate-limit",
-          "--no-upload-gzip",  // not all servers accept gzip
-      };
-
-      crashpad::CrashpadClient crashpad_client;
-      crashpad_client.StartHandler(handler_path, crashes_dir, crashes_dir,
-                                   submit_url, StringMap(), args, true, false);
-    }  // @autoreleasepool
-  }
-
-  crashpad::CrashpadInfo* crashpad_info =
-      crashpad::CrashpadInfo::GetCrashpadInfo();
-  if (skip_system_crash_handler) {
-    crashpad_info->set_system_crash_reporter_forwarding(
-        crashpad::TriState::kDisabled);
-  }
-
-  simple_string_dictionary_.reset(new crashpad::SimpleStringDictionary());
-  crashpad_info->set_simple_annotations(simple_string_dictionary_.get());
-
-  SetCrashKeyValue("prod", ATOM_PRODUCT_NAME);
-  SetCrashKeyValue("process_type", is_browser_ ? "browser" : "renderer");
-  SetCrashKeyValue("ver", version);
-
-  for (const auto& upload_parameter : upload_parameters_) {
-    SetCrashKeyValue(upload_parameter.first, upload_parameter.second);
-  }
-  if (is_browser_) {
-    database_ = crashpad::CrashReportDatabase::Initialize(crashes_dir);
-    SetUploadToServer(upload_to_server);
-  }
-}
-
-bool CrashReporterMac::GetUploadToServer() {
-  bool enabled = true;
-  if (database_) {
-    database_->GetSettings()->GetUploadsEnabled(&enabled);
-  }
-  return enabled;
-}
-
-void CrashReporterMac::SetUploadToServer(const bool upload_to_server) {
-  if (database_) {
-    database_->GetSettings()->SetUploadsEnabled(upload_to_server);
-  }
-}
-
-void CrashReporterMac::SetUploadParameters() {
-  upload_parameters_["platform"] = "darwin";
-}
-
-void CrashReporterMac::SetCrashKeyValue(const base::StringPiece& key,
-                                        const base::StringPiece& value) {
-  simple_string_dictionary_->SetKeyValue(key.data(), value.data());
-}
-
-void CrashReporterMac::AddExtraParameter(const std::string& key,
-                                         const std::string& value) {
-  if (simple_string_dictionary_) {
-    SetCrashKeyValue(key, value);
-  } else {
-    upload_parameters_[key] = value;
-  }
-}
-
-void CrashReporterMac::RemoveExtraParameter(const std::string& key) {
-  if (simple_string_dictionary_)
-    simple_string_dictionary_->RemoveKey(key.data());
-  else
-    upload_parameters_.erase(key);
-}
-
-std::map<std::string, std::string> CrashReporterMac::GetParameters() const {
-  if (simple_string_dictionary_) {
-    std::map<std::string, std::string> ret;
-    crashpad::SimpleStringDictionary::Iterator iter(*simple_string_dictionary_);
-    for (;;) {
-      auto* const entry = iter.Next();
-      if (!entry)
-        break;
-      ret[entry->key] = entry->value;
-    }
-    return ret;
-  }
-  return upload_parameters_;
-}
-
-std::vector<CrashReporter::UploadReportResult>
-CrashReporterMac::GetUploadedReports(const base::FilePath& crashes_dir) {
-  std::vector<CrashReporter::UploadReportResult> uploaded_reports;
-
-  {
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    if (!base::PathExists(crashes_dir)) {
-      return uploaded_reports;
-    }
-  }
-  // Load crashpad database.
-  std::unique_ptr<crashpad::CrashReportDatabase> database =
-      crashpad::CrashReportDatabase::Initialize(crashes_dir);
-  DCHECK(database);
-
-  std::vector<crashpad::CrashReportDatabase::Report> completed_reports;
-  crashpad::CrashReportDatabase::OperationStatus status =
-      database->GetCompletedReports(&completed_reports);
-  if (status != crashpad::CrashReportDatabase::kNoError) {
-    return uploaded_reports;
-  }
-
-  for (const crashpad::CrashReportDatabase::Report& completed_report :
-       completed_reports) {
-    if (completed_report.uploaded) {
-      uploaded_reports.push_back(
-          UploadReportResult(static_cast<int>(completed_report.creation_time),
-                             completed_report.id));
-    }
-  }
-
-  auto sort_by_time = [](const UploadReportResult& a,
-                         const UploadReportResult& b) {
-    return a.first >= b.first;
-  };
-  std::sort(uploaded_reports.begin(), uploaded_reports.end(), sort_by_time);
-  return uploaded_reports;
-}
-
-// static
-CrashReporterMac* CrashReporterMac::GetInstance() {
-  return base::Singleton<CrashReporterMac>::get();
-}
-
-// static
-CrashReporter* CrashReporter::GetInstance() {
-  return CrashReporterMac::GetInstance();
-}
-
-}  // namespace crash_reporter

atom/common/crash_reporter/crash_reporter_win.cc

@@ -1,282 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/crash_reporter/crash_reporter_win.h"
-
-#include <string>
-
-#include "base/files/file_util.h"
-#include "base/logging.h"
-#include "base/memory/singleton.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "content/public/common/result_codes.h"
-#include "gin/public/debug.h"
-#include "sandbox/win/src/nt_internals.h"
-
-#pragma intrinsic(_AddressOfReturnAddress)
-#pragma intrinsic(_ReturnAddress)
-
-#ifdef _WIN64
-// See http://msdn.microsoft.com/en-us/library/ddssxxy8.aspx
-typedef struct _UNWIND_INFO {
-  unsigned char Version : 3;
-  unsigned char Flags : 5;
-  unsigned char SizeOfProlog;
-  unsigned char CountOfCodes;
-  unsigned char FrameRegister : 4;
-  unsigned char FrameOffset : 4;
-  ULONG ExceptionHandler;
-} UNWIND_INFO, *PUNWIND_INFO;
-#endif
-
-namespace crash_reporter {
-
-namespace {
-
-// Minidump with stacks, PEB, TEB, and unloaded module list.
-const MINIDUMP_TYPE kSmallDumpType = static_cast<MINIDUMP_TYPE>(
-    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
-    MiniDumpWithUnloadedModules);    // Get unloaded modules when available.
-
-const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent";
-const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
-
-// Matches breakpad/src/client/windows/common/ipc_protocol.h.
-const int kNameMaxLength = 64;
-const int kValueMaxLength = 64;
-
-typedef NTSTATUS(WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle,
-                                                NTSTATUS ExitStatus);
-char* g_real_terminate_process_stub = NULL;
-
-void TerminateProcessWithoutDump() {
-  // Patched stub exists based on conditions (See InitCrashReporter).
-  // As a side note this function also gets called from
-  // WindowProcExceptionFilter.
-  if (g_real_terminate_process_stub == NULL) {
-    ::TerminateProcess(::GetCurrentProcess(), content::RESULT_CODE_KILLED);
-  } else {
-    NtTerminateProcessPtr real_terminate_proc =
-        reinterpret_cast<NtTerminateProcessPtr>(
-            static_cast<char*>(g_real_terminate_process_stub));
-    real_terminate_proc(::GetCurrentProcess(), content::RESULT_CODE_KILLED);
-  }
-}
-
-#ifdef _WIN64
-int CrashForExceptionInNonABICompliantCodeRange(
-    PEXCEPTION_RECORD ExceptionRecord,
-    ULONG64 EstablisherFrame,
-    PCONTEXT ContextRecord,
-    PDISPATCHER_CONTEXT DispatcherContext) {
-  EXCEPTION_POINTERS info = {ExceptionRecord, ContextRecord};
-  if (!CrashReporter::GetInstance())
-    return EXCEPTION_CONTINUE_SEARCH;
-  return static_cast<CrashReporterWin*>(CrashReporter::GetInstance())
-      ->CrashForException(&info);
-}
-
-struct ExceptionHandlerRecord {
-  RUNTIME_FUNCTION runtime_function;
-  UNWIND_INFO unwind_info;
-  unsigned char thunk[12];
-};
-
-bool RegisterNonABICompliantCodeRange(void* start, size_t size_in_bytes) {
-  ExceptionHandlerRecord* record =
-      reinterpret_cast<ExceptionHandlerRecord*>(start);
-
-  // We assume that the first page of the code range is executable and
-  // committed and reserved for breakpad. What could possibly go wrong?
-
-  // All addresses are 32bit relative offsets to start.
-  record->runtime_function.BeginAddress = 0;
-  record->runtime_function.EndAddress =
-      base::checked_cast<DWORD>(size_in_bytes);
-  record->runtime_function.UnwindData =
-      offsetof(ExceptionHandlerRecord, unwind_info);
-
-  // Create unwind info that only specifies an exception handler.
-  record->unwind_info.Version = 1;
-  record->unwind_info.Flags = UNW_FLAG_EHANDLER;
-  record->unwind_info.SizeOfProlog = 0;
-  record->unwind_info.CountOfCodes = 0;
-  record->unwind_info.FrameRegister = 0;
-  record->unwind_info.FrameOffset = 0;
-  record->unwind_info.ExceptionHandler =
-      offsetof(ExceptionHandlerRecord, thunk);
-
-  // Hardcoded thunk.
-  // mov imm64, rax
-  record->thunk[0] = 0x48;
-  record->thunk[1] = 0xb8;
-  void* handler =
-      reinterpret_cast<void*>(&CrashForExceptionInNonABICompliantCodeRange);
-  memcpy(&record->thunk[2], &handler, 8);
-
-  // jmp rax
-  record->thunk[10] = 0xff;
-  record->thunk[11] = 0xe0;
-
-  // Protect reserved page against modifications.
-  DWORD old_protect;
-  return VirtualProtect(start, sizeof(ExceptionHandlerRecord),
-                        PAGE_EXECUTE_READ, &old_protect) &&
-         RtlAddFunctionTable(&record->runtime_function, 1,
-                             reinterpret_cast<DWORD64>(start));
-}
-
-void UnregisterNonABICompliantCodeRange(void* start) {
-  ExceptionHandlerRecord* record =
-      reinterpret_cast<ExceptionHandlerRecord*>(start);
-
-  RtlDeleteFunctionTable(&record->runtime_function);
-}
-#endif  // _WIN64
-
-}  // namespace
-
-CrashReporterWin::CrashReporterWin() {}
-
-CrashReporterWin::~CrashReporterWin() {}
-
-void CrashReporterWin::InitBreakpad(const std::string& product_name,
-                                    const std::string& version,
-                                    const std::string& company_name,
-                                    const std::string& submit_url,
-                                    const base::FilePath& crashes_dir,
-                                    bool upload_to_server,
-                                    bool skip_system_crash_handler) {
-  skip_system_crash_handler_ = skip_system_crash_handler;
-
-  base::string16 pipe_name = base::ReplaceStringPlaceholders(
-      kPipeNameFormat, base::UTF8ToUTF16(product_name), NULL);
-  base::string16 wait_name = base::ReplaceStringPlaceholders(
-      kWaitEventFormat, base::UTF8ToUTF16(product_name), NULL);
-
-  // Wait until the crash service is started.
-  HANDLE wait_event = ::CreateEventW(NULL, TRUE, FALSE, wait_name.c_str());
-  if (wait_event != NULL) {
-    WaitForSingleObject(wait_event, 1000);
-    CloseHandle(wait_event);
-  }
-
-  // ExceptionHandler() attaches our handler and ~ExceptionHandler() detaches
-  // it, so we must explicitly reset *before* we instantiate our new handler
-  // to allow any previous handler to detach in the correct order.
-  breakpad_.reset();
-
-  breakpad_.reset(new google_breakpad::ExceptionHandler(
-      crashes_dir.DirName().value(), FilterCallback, MinidumpCallback, this,
-      google_breakpad::ExceptionHandler::HANDLER_ALL, kSmallDumpType,
-      pipe_name.c_str(),
-      GetCustomInfo(product_name, version, company_name, upload_to_server)));
-
-  if (!breakpad_->IsOutOfProcess())
-    LOG(ERROR) << "Cannot initialize out-of-process crash handler";
-
-#ifdef _WIN64
-  // Hook up V8 to breakpad.
-  if (!code_range_registered_) {
-    code_range_registered_ = true;
-    // gin::Debug::SetCodeRangeCreatedCallback only runs the callback when
-    // Isolate is just created, so we have to manually run following code here.
-    void* code_range = nullptr;
-    size_t size = 0;
-    v8::Isolate::GetCurrent()->GetCodeRange(&code_range, &size);
-    if (code_range && size &&
-        RegisterNonABICompliantCodeRange(code_range, size)) {
-      gin::Debug::SetCodeRangeDeletedCallback(
-          UnregisterNonABICompliantCodeRange);
-    }
-  }
-#endif
-}
-
-void CrashReporterWin::SetUploadParameters() {
-  upload_parameters_["platform"] = "win32";
-}
-
-int CrashReporterWin::CrashForException(EXCEPTION_POINTERS* info) {
-  if (breakpad_) {
-    breakpad_->WriteMinidumpForException(info);
-    if (skip_system_crash_handler_)
-      TerminateProcessWithoutDump();
-    else
-      RaiseFailFastException(info->ExceptionRecord, info->ContextRecord, 0);
-  }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-
-// static
-bool CrashReporterWin::FilterCallback(void* context,
-                                      EXCEPTION_POINTERS* exinfo,
-                                      MDRawAssertionInfo* assertion) {
-  return true;
-}
-
-// static
-bool CrashReporterWin::MinidumpCallback(const wchar_t* dump_path,
-                                        const wchar_t* minidump_id,
-                                        void* context,
-                                        EXCEPTION_POINTERS* exinfo,
-                                        MDRawAssertionInfo* assertion,
-                                        bool succeeded) {
-  CrashReporterWin* self = static_cast<CrashReporterWin*>(context);
-  if (succeeded && self->skip_system_crash_handler_)
-    return true;
-  else
-    return false;
-}
-
-google_breakpad::CustomClientInfo* CrashReporterWin::GetCustomInfo(
-    const std::string& product_name,
-    const std::string& version,
-    const std::string& company_name,
-    bool upload_to_server) {
-  custom_info_entries_.clear();
-  custom_info_entries_.reserve(3 + upload_parameters_.size());
-
-  custom_info_entries_.push_back(
-      google_breakpad::CustomInfoEntry(L"prod", L"Electron"));
-  custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
-      L"ver", base::UTF8ToWide(version).c_str()));
-  if (!upload_to_server) {
-    custom_info_entries_.push_back(
-        google_breakpad::CustomInfoEntry(L"skip_upload", L"1"));
-  }
-
-  for (StringMap::const_iterator iter = upload_parameters_.begin();
-       iter != upload_parameters_.end(); ++iter) {
-    // breakpad has hardcoded the length of name/value, and doesn't truncate
-    // the values itself, so we have to truncate them here otherwise weird
-    // things may happen.
-    std::wstring name = base::UTF8ToWide(iter->first);
-    std::wstring value = base::UTF8ToWide(iter->second);
-    if (name.length() > kNameMaxLength - 1)
-      name.resize(kNameMaxLength - 1);
-    if (value.length() > kValueMaxLength - 1)
-      value.resize(kValueMaxLength - 1);
-
-    custom_info_entries_.push_back(
-        google_breakpad::CustomInfoEntry(name.c_str(), value.c_str()));
-  }
-
-  custom_info_.entries = &custom_info_entries_.front();
-  custom_info_.count = custom_info_entries_.size();
-  return &custom_info_;
-}
-
-// static
-CrashReporterWin* CrashReporterWin::GetInstance() {
-  return base::Singleton<CrashReporterWin>::get();
-}
-
-// static
-CrashReporter* CrashReporter::GetInstance() {
-  return CrashReporterWin::GetInstance();
-}
-
-}  // namespace crash_reporter

atom/common/crash_reporter/crash_reporter_win.h

@@ -1,78 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
-#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "atom/common/crash_reporter/crash_reporter.h"
-#include "base/compiler_specific.h"
-#include "breakpad/src/client/windows/handler/exception_handler.h"
-
-namespace base {
-template <typename T>
-struct DefaultSingletonTraits;
-}
-
-namespace crash_reporter {
-
-class CrashReporterWin : public CrashReporter {
- public:
-  static CrashReporterWin* GetInstance();
-
-  void InitBreakpad(const std::string& product_name,
-                    const std::string& version,
-                    const std::string& company_name,
-                    const std::string& submit_url,
-                    const base::FilePath& crashes_dir,
-                    bool upload_to_server,
-                    bool skip_system_crash_handler) override;
-  void SetUploadParameters() override;
-
-  // Crashes the process after generating a dump for the provided exception.
-  int CrashForException(EXCEPTION_POINTERS* info);
-
- private:
-  friend struct base::DefaultSingletonTraits<CrashReporterWin>;
-
-  CrashReporterWin();
-  ~CrashReporterWin() override;
-
-  static bool FilterCallback(void* context,
-                             EXCEPTION_POINTERS* exinfo,
-                             MDRawAssertionInfo* assertion);
-
-  static bool MinidumpCallback(const wchar_t* dump_path,
-                               const wchar_t* minidump_id,
-                               void* context,
-                               EXCEPTION_POINTERS* exinfo,
-                               MDRawAssertionInfo* assertion,
-                               bool succeeded);
-
-  // Returns the custom info structure based on parameters.
-  google_breakpad::CustomClientInfo* GetCustomInfo(
-      const std::string& product_name,
-      const std::string& version,
-      const std::string& company_name,
-      bool upload_to_server);
-
-  // Custom information to be passed to crash handler.
-  std::vector<google_breakpad::CustomInfoEntry> custom_info_entries_;
-  google_breakpad::CustomClientInfo custom_info_;
-
-  bool skip_system_crash_handler_ = false;
-#ifdef _WIN64
-  bool code_range_registered_ = false;
-#endif
-  std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
-
-  DISALLOW_COPY_AND_ASSIGN(CrashReporterWin);
-};
-
-}  // namespace crash_reporter
-
-#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_

atom/common/crash_reporter/win/crash_service_main.cc

@@ -1,104 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/crash_reporter/win/crash_service_main.h"
-
-#include "atom/common/crash_reporter/win/crash_service.h"
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/files/file_util.h"
-#include "base/logging.h"
-#include "base/strings/string_util.h"
-
-namespace crash_service {
-
-namespace {
-
-const char kApplicationName[] = "application-name";
-const char kCrashesDirectory[] = "crashes-directory";
-
-const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
-const wchar_t kStandardLogFile[] = L"operation_log.txt";
-
-void InvalidParameterHandler(const wchar_t*,
-                             const wchar_t*,
-                             const wchar_t*,
-                             unsigned int,
-                             uintptr_t) {
-  // noop.
-}
-
-bool CreateCrashServiceDirectory(const base::FilePath& temp_dir) {
-  if (!base::PathExists(temp_dir)) {
-    if (!base::CreateDirectory(temp_dir))
-      return false;
-  }
-  return true;
-}
-
-}  // namespace.
-
-int Main(const wchar_t* cmd) {
-  // Ignore invalid parameter errors.
-  _set_invalid_parameter_handler(InvalidParameterHandler);
-
-  // Initialize all Chromium things.
-  base::AtExitManager exit_manager;
-  base::CommandLine::Init(0, NULL);
-  base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
-
-  // Use the application's name as pipe name and output directory.
-  if (!cmd_line.HasSwitch(kApplicationName)) {
-    LOG(ERROR) << "Application's name must be specified with --"
-               << kApplicationName;
-    return 1;
-  }
-  std::wstring application_name =
-      cmd_line.GetSwitchValueNative(kApplicationName);
-
-  if (!cmd_line.HasSwitch(kCrashesDirectory)) {
-    LOG(ERROR) << "Crashes directory path must be specified with --"
-               << kCrashesDirectory;
-    return 1;
-  }
-
-  // We use/create a directory under the user's temp folder, for logging.
-  base::FilePath operating_dir(
-      cmd_line.GetSwitchValueNative(kCrashesDirectory));
-  CreateCrashServiceDirectory(operating_dir);
-  base::FilePath log_file = operating_dir.Append(kStandardLogFile);
-
-  // Logging to stderr (to help with debugging failures on the
-  // buildbots) and to a file.
-  logging::LoggingSettings settings;
-  settings.logging_dest = logging::LOG_TO_ALL;
-  settings.log_file = log_file.value().c_str();
-  logging::InitLogging(settings);
-  // Logging with pid, tid and timestamp.
-  logging::SetLogItems(true, true, true, false);
-
-  VLOG(1) << "Session start. cmdline is [" << cmd << "]";
-
-  // Setting the crash reporter.
-  base::string16 pipe_name =
-      base::ReplaceStringPlaceholders(kPipeNameFormat, application_name, NULL);
-  cmd_line.AppendSwitch("no-window");
-  cmd_line.AppendSwitchASCII("max-reports", "128");
-  cmd_line.AppendSwitchASCII("reporter", ATOM_PROJECT_NAME "-crash-service");
-  cmd_line.AppendSwitchNative("pipe-name", pipe_name);
-
-  breakpad::CrashService crash_service;
-  if (!crash_service.Initialize(application_name, operating_dir, operating_dir))
-    return 2;
-
-  VLOG(1) << "Ready to process crash requests";
-
-  // Enter the message loop.
-  int retv = crash_service.ProcessingLoop();
-  // Time to exit.
-  VLOG(1) << "Session end. return code is " << retv;
-  return retv;
-}
-
-}  // namespace crash_service

atom/common/crash_reporter/win/crash_service_main.h

@@ -1,15 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
-#define ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
-
-namespace crash_service {
-
-// Program entry, should be called by main();
-int Main(const wchar_t* cmd_line);
-
-}  // namespace crash_service
-
-#endif  // ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_

atom/common/draggable_region.cc

@@ -1,11 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/draggable_region.h"
-
-namespace atom {
-
-DraggableRegion::DraggableRegion() : draggable(false) {}
-
-}  // namespace atom

atom/common/draggable_region.h

@@ -1,21 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_DRAGGABLE_REGION_H_
-#define ATOM_COMMON_DRAGGABLE_REGION_H_
-
-#include "ui/gfx/geometry/rect.h"
-
-namespace atom {
-
-struct DraggableRegion {
-  bool draggable;
-  gfx::Rect bounds;
-
-  DraggableRegion();
-};
-
-}  // namespace atom
-
-#endif  // ATOM_COMMON_DRAGGABLE_REGION_H_

atom/common/native_mate_converters/string16_converter.h

@@ -1,40 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
-
-#include "base/strings/string16.h"
-#include "native_mate/converter.h"
-
-namespace mate {
-
-template <>
-struct Converter<base::string16> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const base::string16& val) {
-    return v8::String::NewFromTwoByte(
-        isolate, reinterpret_cast<const uint16_t*>(val.data()),
-        v8::String::kNormalString, val.size());
-  }
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     base::string16* out) {
-    if (!val->IsString())
-      return false;
-
-    v8::String::Value s(isolate, val);
-    out->assign(reinterpret_cast<const base::char16*>(*s), s.length());
-    return true;
-  }
-};
-
-inline v8::Local<v8::String> StringToV8(v8::Isolate* isolate,
-                                        const base::string16& input) {
-  return ConvertToV8(isolate, input).As<v8::String>();
-}
-
-}  // namespace mate
-
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_

atom/common/node_includes.h

@@ -1,55 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_NODE_INCLUDES_H_
-#define ATOM_COMMON_NODE_INCLUDES_H_
-
-#include "base/logging.h"
-
-// Include common headers for using node APIs.
-
-#ifdef NODE_SHARED_MODE
-#define BUILDING_NODE_EXTENSION
-#endif
-
-// The following define makes sure that we do not include the macros
-// again. But we still need the tracing functions, so declaring them.
-#define SRC_TRACING_TRACE_EVENT_H_
-
-#undef ASSERT
-#undef CHECK
-#undef CHECK_EQ
-#undef CHECK_NE
-#undef CHECK_GE
-#undef CHECK_GT
-#undef CHECK_LE
-#undef CHECK_LT
-#undef UNLIKELY
-#undef DISALLOW_COPY_AND_ASSIGN
-#undef NO_RETURN
-#undef LIKELY
-#undef debug_string    // This is defined in macOS SDK in AssertMacros.h.
-#undef require_string  // This is defined in macOS SDK in AssertMacros.h.
-#include "env-inl.h"
-#include "env.h"
-#include "node.h"
-#include "node_buffer.h"
-#include "node_internals.h"
-#include "node_options.h"
-#include "node_platform.h"
-
-namespace node {
-namespace tracing {
-
-class TraceEventHelper {
- public:
-  static v8::TracingController* GetTracingController();
-  static node::tracing::Agent* GetAgent();
-  static void SetAgent(node::tracing::Agent* agent);
-};
-
-}  // namespace tracing
-}  // namespace node
-
-#endif  // ATOM_COMMON_NODE_INCLUDES_H_

atom/common/promise_util.h

@@ -1,157 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_PROMISE_UTIL_H_
-#define ATOM_COMMON_PROMISE_UTIL_H_
-
-#include <string>
-
-#include "atom/common/api/locker.h"
-#include "atom/common/native_mate_converters/callback.h"
-#include "content/public/browser/browser_thread.h"
-#include "native_mate/converter.h"
-
-namespace atom {
-
-namespace util {
-
-// A wrapper around the v8::Promise.
-//
-// This is a move-only type that should always be `std::move`d when passed to
-// callbacks, and it should be destroyed on the same thread of creation.
-class Promise {
- public:
-  // Create a new promise.
-  explicit Promise(v8::Isolate* isolate);
-
-  // Wrap an existing v8 promise.
-  Promise(v8::Isolate* isolate, v8::Local<v8::Promise::Resolver> handle);
-
-  ~Promise();
-
-  // Support moving.
-  Promise(Promise&&);
-  Promise& operator=(Promise&&);
-
-  v8::Isolate* isolate() const { return isolate_; }
-  v8::Local<v8::Context> GetContext() {
-    return v8::Local<v8::Context>::New(isolate_, context_);
-  }
-
-  v8::Local<v8::Promise> GetHandle() const;
-
-  v8::Maybe<bool> Resolve() {
-    v8::HandleScope handle_scope(isolate());
-    v8::MicrotasksScope script_scope(isolate(),
-                                     v8::MicrotasksScope::kRunMicrotasks);
-    v8::Context::Scope context_scope(
-        v8::Local<v8::Context>::New(isolate(), GetContext()));
-
-    return GetInner()->Resolve(GetContext(), v8::Undefined(isolate()));
-  }
-
-  v8::Maybe<bool> Reject() {
-    v8::HandleScope handle_scope(isolate());
-    v8::MicrotasksScope script_scope(isolate(),
-                                     v8::MicrotasksScope::kRunMicrotasks);
-    v8::Context::Scope context_scope(
-        v8::Local<v8::Context>::New(isolate(), GetContext()));
-
-    return GetInner()->Reject(GetContext(), v8::Undefined(isolate()));
-  }
-
-  template <typename ReturnType, typename... ArgTypes>
-  v8::MaybeLocal<v8::Promise> Then(base::Callback<ReturnType(ArgTypes...)> cb) {
-    v8::HandleScope handle_scope(isolate());
-    v8::Context::Scope context_scope(
-        v8::Local<v8::Context>::New(isolate(), GetContext()));
-
-    v8::Local<v8::Value> value = mate::ConvertToV8(isolate(), cb);
-    v8::Local<v8::Function> handler = v8::Local<v8::Function>::Cast(value);
-
-    return GetHandle()->Then(GetContext(), handler);
-  }
-
-  // Promise resolution is a microtask
-  // We use the MicrotasksRunner to trigger the running of pending microtasks
-  template <typename T>
-  v8::Maybe<bool> Resolve(const T& value) {
-    v8::HandleScope handle_scope(isolate());
-    v8::MicrotasksScope script_scope(isolate(),
-                                     v8::MicrotasksScope::kRunMicrotasks);
-    v8::Context::Scope context_scope(
-        v8::Local<v8::Context>::New(isolate(), GetContext()));
-
-    return GetInner()->Resolve(GetContext(),
-                               mate::ConvertToV8(isolate(), value));
-  }
-
-  template <typename T>
-  v8::Maybe<bool> Reject(const T& value) {
-    v8::HandleScope handle_scope(isolate());
-    v8::MicrotasksScope script_scope(isolate(),
-                                     v8::MicrotasksScope::kRunMicrotasks);
-    v8::Context::Scope context_scope(
-        v8::Local<v8::Context>::New(isolate(), GetContext()));
-
-    return GetInner()->Reject(GetContext(),
-                              mate::ConvertToV8(isolate(), value));
-  }
-
-  v8::Maybe<bool> RejectWithErrorMessage(const std::string& error);
-
- private:
-  friend class CopyablePromise;
-
-  v8::Local<v8::Promise::Resolver> GetInner() const {
-    return resolver_.Get(isolate());
-  }
-
-  v8::Isolate* isolate_;
-  v8::Global<v8::Context> context_;
-  v8::Global<v8::Promise::Resolver> resolver_;
-
-  DISALLOW_COPY_AND_ASSIGN(Promise);
-};
-
-// A wrapper of Promise that can be copied.
-//
-// This class should only be used when we have to pass Promise to a Chromium API
-// that does not take OnceCallback.
-class CopyablePromise {
- public:
-  explicit CopyablePromise(const Promise& promise);
-  CopyablePromise(const CopyablePromise&);
-  ~CopyablePromise();
-
-  Promise GetPromise() const;
-
- private:
-  using CopyablePersistent =
-      v8::CopyablePersistentTraits<v8::Promise::Resolver>::CopyablePersistent;
-
-  v8::Isolate* isolate_;
-  CopyablePersistent handle_;
-};
-
-}  // namespace util
-
-}  // namespace atom
-
-namespace mate {
-
-template <>
-struct Converter<atom::util::Promise> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const atom::util::Promise& val);
-  // TODO(MarshallOfSound): Implement FromV8 to allow promise chaining
-  //                        in native land
-  // static bool FromV8(v8::Isolate* isolate,
-  //                    v8::Local<v8::Value> val,
-  //                    Promise* out);
-};
-
-}  // namespace mate
-
-#endif  // ATOM_COMMON_PROMISE_UTIL_H_

atom/common/resources/mac/MainMenu.xib

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">101000</int>
-		<string key="IBDocument.SystemVersion">14D136</string>
-		<string key="IBDocument.InterfaceBuilderVersion">7531</string>
-		<string key="IBDocument.AppKitVersion">1347.57</string>
-		<string key="IBDocument.HIToolboxVersion">758.70</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">7531</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">AtomApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="903638069">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">Main Menu</string>
-				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Electron</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="229763992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="909111550">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<reference key="NSTarget" ref="110575045"/>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">Electron</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="229763992"/>
-									<reference key="NSMixedImage" ref="909111550"/>
-								</object>
-								<object class="NSMenuItem" id="1025936716">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Open Recent</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<bool key="NSIsHidden">YES</bool>
-									<reference key="NSOnImage" ref="229763992"/>
-									<reference key="NSMixedImage" ref="909111550"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="1065607017">
-										<string key="NSTitle">Open Recent</string>
-										<array class="NSMutableArray" key="NSMenuItems"></array>
-										<string key="NSName">_NSRecentDocumentsMenu</string>
-									</object>
-								</object>
-							</array>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-				</array>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">807</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="903638069"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<!-- NSMenu Main Menu -->
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="694149608"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<!-- NSMenuItem Electron -->
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="110575045"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<!-- NSMenu Electron -->
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="632727374"/>
-							<reference ref="1025936716"/>
-						</array>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<!-- NSMenuItem Quit -->
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<!-- NSMenuItem Open Recent -->
-					<object class="IBObjectRecord">
-						<int key="objectID">124</int>
-						<reference key="object" ref="1025936716"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1065607017"/>
-						</array>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<!-- NSMenu Open Recent -->
-					<object class="IBObjectRecord">
-						<int key="objectID">125</int>
-						<reference key="object" ref="1065607017"/>
-						<array class="NSMutableArray" key="children"></array>
-						<reference key="parent" ref="1025936716"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">807</int>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="4600" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{12, 12}</string>
-			<string key="NSMenuMixedState">{10, 2}</string>
-		</dictionary>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
-	</data>
-</archive>

atom/renderer/api/atom_api_renderer_ipc.cc

@@ -1,94 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include <string>
-
-#include "atom/common/api/api_messages.h"
-#include "atom/common/native_mate_converters/string16_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_bindings.h"
-#include "atom/common/node_includes.h"
-#include "base/values.h"
-#include "content/public/renderer/render_frame.h"
-#include "native_mate/arguments.h"
-#include "native_mate/dictionary.h"
-#include "third_party/blink/public/web/web_local_frame.h"
-
-using blink::WebLocalFrame;
-using content::RenderFrame;
-
-namespace {
-
-RenderFrame* GetCurrentRenderFrame() {
-  WebLocalFrame* frame = WebLocalFrame::FrameForCurrentContext();
-  if (!frame)
-    return nullptr;
-
-  return RenderFrame::FromWebFrame(frame);
-}
-
-void Send(mate::Arguments* args,
-          const std::string& channel,
-          const base::ListValue& arguments) {
-  RenderFrame* render_frame = GetCurrentRenderFrame();
-  if (render_frame == nullptr)
-    return;
-
-  bool success = render_frame->Send(new AtomFrameHostMsg_Message(
-      render_frame->GetRoutingID(), channel, arguments));
-
-  if (!success)
-    args->ThrowError("Unable to send AtomFrameHostMsg_Message");
-}
-
-base::ListValue SendSync(mate::Arguments* args,
-                         const std::string& channel,
-                         const base::ListValue& arguments) {
-  base::ListValue result;
-
-  RenderFrame* render_frame = GetCurrentRenderFrame();
-  if (render_frame == nullptr)
-    return result;
-
-  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-      render_frame->GetRoutingID(), channel, arguments, &result);
-  bool success = render_frame->Send(message);
-
-  if (!success)
-    args->ThrowError("Unable to send AtomFrameHostMsg_Message_Sync");
-
-  return result;
-}
-
-void SendTo(mate::Arguments* args,
-            bool internal,
-            bool send_to_all,
-            int32_t web_contents_id,
-            const std::string& channel,
-            const base::ListValue& arguments) {
-  RenderFrame* render_frame = GetCurrentRenderFrame();
-  if (render_frame == nullptr)
-    return;
-
-  bool success = render_frame->Send(new AtomFrameHostMsg_Message_To(
-      render_frame->GetRoutingID(), internal, send_to_all, web_contents_id,
-      channel, arguments));
-
-  if (!success)
-    args->ThrowError("Unable to send AtomFrameHostMsg_Message_To");
-}
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("send", &Send);
-  dict.SetMethod("sendSync", &SendSync);
-  dict.SetMethod("sendTo", &SendTo);
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_renderer_ipc, Initialize)

atom/renderer/atom_render_frame_observer.cc

@@ -1,253 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/renderer/atom_render_frame_observer.h"
-
-#include <string>
-#include <vector>
-
-#include "atom/common/api/api_messages.h"
-#include "atom/common/api/event_emitter_caller.h"
-#include "atom/common/heap_snapshot.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/threading/thread_restrictions.h"
-#include "base/trace_event/trace_event.h"
-#include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_view.h"
-#include "ipc/ipc_message_macros.h"
-#include "native_mate/dictionary.h"
-#include "net/base/net_module.h"
-#include "net/grit/net_resources.h"
-#include "third_party/blink/public/platform/web_isolated_world_info.h"
-#include "third_party/blink/public/web/blink.h"
-#include "third_party/blink/public/web/web_document.h"
-#include "third_party/blink/public/web/web_draggable_region.h"
-#include "third_party/blink/public/web/web_element.h"
-#include "third_party/blink/public/web/web_local_frame.h"
-#include "third_party/blink/public/web/web_script_source.h"
-#include "ui/base/resource/resource_bundle.h"
-
-namespace atom {
-
-namespace {
-
-bool GetIPCObject(v8::Isolate* isolate,
-                  v8::Local<v8::Context> context,
-                  bool internal,
-                  v8::Local<v8::Object>* ipc) {
-  v8::Local<v8::String> key =
-      mate::StringToV8(isolate, internal ? "ipc-internal" : "ipc");
-  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
-  v8::Local<v8::Object> global_object = context->Global();
-  v8::Local<v8::Value> value;
-  if (!global_object->GetPrivate(context, privateKey).ToLocal(&value))
-    return false;
-  if (value.IsEmpty() || !value->IsObject())
-    return false;
-  *ipc = value->ToObject(isolate);
-  return true;
-}
-
-std::vector<v8::Local<v8::Value>> ListValueToVector(
-    v8::Isolate* isolate,
-    const base::ListValue& list) {
-  v8::Local<v8::Value> array = mate::ConvertToV8(isolate, list);
-  std::vector<v8::Local<v8::Value>> result;
-  mate::ConvertFromV8(isolate, array, &result);
-  return result;
-}
-
-base::StringPiece NetResourceProvider(int key) {
-  if (key == IDR_DIR_HEADER_HTML) {
-    base::StringPiece html_data =
-        ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_DIR_HEADER_HTML);
-    return html_data;
-  }
-  return base::StringPiece();
-}
-
-}  // namespace
-
-AtomRenderFrameObserver::AtomRenderFrameObserver(
-    content::RenderFrame* frame,
-    RendererClientBase* renderer_client)
-    : content::RenderFrameObserver(frame),
-      render_frame_(frame),
-      renderer_client_(renderer_client) {
-  // Initialise resource for directory listing.
-  net::NetModule::SetResourceProvider(NetResourceProvider);
-}
-
-void AtomRenderFrameObserver::DidClearWindowObject() {
-  renderer_client_->DidClearWindowObject(render_frame_);
-}
-
-void AtomRenderFrameObserver::DidCreateDocumentElement() {
-  document_created_ = true;
-}
-
-void AtomRenderFrameObserver::DidCreateScriptContext(
-    v8::Handle<v8::Context> context,
-    int world_id) {
-  if (ShouldNotifyClient(world_id))
-    renderer_client_->DidCreateScriptContext(context, render_frame_);
-
-  if (renderer_client_->isolated_world() && IsMainWorld(world_id) &&
-      // Only the top window's main frame has isolated world.
-      render_frame_->IsMainFrame() && !render_frame_->GetWebFrame()->Opener()) {
-    CreateIsolatedWorldContext();
-    renderer_client_->SetupMainWorldOverrides(context, render_frame_);
-  }
-}
-
-void AtomRenderFrameObserver::DraggableRegionsChanged() {
-  blink::WebVector<blink::WebDraggableRegion> webregions =
-      render_frame_->GetWebFrame()->GetDocument().DraggableRegions();
-  std::vector<DraggableRegion> regions;
-  for (auto& webregion : webregions) {
-    DraggableRegion region;
-    render_frame_->GetRenderView()->ConvertViewportToWindowViaWidget(
-        &webregion.bounds);
-    region.bounds = webregion.bounds;
-    region.draggable = webregion.draggable;
-    regions.push_back(region);
-  }
-  Send(new AtomFrameHostMsg_UpdateDraggableRegions(routing_id(), regions));
-}
-
-void AtomRenderFrameObserver::WillReleaseScriptContext(
-    v8::Local<v8::Context> context,
-    int world_id) {
-  if (ShouldNotifyClient(world_id))
-    renderer_client_->WillReleaseScriptContext(context, render_frame_);
-}
-
-void AtomRenderFrameObserver::OnDestruct() {
-  delete this;
-}
-
-void AtomRenderFrameObserver::CreateIsolatedWorldContext() {
-  auto* frame = render_frame_->GetWebFrame();
-  blink::WebIsolatedWorldInfo info;
-  // This maps to the name shown in the context combo box in the Console tab
-  // of the dev tools.
-  info.human_readable_name =
-      blink::WebString::FromUTF8("Electron Isolated Context");
-  // Setup document's origin policy in isolated world
-  info.security_origin = frame->GetDocument().GetSecurityOrigin();
-  frame->SetIsolatedWorldInfo(World::ISOLATED_WORLD, info);
-
-  // Create initial script context in isolated world
-  blink::WebScriptSource source("void 0");
-  frame->ExecuteScriptInIsolatedWorld(World::ISOLATED_WORLD, source);
-}
-
-bool AtomRenderFrameObserver::IsMainWorld(int world_id) {
-  return world_id == World::MAIN_WORLD;
-}
-
-bool AtomRenderFrameObserver::IsIsolatedWorld(int world_id) {
-  return world_id == World::ISOLATED_WORLD;
-}
-
-bool AtomRenderFrameObserver::ShouldNotifyClient(int world_id) {
-  if (renderer_client_->isolated_world() && render_frame_->IsMainFrame())
-    return IsIsolatedWorld(world_id);
-  else
-    return IsMainWorld(world_id);
-}
-
-bool AtomRenderFrameObserver::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AtomRenderFrameObserver, message)
-    IPC_MESSAGE_HANDLER(AtomFrameMsg_Message, OnBrowserMessage)
-    IPC_MESSAGE_HANDLER(AtomFrameMsg_TakeHeapSnapshot, OnTakeHeapSnapshot)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-
-  return handled;
-}
-
-void AtomRenderFrameObserver::OnBrowserMessage(bool internal,
-                                               bool send_to_all,
-                                               const std::string& channel,
-                                               const base::ListValue& args,
-                                               int32_t sender_id) {
-  // Don't handle browser messages before document element is created.
-  // When we receive a message from the browser, we try to transfer it
-  // to a web page, and when we do that Blink creates an empty
-  // document element if it hasn't been created yet, and it makes our init
-  // script to run while `window.location` is still "about:blank".
-  if (!document_created_)
-    return;
-
-  blink::WebLocalFrame* frame = render_frame_->GetWebFrame();
-  if (!frame)
-    return;
-
-  EmitIPCEvent(frame, internal, channel, args, sender_id);
-
-  // Also send the message to all sub-frames.
-  if (send_to_all) {
-    for (blink::WebFrame* child = frame->FirstChild(); child;
-         child = child->NextSibling())
-      if (child->IsWebLocalFrame()) {
-        EmitIPCEvent(child->ToWebLocalFrame(), internal, channel, args,
-                     sender_id);
-      }
-  }
-}
-
-void AtomRenderFrameObserver::OnTakeHeapSnapshot(
-    IPC::PlatformFileForTransit file_handle,
-    const std::string& channel) {
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
-
-  auto file = IPC::PlatformFileForTransitToFile(file_handle);
-  bool success = TakeHeapSnapshot(blink::MainThreadIsolate(), &file);
-
-  base::ListValue args;
-  args.AppendString(channel);
-  args.AppendBoolean(success);
-
-  render_frame_->Send(new AtomFrameHostMsg_Message(
-      render_frame_->GetRoutingID(), "ipc-internal-message", args));
-}
-
-void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-                                           bool internal,
-                                           const std::string& channel,
-                                           const base::ListValue& args,
-                                           int32_t sender_id) {
-  if (!frame)
-    return;
-
-  v8::Isolate* isolate = blink::MainThreadIsolate();
-  v8::HandleScope handle_scope(isolate);
-
-  v8::Local<v8::Context> context = renderer_client_->GetContext(frame, isolate);
-  v8::Context::Scope context_scope(context);
-
-  // Only emit IPC event for context with node integration.
-  node::Environment* env = node::Environment::GetCurrent(context);
-  if (!env)
-    return;
-
-  v8::Local<v8::Object> ipc;
-  if (GetIPCObject(isolate, context, internal, &ipc)) {
-    TRACE_EVENT0("devtools.timeline", "FunctionCall");
-    auto args_vector = ListValueToVector(isolate, args);
-    // Insert the Event object, event.sender is ipc.
-    mate::Dictionary event = mate::Dictionary::CreateEmpty(isolate);
-    event.Set("sender", ipc);
-    event.Set("senderId", sender_id);
-    args_vector.insert(args_vector.begin(), event.GetHandle());
-    mate::EmitEvent(isolate, ipc, channel, args_vector);
-  }
-}
-
-}  // namespace atom

atom/renderer/atom_render_view_observer.cc

@@ -1,37 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/renderer/atom_render_view_observer.h"
-
-#include "atom/common/api/api_messages.h"
-#include "content/public/renderer/render_view.h"
-#include "ipc/ipc_message_macros.h"
-#include "third_party/blink/public/web/web_view.h"
-
-namespace atom {
-
-AtomRenderViewObserver::AtomRenderViewObserver(content::RenderView* render_view)
-    : content::RenderViewObserver(render_view) {}
-
-AtomRenderViewObserver::~AtomRenderViewObserver() {}
-
-bool AtomRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AtomRenderViewObserver, message)
-    IPC_MESSAGE_HANDLER(AtomViewMsg_Offscreen, OnOffscreen)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-
-  return handled;
-}
-
-void AtomRenderViewObserver::OnDestruct() {
-  delete this;
-}
-
-void AtomRenderViewObserver::OnOffscreen() {
-  blink::WebView::SetUseExternalPopupMenus(false);
-}
-
-}  // namespace atom

atom/renderer/atom_render_view_observer.h

@@ -1,31 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_
-#define ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_
-
-#include "content/public/renderer/render_view_observer.h"
-
-namespace atom {
-
-class AtomRenderViewObserver : public content::RenderViewObserver {
- public:
-  explicit AtomRenderViewObserver(content::RenderView* render_view);
-
- protected:
-  ~AtomRenderViewObserver() override;
-
- private:
-  // content::RenderViewObserver implementation.
-  bool OnMessageReceived(const IPC::Message& message) override;
-  void OnDestruct() override;
-
-  void OnOffscreen();
-
-  DISALLOW_COPY_AND_ASSIGN(AtomRenderViewObserver);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_

atom/renderer/preferences_manager.cc

@@ -1,34 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/renderer/preferences_manager.h"
-
-#include "atom/common/api/api_messages.h"
-#include "content/public/renderer/render_thread.h"
-
-namespace atom {
-
-PreferencesManager::PreferencesManager() {
-  content::RenderThread::Get()->AddObserver(this);
-}
-
-PreferencesManager::~PreferencesManager() {}
-
-bool PreferencesManager::OnControlMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(PreferencesManager, message)
-    IPC_MESSAGE_HANDLER(AtomMsg_UpdatePreferences, OnUpdatePreferences)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void PreferencesManager::OnUpdatePreferences(
-    const base::ListValue& preferences) {
-  auto copy =
-      base::ListValue::From(base::Value::ToUniquePtrValue(preferences.Clone()));
-  preferences_.swap(copy);
-}
-
-}  // namespace atom

atom/renderer/preferences_manager.h

@@ -1,35 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_RENDERER_PREFERENCES_MANAGER_H_
-#define ATOM_RENDERER_PREFERENCES_MANAGER_H_
-
-#include <memory>
-
-#include "base/values.h"
-#include "content/public/renderer/render_thread_observer.h"
-
-namespace atom {
-
-class PreferencesManager : public content::RenderThreadObserver {
- public:
-  PreferencesManager();
-  ~PreferencesManager() override;
-
-  const base::ListValue* preferences() const { return preferences_.get(); }
-
- private:
-  // content::RenderThreadObserver:
-  bool OnControlMessageReceived(const IPC::Message& message) override;
-
-  void OnUpdatePreferences(const base::ListValue& preferences);
-
-  std::unique_ptr<base::ListValue> preferences_;
-
-  DISALLOW_COPY_AND_ASSIGN(PreferencesManager);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_RENDERER_PREFERENCES_MANAGER_H_

build/args/all.gn

@@ -2,18 +2,21 @@ is_electron_build = true
 use_jumbo_build = true
 root_extra_deps = [ "//electron" ]
 
+# Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
+node_module_version = 73
+
 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
 v8_embedder_string = "-electron.0"
 
+# TODO: this breaks mksnapshot
+v8_enable_snapshot_native_code_counters = false
+
 enable_cdm_host_verification = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
+angle_enable_vulkan_validation_layers = false
 
 is_cfi = false
-
-# FIXME(deepak1556): workaround for https://crbug.com/924225
-# remove this when clang roll 352138 lands.
-enable_precompiled_headers = false

build/args/release.gn

@@ -1,7 +1,6 @@
 import("all.gn")
 is_component_build = false
 is_official_build = true
-strip_debug_info = true
 
 # This may be guarded behind is_chrome_branded alongside
 # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,

build/asar.gni

@@ -1,5 +1,6 @@
-import("npm.gni")
+import("node.gni")
 
+# TODO(MarshallOfSound): Move to electron/node, this is the only place it is used now
 # Run an action with a given working directory. Behaves identically to the
 # action() target type, with the exception that it changes directory before
 # running the script.
@@ -32,19 +33,28 @@ template("chdir_action") {
 
 template("asar") {
   assert(defined(invoker.sources),
-         "Need sources in $target_name listing the JS files.")
+         "Need sources in $target_name listing the source files")
   assert(defined(invoker.outputs),
          "Need asar name (as 1-element array, e.g. \$root_out_dir/foo.asar)")
-  assert(defined(invoker.root), "Need asar root directory")
-  asar_root = invoker.root
+  assert(defined(invoker.root), "Need the base dir for generating the ASAR")
 
-  # js2asar.py expects relative paths to its inputs, so we must run it in a
-  # working directory in which those relative paths make sense.
-  chdir_action(target_name) {
-    sources = invoker.sources
-    outputs = invoker.outputs
-    script = "//electron/tools/js2asar.py"
-    cwd = rebase_path(get_path_info(".", "abspath"))
-    args = rebase_path(outputs, cwd) + [ asar_root ] + rebase_path(sources, ".")
+  node_action(target_name) {
+    forward_variables_from(invoker,
+                           "*",
+                           [
+                             "script",
+                             "args",
+                           ])
+
+    script = "//electron/script/gn-asar.js"
+    args = [
+             "--base",
+             rebase_path(root),
+             "--files",
+           ] + rebase_path(sources) +
+           [
+             "--out",
+             rebase_path(outputs[0]),
+           ]
   }
 }

build/generate-template.py

@@ -0,0 +1,16 @@
+import json
+import sys
+from string import Template
+
+inpath = sys.argv[1]
+outpath = sys.argv[2]
+argpaths = sys.argv[3:]
+
+with open(inpath, 'r') as infile, open(outpath, 'w') as outfile:
+  data = {}
+  for argpath in argpaths:
+    with open(argpath, 'r') as argfile:
+      data.update(json.load(argfile))
+
+  s =  Template(infile.read()).substitute(data)
+  outfile.write(s)

build/node.gni

@@ -0,0 +1,21 @@
+template("node_action") {
+  assert(defined(invoker.script), "Need script path to run")
+  assert(defined(invoker.args), "Need script argumets")
+
+  action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                             "sources",
+                             "inputs",
+                             "outputs",
+                           ])
+    if (!defined(inputs)) {
+      inputs = []
+    }
+    inputs += [ invoker.script ]
+    script = "//electron/build/run-node.py"
+    args = [ rebase_path(invoker.script) ] + invoker.args
+  }
+}

build/npm-run.py

@@ -1,10 +1,19 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import os
+import subprocess
 import sys
 
 SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
-args = ["npm", "run",
+cmd = "npm"
+if sys.platform == "win32":
+    cmd += ".cmd"
+args = [cmd, "run",
     "--prefix",
     SOURCE_ROOT
     ] + sys.argv[1:]
-os.execvp("npm", args)
+try:
+    subprocess.check_output(args, stderr=subprocess.STDOUT)
+except subprocess.CalledProcessError as e:
+    print("NPM script '" + sys.argv[2] + "' failed with code '" + str(e.returncode) + "':\n" + e.output)
+    sys.exit(e.returncode)

build/npm.gni

@@ -3,6 +3,26 @@ template("npm_action") {
          "Need script name to run (must be defined in package.json)")
   assert(defined(invoker.args), "Need script argumets")
 
+  action("npm_pre_flight_" + target_name) {
+    inputs = [
+      "package.json",
+      "yarn.lock",
+    ]
+    script = "//electron/build/npm-run.py"
+
+    outputs = [
+      "$target_gen_dir/npm_pre_stamps/" + target_name + ".stamp",
+    ]
+
+    args = [
+      "--silent",
+      "pre-flight",
+      "--",
+      "--stamp",
+      rebase_path(outputs[0]),
+    ]
+  }
+
   action(target_name) {
     forward_variables_from(invoker,
                            [
@@ -12,6 +32,11 @@ template("npm_action") {
                              "inputs",
                              "outputs",
                            ])
+    if (!defined(deps)) {
+      deps = []
+    }
+    deps += [ ":npm_pre_flight_" + target_name ]
+
     script = "//electron/build/npm-run.py"
     args = [
              "--silent",

build/run-node.py

@@ -0,0 +1,14 @@
+import os
+import subprocess
+import sys
+
+
+SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
+
+def main():
+  # Proxy all args to node script
+  script = os.path.join(SOURCE_ROOT, sys.argv[1])
+  subprocess.check_call(['node', script] + [str(x) for x in sys.argv[2:]])
+
+if __name__ == '__main__':
+  sys.exit(main())

build/templated_file.gni

@@ -0,0 +1,39 @@
+template("templated_file") {
+  assert(defined(invoker.template), "Need template file to run")
+  assert(defined(invoker.output), "Need output file to run")
+
+  if (defined(invoker.values)) {
+    args_path = "$target_gen_dir/$target_name.args"
+    write_file(args_path, invoker.values, "json")
+  }
+
+  action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                             "inputs",
+                             "outputs",
+                           ])
+    inputs = [
+      invoker.template,
+    ]
+    outputs = [
+      invoker.output,
+    ]
+    script = "//electron/build/generate-template.py"
+    args = [
+      rebase_path(invoker.template),
+      rebase_path(invoker.output),
+    ]
+
+    if (defined(invoker.values)) {
+      args += rebase_path(args_path)
+    }
+
+    if (defined(invoker.args_files)) {
+      args += rebase_path(invoker.args_files)
+      inputs += invoker.args_files
+    }
+  }
+}

build/templates/electron_version.tmpl

@@ -0,0 +1,23 @@
+// Copyright (c) 2019 Slack Technologies, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ELECTRON_ELECTRON_VERSION_H
+#define ELECTRON_ELECTRON_VERSION_H
+
+#define ELECTRON_MAJOR_VERSION $major
+#define ELECTRON_MINOR_VERSION $minor
+#define ELECTRON_PATCH_VERSION $patch
+#if $has_prerelease
+#define ELECTRON_PRE_RELEASE_VERSION -$prerelease
+#endif
+
+#ifndef ELECTRON_PRE_RELEASE_VERSION
+#define ELECTRON_VERSION_STRING "$major.$minor.$patch"
+#else
+#define ELECTRON_VERSION_STRING "$major.$minor.$patch-$prerelease"
+#endif
+
+#define ELECTRON_VERSION "v" ELECTRON_VERSION_STRING
+
+#endif  // ELECTRON_ELECTRON_VERSION_H

build/tsc.gni

@@ -0,0 +1,53 @@
+import("npm.gni")
+
+template("typescript_build") {
+  assert(defined(invoker.tsconfig), "Need tsconfig name to run")
+  assert(defined(invoker.sources), "Need tsc sources to run")
+  assert(defined(invoker.output_dir_name),
+         "Need output_dir_name to run, should be 'lib' or other top level dir")
+  assert(defined(invoker.output_gen_dir),
+         "Need output_gen_dir to run, should be relative to the root gen dir")
+
+  npm_action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                             "outputs",
+                           ])
+    script = "tsc"
+
+    sources = invoker.sources
+    inputs = [
+      invoker.tsconfig,
+      "//electron/tsconfig.json",
+      "//electron/yarn.lock",
+      "//electron/typings/internal-ambient.d.ts",
+      "//electron/typings/internal-electron.d.ts",
+      "//electron/typings/internal-helpers.d.ts",
+    ]
+
+    type_roots = "node_modules/@types,typings"
+    if (defined(invoker.type_root)) {
+      type_roots += "," + invoker.type_root
+    }
+
+    base_out_path = invoker.output_gen_dir + "/electron/"
+    args = [
+      "-p",
+      rebase_path(invoker.tsconfig),
+      "--outDir",
+      rebase_path("$base_out_path" + invoker.output_dir_name),
+      "--typeRoots",
+      type_roots,
+    ]
+
+    outputs = []
+
+    foreach(invoker_source, invoker.sources) {
+      # The output of TSC is all inputs but with JS instead of TS as the extension
+      outputs += [ "$base_out_path" + get_path_info(invoker_source, "dir") +
+                   "/" + get_path_info(invoker_source, "name") + ".js" ]
+    }
+  }
+}

build/webpack/get-outputs.js

@@ -0,0 +1,2 @@
+process.env.PRINT_WEBPACK_GRAPH = true
+require('./run-compiler')

build/webpack/run-compiler.js

@@ -0,0 +1,22 @@
+const path = require('path')
+const webpack = require('webpack')
+
+const configPath = process.argv[2]
+const outPath = path.resolve(process.argv[3])
+const config = require(configPath)
+config.output = {
+  path: path.dirname(outPath),
+  filename: path.basename(outPath)
+}
+
+webpack(config, (err, stats) => {
+  if (err) {
+    console.error(err)
+    process.exit(1)
+  } else if (stats.hasErrors()) {
+    console.error(stats.toString('normal'))
+    process.exit(1)
+  } else {
+    process.exit(0)
+  }
+})

build/webpack/webpack.config.base.js

@@ -0,0 +1,80 @@
+const fs = require('fs')
+const path = require('path')
+const webpack = require('webpack')
+
+const electronRoot = path.resolve(__dirname, '../..')
+
+const onlyPrintingGraph = !!process.env.PRINT_WEBPACK_GRAPH
+
+class AccessDependenciesPlugin {
+  apply(compiler) {
+    // Only hook into webpack when we are printing the dependency graph
+    if (!onlyPrintingGraph) return
+
+    compiler.hooks.compilation.tap('AccessDependenciesPlugin', compilation => {
+      compilation.hooks.finishModules.tap('AccessDependenciesPlugin', modules => {
+        const filePaths = modules.map(m => m.resource).filter(p => p).map(p => path.relative(electronRoot, p))
+        console.info(JSON.stringify(filePaths))
+      })
+    })
+  }
+}
+
+module.exports = ({
+  alwaysHasNode,
+  loadElectronFromAlternateTarget,
+  targetDeletesNodeGlobals,
+  target
+}) => {
+  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts')
+  if (!fs.existsSync(entry)) {
+    entry = path.resolve(electronRoot, 'lib', target, 'init.js')
+  }
+
+  return ({
+    mode: 'development',
+    devtool: 'inline-source-map',
+    entry,
+    target: alwaysHasNode ? 'node' : 'web',
+    output: {
+      filename: `${target}.bundle.js`
+    },
+    resolve: {
+      alias: {
+        '@electron/internal': path.resolve(electronRoot, 'lib'),
+        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.js'),
+        // Force timers to resolve to our dependency that doens't use window.postMessage
+        'timers': path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
+      },
+      extensions: ['.ts', '.js']
+    },
+    module: {
+      rules: [{
+        test: /\.ts$/,
+        loader: 'ts-loader',
+        options: {
+          configFile: path.resolve(electronRoot, 'tsconfig.electron.json'),
+          transpileOnly: onlyPrintingGraph,
+          ignoreDiagnostics: [6059]
+        }
+      }]
+    },
+    node: {
+      __dirname: false,
+      __filename: false,
+      // We provide our own "timers" import above, any usage of setImmediate inside
+      // one of our renderer bundles should import it from the 'timers' package
+      setImmediate: false,
+    },
+    plugins: [
+      new AccessDependenciesPlugin(),
+      ...(targetDeletesNodeGlobals ? [
+        new webpack.ProvidePlugin({
+          process: ['@electron/internal/renderer/webpack-provider', 'process'],
+          global: ['@electron/internal/renderer/webpack-provider', '_global'],
+          Buffer: ['@electron/internal/renderer/webpack-provider', 'Buffer'],
+        })
+      ] : [])
+    ]
+  })
+}

build/webpack/webpack.config.browser.js

@@ -0,0 +1,4 @@
+module.exports = require('./webpack.config.base')({
+  target: 'browser',
+  alwaysHasNode: true
+})

build/webpack/webpack.config.content_script.js

@@ -0,0 +1,4 @@
+module.exports = require('./webpack.config.base')({
+  target: 'content_script',
+  alwaysHasNode: false
+})

build/webpack/webpack.config.isolated_renderer.js

@@ -0,0 +1,4 @@
+module.exports = require('./webpack.config.base')({
+  target: 'isolated_renderer',
+  alwaysHasNode: false
+})

build/webpack/webpack.config.renderer.js

@@ -0,0 +1,5 @@
+module.exports = require('./webpack.config.base')({
+  target: 'renderer',
+  alwaysHasNode: true,
+  targetDeletesNodeGlobals: true
+})

build/webpack/webpack.config.sandboxed_renderer.js

@@ -0,0 +1,4 @@
+module.exports = require('./webpack.config.base')({
+  target: 'sandboxed_renderer',
+  alwaysHasNode: false
+})

build/webpack/webpack.config.worker.js

@@ -0,0 +1,6 @@
+module.exports = require('./webpack.config.base')({
+  target: 'worker',
+  loadElectronFromAlternateTarget: 'renderer',
+  alwaysHasNode: true,
+  targetDeletesNodeGlobals: true
+})

build/webpack/webpack.gni

@@ -0,0 +1,35 @@
+import("../npm.gni")
+
+template("webpack_build") {
+  assert(defined(invoker.config_file), "Need webpack config file to run")
+  assert(defined(invoker.out_file), "Need output file to run")
+  assert(defined(invoker.inputs), "Need webpack inputs to run")
+
+  npm_action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                           ])
+    script = "webpack"
+
+    inputs = [
+               invoker.config_file,
+               "//electron/build/webpack/webpack.config.base.js",
+               "//electron/tsconfig.json",
+               "//electron/yarn.lock",
+               "//electron/typings/internal-ambient.d.ts",
+               "//electron/typings/internal-electron.d.ts",
+               "//electron/typings/internal-helpers.d.ts",
+             ] + invoker.inputs
+
+    args = [
+      rebase_path(invoker.config_file),
+      rebase_path(invoker.out_file),
+    ]
+
+    outputs = [
+      invoker.out_file,
+    ]
+  }
+}

build/zip.py

@@ -1,17 +1,20 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import os
 import subprocess
 import sys
 import zipfile
 
 EXTENSIONS_TO_SKIP = [
-  '.pdb'
+  '.pdb',
+  '.mojom.js',
+  '.mojom-lite.js',
 ]
 
 PATHS_TO_SKIP = [
   'angledata', #Skipping because it is an output of //ui/gl that we don't need
-  './libVkLayer_', #Skipping because these are outputs that we don't need
-  './VkLayerLayer_', #Skipping because these are outputs 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
 
   # //chrome/browser:resources depends on this via
   # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
@@ -39,7 +42,7 @@ def execute(argv):
     output = subprocess.check_output(argv, stderr=subprocess.STDOUT)
     return output
   except subprocess.CalledProcessError as e:
-    print e.output
+    print(e.output)
     raise e
 
 def main(argv):
@@ -52,7 +55,7 @@ def main(argv):
   if sys.platform == 'darwin':
     execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
   else:
-    with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED) as z:
+    with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z:
       for dep in dist_files:
         if skip_path(dep, dist_zip, target_cpu):
           continue
@@ -61,7 +64,10 @@ def main(argv):
             for file in files:
               z.write(os.path.join(root, file))
         else:
-          z.write(dep)
+          basename = os.path.basename(dep)
+          dirname = os.path.dirname(dep)
+          arcname = os.path.join(dirname, 'chrome-sandbox') if basename == 'chrome_sandbox' else dep
+          z.write(dep, arcname)
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))

buildflags/buildflags.gni

@@ -8,7 +8,7 @@ declare_args() {
   # Allow running Electron as a node binary.
   enable_run_as_node = true
 
-  enable_osr = false
+  enable_osr = true
 
   enable_view_api = false
 

chromium_src/BUILD.gn

@@ -33,27 +33,29 @@ static_library("chrome") {
     "//chrome/browser/icon_manager.h",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
-    "//chrome/browser/net/chrome_net_log_helper.cc",
-    "//chrome/browser/net/chrome_net_log_helper.h",
     "//chrome/browser/net/proxy_config_monitor.cc",
     "//chrome/browser/net/proxy_config_monitor.h",
     "//chrome/browser/net/proxy_service_factory.cc",
     "//chrome/browser/net/proxy_service_factory.h",
     "//chrome/browser/ssl/security_state_tab_helper.cc",
     "//chrome/browser/ssl/security_state_tab_helper.h",
+    "//chrome/browser/ui/autofill/popup_view_common.cc",
+    "//chrome/browser/ui/autofill/popup_view_common.h",
     "//chrome/browser/win/chrome_process_finder.cc",
     "//chrome/browser/win/chrome_process_finder.h",
     "//extensions/browser/app_window/size_constraints.cc",
     "//extensions/browser/app_window/size_constraints.h",
   ]
   public_deps = [
-    "//content/public/browser",
-  ]
-  deps = [
     "//chrome/common",
+    "//chrome/common:version_header",
     "//components/keyed_service/content",
     "//components/proxy_config",
     "//components/security_state/content",
+    "//content/public/browser",
+  ]
+  deps = [
+    "//components/feature_engagement:buildflags",
   ]
 
   if (is_linux) {
@@ -82,6 +84,7 @@ static_library("chrome") {
       "//chrome/browser/platform_util.cc",
       "//chrome/browser/platform_util.h",
       "//chrome/browser/ui/browser_dialogs.h",
+      "//chrome/browser/ui/color_chooser.h",
     ]
 
     if (use_aura) {
@@ -153,14 +156,16 @@ static_library("chrome") {
       "//chrome/browser/printing/printing_message_filter.cc",
       "//chrome/browser/printing/printing_message_filter.h",
     ]
-    deps += [
+    public_deps += [
       "//chrome/services/printing:lib",
       "//components/printing/browser",
-      "//components/printing/common",
       "//components/printing/renderer",
-      "//components/services/pdf_compositor",
       "//components/services/pdf_compositor/public/cpp:factory",
       "//components/services/pdf_compositor/public/interfaces",
+    ]
+    deps += [
+      "//components/printing/common",
+      "//components/services/pdf_compositor",
       "//printing",
     ]
 

chromium_src/chrome/browser/certificate_manager_model.cc

@@ -28,7 +28,7 @@ net::NSSCertDatabase* g_nss_cert_database = nullptr;
 
 net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
     content::ResourceContext* context,
-    const base::Callback<void(net::NSSCertDatabase*)>& callback) {
+    base::OnceCallback<void(net::NSSCertDatabase*)> callback) {
   // This initialization is not thread safe. This CHECK ensures that this code
   // is only run on a single thread.
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
@@ -75,8 +75,8 @@ void CertificateManagerModel::Create(content::BrowserContext* browser_context,
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::IO},
-      base::Bind(&CertificateManagerModel::GetCertDBOnIOThread,
-                 browser_context->GetResourceContext(), callback));
+      base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
+                     browser_context->GetResourceContext(), callback));
 }
 
 CertificateManagerModel::CertificateManagerModel(
@@ -148,8 +148,8 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
   bool is_user_db_available = !!cert_db->GetPublicSlot();
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::UI},
-      base::Bind(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
-                 is_user_db_available, callback));
+      base::BindOnce(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
+                     is_user_db_available, callback));
 }
 
 // static
@@ -158,8 +158,8 @@ void CertificateManagerModel::GetCertDBOnIOThread(
     const CreationCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
-      context,
-      base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread, callback));
+      context, base::BindOnce(&CertificateManagerModel::DidGetCertDBOnIOThread,
+                              callback));
   if (cert_db)
     DidGetCertDBOnIOThread(callback, cert_db);
 }

chromium_src/chrome/browser/process_singleton.h

@@ -58,9 +58,9 @@ class ProcessSingleton {
   // Chrome process was launched. Return true if the command line will be
   // handled within the current browser instance or false if the remote process
   // should handle it (i.e., because the current process is shutting down).
-  using NotificationCallback =
-      base::Callback<bool(const base::CommandLine::StringVector& command_line,
-                          const base::FilePath& current_directory)>;
+  using NotificationCallback = base::RepeatingCallback<bool(
+      const base::CommandLine::StringVector& command_line,
+      const base::FilePath& current_directory)>;
 
   ProcessSingleton(const base::FilePath& user_data_dir,
                    const NotificationCallback& notification_callback);
@@ -94,7 +94,7 @@ class ProcessSingleton {
 #if defined(OS_WIN)
   // Called to query whether to kill a hung browser process that has visible
   // windows. Return true to allow killing the hung process.
-  using ShouldKillRemoteProcessCallback = base::Callback<bool()>;
+  using ShouldKillRemoteProcessCallback = base::RepeatingCallback<bool()>;
   void OverrideShouldKillRemoteProcessCallbackForTesting(
       const ShouldKillRemoteProcessCallback& display_dialog_callback);
 #endif
@@ -120,7 +120,7 @@ class ProcessSingleton {
       const base::TimeDelta& timeout);
   void OverrideCurrentPidForTesting(base::ProcessId pid);
   void OverrideKillCallbackForTesting(
-      const base::Callback<void(int)>& callback);
+      const base::RepeatingCallback<void(int)>& callback);
 #endif
 
  private:

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -55,8 +55,8 @@
 
 #include <stddef.h>
 
-#include "atom/browser/browser.h"
-#include "atom/common/atom_command_line.h"
+#include "shell/browser/browser.h"
+#include "shell/common/atom_command_line.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ -482,8 +482,8 @@ class ProcessSingleton::LinuxWatcher
       DCHECK_CURRENTLY_ON(BrowserThread::IO);
       // Wait for reads.
       fd_watch_controller_ = base::FileDescriptorWatcher::WatchReadable(
-          fd, base::Bind(&SocketReader::OnSocketCanReadWithoutBlocking,
-                         base::Unretained(this)));
+          fd, base::BindRepeating(&SocketReader::OnSocketCanReadWithoutBlocking,
+                                  base::Unretained(this)));
       // If we haven't completed in a reasonable amount of time, give up.
       timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeoutInSeconds),
                    this, &SocketReader::CleanupAndDeleteSelf);
@@ -592,8 +592,8 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Watch for client connections on this socket.
   socket_watcher_ = base::FileDescriptorWatcher::WatchReadable(
-      socket, base::Bind(&LinuxWatcher::OnSocketCanReadWithoutBlocking,
-                         base::Unretained(this), socket));
+      socket, base::BindRepeating(&LinuxWatcher::OnSocketCanReadWithoutBlocking,
+                                  base::Unretained(this), socket));
 }
 
 void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -686,8 +686,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
 
   // Return to the UI thread to handle opening a new browser tab.
   ui_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&ProcessSingleton::LinuxWatcher::HandleMessage,
-                            parent_, current_dir, tokens, this));
+      FROM_HERE, base::BindOnce(&ProcessSingleton::LinuxWatcher::HandleMessage,
+                                parent_, current_dir, tokens, this));
   fd_watch_controller_.reset();
 
   // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
@@ -707,8 +707,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
 
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::IO},
-      base::Bind(&ProcessSingleton::LinuxWatcher::RemoveSocketReader, parent_,
-                 this));
+      base::BindOnce(&ProcessSingleton::LinuxWatcher::RemoveSocketReader,
+                     parent_, this));
   // We will be deleted once the posted RemoveSocketReader task runs.
 }
 
@@ -728,8 +728,8 @@ ProcessSingleton::ProcessSingleton(
   lock_path_ = user_data_dir.Append(kSingletonLockFilename);
   cookie_path_ = user_data_dir.Append(kSingletonCookieFilename);
 
-  kill_callback_ =
-      base::Bind(&ProcessSingleton::KillProcess, base::Unretained(this));
+  kill_callback_ = base::BindRepeating(&ProcessSingleton::KillProcess,
+                                       base::Unretained(this));
 }
 
 ProcessSingleton::~ProcessSingleton() {
@@ -827,7 +827,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
     return PROCESS_NONE;
   to_send.append(current_dir.value());
 
-  const std::vector<std::string>& argv = atom::AtomCommandLine::argv();
+  const std::vector<std::string>& argv = electron::AtomCommandLine::argv();
   for (std::vector<std::string>::const_iterator it = argv.begin();
        it != argv.end(); ++it) {
     to_send.push_back(kTokenDelimiter);
@@ -887,8 +887,8 @@ void ProcessSingleton::StartListeningOnSocket() {
   watcher_ = new LinuxWatcher(this);
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::IO},
-      base::Bind(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
-                 sock_));
+      base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
+                     sock_));
 }
 
 void ProcessSingleton::OnBrowserReady() {
@@ -950,7 +950,7 @@ void ProcessSingleton::OverrideCurrentPidForTesting(base::ProcessId pid) {
 }
 
 void ProcessSingleton::OverrideKillCallbackForTesting(
-    const base::Callback<void(int)>& callback) {
+    const base::RepeatingCallback<void(int)>& callback) {
   kill_callback_ = callback;
 }
 

chromium_src/chrome/browser/process_singleton_win.cc

@@ -176,7 +176,8 @@ ProcessSingleton::ProcessSingleton(
       is_virtualized_(false),
       lock_file_(INVALID_HANDLE_VALUE),
       user_data_dir_(user_data_dir),
-      should_kill_remote_process_callback_(base::Bind(&TerminateAppWithError)) {
+      should_kill_remote_process_callback_(
+          base::BindRepeating(&TerminateAppWithError)) {
   // The user_data_dir may have not been created yet.
   base::CreateDirectoryAndGetError(user_data_dir, nullptr);
 }
@@ -290,9 +291,10 @@ bool ProcessSingleton::Create() {
       if (lock_file_ != INVALID_HANDLE_VALUE) {
         // Set the window's title to the path of our user data directory so
         // other Chrome instances can decide if they should forward to us.
-        bool result = window_.CreateNamed(
-            base::Bind(&ProcessLaunchNotification, notification_callback_),
-            user_data_dir_.value());
+        bool result =
+            window_.CreateNamed(base::BindRepeating(&ProcessLaunchNotification,
+                                                    notification_callback_),
+                                user_data_dir_.value());
 
         // NB: Ensure that if the primary app gets started as elevated
         // admin inadvertently, secondary windows running not as elevated