Bump empty commit

Backport fixes to 1.6

.circleci/config.yml

@@ -1,446 +0,0 @@
-
-version: 2
-jobs:
-  electron-linux-arm:
-    docker:
-      - image: electronbuilds/electron:0.0.4
-        environment:
-          TARGET_ARCH: arm
-    resource_class: 2xlarge
-    steps:
-      - checkout
-      - run:
-          name: Check for release
-          command: |
-            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-              echo 'release build triggered from api'
-              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-            fi
-      - run:
-         name: Bootstrap
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Bootstrapping Electron for release build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH
-           else
-              echo 'Bootstrapping Electron for debug build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-           fi
-      - run: npm run lint
-      - run:
-         name: Build
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Building Electron for release'
-              script/build.py -c R
-           else
-              echo 'Building Electron for debug'
-              script/build.py -c D
-           fi
-      - run:
-          name: Create distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ]; then
-                echo 'Creating Electron release distribution'
-                script/create-dist.py
-             else
-                echo 'Skipping create distribution because build is not for release'
-             fi
-      - run:
-          name: Upload distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-                echo 'Uploading Electron release distribution to github releases'
-                script/upload.py
-             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-                echo 'Uploading Electron release distribution to s3'
-                script/upload.py --upload_to_s3
-             else
-                echo 'Skipping upload distribution because build is not for release'
-             fi
-      - run:
-          name: Zip out directory
-          command: |
-            if [ "$ELECTRON_RELEASE" != "1" ]; then
-              zip -r electron.zip out/D
-            fi
-      - persist_to_workspace:
-          root: /home/builduser
-          paths:
-            - project/out
-      - store_artifacts:
-          path: electron.zip
-  electron-linux-arm-test:
-    machine: true
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run:
-          name: Test in ARM docker container
-          command: |
-            if [ "$ELECTRON_RELEASE" != "1" ]; then
-              docker run --rm --privileged multiarch/qemu-user-static:register --reset
-              docker run -it \
-              --mount type=bind,source=/tmp/workspace,target=/tmp/workspace \
-              --rm electronbuilds/electronarm7:0.0.4 > version.txt
-              cat version.txt
-              if grep -q `script/get-version.py` version.txt; then
-                echo "Versions match"
-              else
-                echo "Versions do not match"
-                exit 1
-              fi
-            else
-              echo "Skipping test for release build"
-            fi
-  electron-linux-arm64:
-    docker:
-      - image: electronbuilds/electron:0.0.4
-        environment:
-          TARGET_ARCH: arm64
-    resource_class: 2xlarge
-    steps:
-      - checkout
-      - run:
-          name: Check for release
-          command: |
-            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-              echo 'release build triggered from api'
-              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-            fi
-      - run:
-         name: Bootstrap
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Bootstrapping Electron for release build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH
-           else
-              echo 'Bootstrapping Electron for debug build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-           fi
-      - run: npm run lint
-      - run:
-         name: Build
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Building Electron for release'
-              script/build.py -c R
-           else
-              echo 'Building Electron for debug'
-              script/build.py -c D
-           fi
-      - run:
-          name: Create distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ]; then
-                echo 'Creating Electron release distribution'
-                script/create-dist.py
-             else
-                echo 'Skipping create distribution because build is not for release'
-             fi
-      - run:
-          name: Upload distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-                echo 'Uploading Electron release distribution to github releases'
-                script/upload.py
-             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-                echo 'Uploading Electron release distribution to s3'
-                script/upload.py --upload_to_s3
-             else
-                echo 'Skipping upload distribution because build is not for release'
-             fi
-      - run:
-          name: Zip out directory
-          command: |
-            if [ "$ELECTRON_RELEASE" != "1" ]; then
-              zip -r electron.zip out/D
-            fi
-      - persist_to_workspace:
-          root: /home/builduser
-          paths:
-            - project/out
-      - store_artifacts:
-          path: electron.zip
-  electron-linux-arm64-test:
-    machine: true
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run:
-          name: Test in ARM64 docker container
-          command: |
-            if [ "$ELECTRON_RELEASE" != "1" ]; then
-              docker run --rm --privileged multiarch/qemu-user-static:register --reset
-              docker run -it \
-              --mount type=bind,source=/tmp/workspace,target=/tmp/workspace \
-              --rm electronbuilds/electronarm64:0.0.5 > version.txt
-              cat version.txt
-              if grep -q `script/get-version.py` version.txt; then
-                echo "Versions match"
-              else
-                echo "Versions do not match"
-                exit 1
-              fi
-            else
-              echo "Skipping test for release build"
-            fi
-  electron-linux-ia32:
-    docker:
-      - image: electronbuilds/electron:0.0.4
-        environment:
-          TARGET_ARCH: ia32
-          DISPLAY: ':99.0'
-    resource_class: xlarge
-    steps:
-      - checkout
-      - run:
-          name: Setup for headless testing
-          command: sh -e /etc/init.d/xvfb start
-      - run:
-          name: Check for release
-          command: |
-            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-              echo 'release build triggered from api'
-              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-            fi
-      - run:
-         name: Bootstrap
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Bootstrapping Electron for release build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH
-           else
-              echo 'Bootstrapping Electron for debug build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-           fi
-      - run: npm run lint
-      - run:
-         name: Build
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Building Electron for release'
-              script/build.py -c R
-           else
-              echo 'Building Electron for debug'
-              script/build.py -c D
-           fi
-      - run:
-          name: Create distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ]; then
-                echo 'Creating Electron release distribution'
-                script/create-dist.py
-             else
-                echo 'Skipping create distribution because build is not for release'
-             fi
-      - run:
-          name: Upload distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-                echo 'Uploading Electron release distribution to github releases'
-                script/upload.py
-             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-                echo 'Uploading Electron release distribution to s3'
-                script/upload.py --upload_to_s3
-             else
-                echo 'Skipping upload distribution because build is not for release'
-             fi
-      - run:
-          name: Test
-          environment:
-            MOCHA_FILE: junit/test-results.xml
-            MOCHA_REPORTER: mocha-junit-reporter
-          command: |
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-                echo 'Testing Electron debug build'
-                out/D/electron --version
-                mkdir junit
-                script/test.py --ci --rebuild_native_modules
-             else
-                echo 'Skipping testing on release build'
-             fi
-      - run:
-          name: Verify FFmpeg
-          command: |
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-                echo 'Verifying ffmpeg on debug build'
-                script/verify-ffmpeg.py
-             else
-                echo 'Skipping verify ffmpeg on release build'
-             fi
-  electron-linux-mips64el:
-    docker:
-      - image: electronbuilds/electron:0.0.4
-        environment:
-          TARGET_ARCH: mips64el
-    resource_class: xlarge
-    steps:
-      - checkout
-      - run:
-          name: Check for release
-          command: |
-            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-              echo 'release build triggered from api'
-              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-            fi
-      - run:
-         name: Bootstrap
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Bootstrapping Electron for release build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH
-           else
-              echo 'Bootstrapping Electron for debug build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-           fi
-      - run: npm run lint
-      - run:
-         name: Build
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Building Electron for release'
-              script/build.py -c R
-           else
-              echo 'Building Electron for debug'
-              script/build.py -c D
-           fi
-      - run:
-          name: Create distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ]; then
-                echo 'Creating Electron release distribution'
-                script/create-dist.py
-             else
-                echo 'Skipping create distribution because build is not for release'
-             fi
-      - run:
-          name: Upload distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-                echo 'Uploading Electron release distribution to github releases'
-                script/upload.py
-             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-                echo 'Uploading Electron release distribution to s3'
-                script/upload.py --upload_to_s3
-             else
-                echo 'Skipping upload distribution because build is not for release'
-             fi
-
-  electron-linux-x64:
-    docker:
-      - image: electronbuilds/electron:0.0.4
-        environment:
-          TARGET_ARCH: x64
-          DISPLAY: ':99.0'
-    resource_class: xlarge
-    steps:
-      - checkout
-      - run:
-          name: Setup for headless testing
-          command: sh -e /etc/init.d/xvfb start
-      - run:
-          name: Check for release
-          command: |
-            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-              echo 'release build triggered from api'
-              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-            fi
-      - run:
-         name: Bootstrap
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Bootstrapping Electron for release build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH
-           else
-              echo 'Bootstrapping Electron for debug build'
-              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-           fi
-      - run: npm run lint
-      - run:
-         name: Build
-         command: |
-           if [ "$ELECTRON_RELEASE" == "1" ]; then
-              echo 'Building Electron for release'
-              script/build.py -c R
-           else
-              echo 'Building Electron for debug'
-              script/build.py -c D
-           fi
-      - run:
-          name: Create distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ]; then
-                echo 'Creating Electron release distribution'
-                script/create-dist.py
-             else
-                echo 'Skipping create distribution because build is not for release'
-             fi
-      - run:
-          name: Upload distribution
-          command: |
-             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-                echo 'Uploading Electron release distribution to github releases'
-                script/upload.py
-             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-                echo 'Uploading Electron release distribution to s3'
-                script/upload.py --upload_to_s3
-             else
-                echo 'Skipping upload distribution because build is not for release'
-             fi
-      - run:
-          name: Test
-          environment:
-            MOCHA_FILE: junit/test-results.xml
-            MOCHA_REPORTER: mocha-junit-reporter
-          command: |
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-                echo 'Testing Electron debug build'
-                mkdir junit
-                script/test.py --ci --rebuild_native_modules
-             else
-                echo 'Skipping testing on release build'
-             fi
-      - run:
-          name: Verify FFmpeg
-          command: |
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-                echo 'Verifying ffmpeg on debug build'
-                script/verify-ffmpeg.py
-             else
-                echo 'Skipping verify ffmpeg on release build'
-             fi
-      - run:
-          name: Generate Typescript Definitions
-          command: npm run create-typescript-definitions
-      - store_test_results:
-          path: junit
-      - store_artifacts:
-          path: junit
-      - store_artifacts:
-          path: out/electron.d.ts
-      - store_artifacts:
-          path: out/electron-api.json
-
-workflows:
-  version: 2
-  build-arm:
-    jobs:
-      - electron-linux-arm
-      - electron-linux-arm-test:
-          requires:
-            - electron-linux-arm
-  build-arm64:
-    jobs:
-      - electron-linux-arm64
-      - electron-linux-arm64-test:
-          requires:
-            - electron-linux-arm64
-  build-ia32:
-    jobs:
-      - electron-linux-ia32
-  build-x64:
-   jobs:
-     - electron-linux-x64

.dockerignore

@@ -1,3 +0,0 @@
-*
-!tools/xvfb-init.sh
-!tools/run-electron.sh

.github/CODEOWNERS

@@ -1,21 +0,0 @@
-# Order is important. The LAST matching pattern has the MOST precedence.
-# gitignore style patterns are used, not globs.
-# https://help.github.com/articles/about-codeowners
-# https://git-scm.com/docs/gitignore
-
-# Everything that falls through the cracks:
-* @electron/reviewers
-
-# filename patterns
-*browser_view* @electron/browserview
-*notification* @electron/notifications
-*pdf* @electron/printing
-*printing* @electron/printing
-*updater* @electron/updater
-
-# directories
-/.github/ @electron/hubbers
-/default_app/ @electron/docs
-/docs/ @electron/docs
-/docs-translations/ @electron/i18n
-/npm/ @electron/hubbers

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +0,0 @@
-<!--
-Thank you for your Pull Request. Please provide a description above and review
-the requirements below.
-
-Bug fixes and new features should include tests and possibly benchmarks.
-
-Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTING.md
--->

.github/config.yml

@@ -1,31 +0,0 @@
-# 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#submitting-issues).
-
-# 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! 💖
-
-  ![typing cat](https://user-images.githubusercontent.com/2289/36400158-2c7c589e-1584-11e8-81c7-bd34fd3c392b.gif)
-
-  Here is a list of things that will help get it across the finish line:
-  - Follow the JavaScript, C++, and Python [coding style](https://github.com/electron/electron/blob/master/docs/development/coding-style.md).
-  - Run `npm run lint` locally to catch formatting errors earlier.
-  - Document any user-facing changes you've made following the [documentation styleguide](https://github.com/electron/electron/blob/master/docs/styleguide.md).
-  - Include tests when adding/changing behavior.
-  - Include screenshots and animated GIFs whenever possible.
-  We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can.
-
-# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
-
-# Comment to be posted to on pull requests merged by a first time user
-firstPRMergeComment: >
-  Congrats on merging your first pull request! 🎉🎉🎉
-
-# It is recommend to include as many gifs and emojis as possible

.github/stale.yml

@@ -1,25 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 45
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-   - fixme/bug
-   - fixme/crash
-   - fixme/regression
-   - fixme/security
-   - blocked
-   - blocking-stable
-   - needs-review
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity and is not currently prioritized. It will be closed
-  in a week if no further activity occurs :)
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: >
-  If you still think this issue is relevant, please ping a maintainer or
-  leave a comment!

.gitignore

@@ -1,48 +1,29 @@
 .DS_Store
-.env
-.gclient_done
-**/.npmrc
 .tags*
-.vs/
-.vscode/
-*.log
-*.pyc
-*.sln
-*.swp
-*.VC.db
-*.VC.VC.opendb
-*.vcxproj
-*.vcxproj.filters
-*.vcxproj.user
-*.xcodeproj
 /.idea/
-/brightray/brightray.opensdf
-/brightray/brightray.sdf
-/brightray/brightray.sln
-/brightray/brightray.suo
-/brightray/brightray.v12.suo
-/brightray/brightray.vcxproj*
-/brightray/brightray.xcodeproj/
 /build/
 /dist/
 /external_binaries/
 /out/
-/vendor/.gclient
-/vendor/debian_jessie_amd64-sysroot/
-/vendor/debian_jessie_arm-sysroot/
-/vendor/debian_jessie_arm64-sysroot/
-/vendor/debian_jessie_i386-sysroot/
-/vendor/debian_jessie_mips64-sysroot/
+/vendor/brightray/vendor/download/
 /vendor/debian_wheezy_amd64-sysroot/
 /vendor/debian_wheezy_arm-sysroot/
 /vendor/debian_wheezy_i386-sysroot/
-/vendor/gcc-4.8.3-d197-n64-loongson/
-/vendor/readme-gcc483-loongson.txt
-/vendor/download/
-/vendor/llvm-build/
-/vendor/llvm/
-/vendor/npm/
 /vendor/python_26/
+/vendor/npm/
+/vendor/llvm/
+/vendor/llvm-build/
+/vendor/.gclient
 node_modules/
-SHASUMS256.txt
-**/package-lock.json
+*.xcodeproj
+*.swp
+*.pyc
+*.VC.db
+*.VC.VC.opendb
+.vs/
+.vscode/
+*.vcxproj
+*.vcxproj.user
+*.vcxproj.filters
+*.sln
+*.log

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "vendor/brightray"]
+	path = vendor/brightray
+	url = https://github.com/electron/brightray.git
 [submodule "vendor/node"]
 	path = vendor/node
 	url = https://github.com/electron/node.git
@@ -22,9 +25,3 @@
 [submodule "vendor/pdf_viewer"]
 	path = vendor/pdf_viewer
 	url = https://github.com/electron/pdf-viewer.git
-[submodule "vendor/gyp"]
-	path = vendor/gyp
-	url = https://github.com/electron/gyp
-[submodule "vendor/libchromiumcontent"]
-	path = vendor/libchromiumcontent
-	url = https://github.com/electron/libchromiumcontent

.node-version

@@ -1 +1 @@
-v8.2.1
+v7.4.0

.remarkrc

@@ -1,6 +0,0 @@
-{
-  "plugins": [
-    ["remark-lint-code-block-style", "fenced"],
-    ["remark-lint-fenced-code-flag"]
-  ]
-}

.travis.yml

@@ -3,9 +3,6 @@ git:
 notifications:
   email: false
 
-before_install:
-  - export BOTO_CONFIG=/dev/null
-
 language: node_js
 node_js:
   - "4"
@@ -22,8 +19,6 @@ matrix:
       env: TARGET_ARCH=arm
     - os: linux
       env: TARGET_ARCH=ia32
-    - os: linux
-      env: TARGET_ARCH=arm64
   allow_failures:
     - os: osx
 

CODE_OF_CONDUCT.md

@@ -1,4 +1,4 @@
-# Contributor Covenant Code of Conduct:
+# Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor-Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
 
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -1,56 +1,79 @@
 # Contributing to Electron
 
+:memo: Available Translations: [Korean](https://github.com/electron/electron/tree/master/docs-translations/ko-KR/project/CONTRIBUTING.md) | [Simplified Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-CN/project/CONTRIBUTING.md) | [Brazilian Portuguese](https://github.com/electron/electron/tree/master/docs-translations/pt-BR/project/CONTRIBUTING.md) | [Dutch](https://github.com/electron/electron/tree/master/docs-translations/nl/project/CONTRIBUTING.md)
+
 :+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
 
 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code. Please report unacceptable
-behavior to electron@github.com.
+behavior to atom@github.com.
 
 The following is a set of guidelines for contributing to Electron.
 These are just guidelines, not rules, use your best judgment and feel free to
 propose changes to this document in a pull request.
 
-## [Issues](https://electronjs.org/docs/development/issues)
+## Submitting Issues
 
-Issues are created [here](https://github.com/electron/electron/issues/new).
+* You can create an issue [here](https://github.com/electron/electron/issues/new),
+but before doing that please read the notes below and include as many details as
+possible with your report. If you can, please include:
+  * The version of Electron you are using
+  * The operating system you are using
+  * If applicable, what you were doing when the issue arose and what you
+  expected to happen
+* Other things that will help resolve your issue:
+  * Screenshots and animated GIFs
+  * Error output that appears in your terminal, dev tools or as an alert
+  * Perform a [cursory search](https://github.com/electron/electron/issues?utf8=✓&q=is%3Aissue+)
+  to see if a similar issue has already been submitted
 
-* [How to Contribute in Issues](https://electronjs.org/docs/development/issues#how-to-contribute-in-issues)
-* [Asking for General Help](https://electronjs.org/docs/development/issues#asking-for-general-help)
-* [Submitting a Bug Report](https://electronjs.org/docs/development/issues#submitting-a-bug-report)
-* [Triaging a Bug Report](https://electronjs.org/docs/development/issues#triaging-a-bug-report)
-* [Resolving a Bug Report](https://electronjs.org/docs/development/issues#resolving-a-bug-report)
+## Submitting Pull Requests
 
-### Issue Maintenance and Closure
-* If an issue is inactive for 45 days (no activity of any kind), it will be
-marked for closure with `stale`.
-* If after this label is applied, no further activity occurs in the next 7 days,
-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!
+* Include screenshots and animated GIFs in your pull request whenever possible.
+* Follow the JavaScript, C++, and Python [coding style defined in docs](/docs/development/coding-style.md).
+* Write documentation in [Markdown](https://daringfireball.net/projects/markdown).
+  See the [Documentation Styleguide](/docs/styleguide.md).
+* Use short, present tense commit messages. See [Commit Message Styleguide](#git-commit-messages).
 
-## [Pull Requests](https://electronjs.org/docs/development/pull-requests)
+## Styleguides
 
-Pull Requests are the way concrete changes are made to the code, documentation,
-dependencies, and tools contained in the `electron/electron` repository.
+### General Code
 
-* [Setting up your local environment](https://electronjs.org/docs/development/pull-requests#setting-up-your-local-environment)
-  * [Step 1: Fork](https://electronjs.org/docs/development/pull-requests#step-1-fork)
-  * [Step 2: Build](https://electronjs.org/docs/development/pull-requests#step-2-build)
-  * [Step 3: Branch](https://electronjs.org/docs/development/pull-requests#step-3-branch)
-* [The Process of Making Changes](https://electronjs.org/docs/development/pull-requests#the-process-of-making-changes)
-  * [Step 4: Code](https://electronjs.org/docs/development/pull-requests#step-4-code)
-  * [Step 5: Commit](https://electronjs.org/docs/development/pull-requests#step-5-commit)
-    * [Commit message guidelines](https://electronjs.org/docs/development/pull-requests#commit-message-guidelines)
-  * [Step 6: Rebase](https://electronjs.org/docs/development/pull-requests#step-6-rebase)
-  * [Step 7: Test](https://electronjs.org/docs/development/pull-requests#step-7-test)
-  * [Step 8: Push](https://electronjs.org/docs/development/pull-requests#step-8-push)
-  * [Step 8: Opening the Pull Request](https://electronjs.org/docs/development/pull-requests#step-8-opening-the-pull-request)
-  * [Step 9: Discuss and Update](#step-9-discuss-and-update)
-    * [Approval and Request Changes Workflow](https://electronjs.org/docs/development/pull-requests#approval-and-request-changes-workflow)
-  * [Step 10: Landing](https://electronjs.org/docs/development/pull-requests#step-10-landing)
-  * [Continuous Integration Testing](https://electronjs.org/docs/development/pull-requests#continuous-integration-testing)
+* End files with a newline.
+* Place requires in the following order:
+  * Built in Node Modules (such as `path`)
+  * Built in Electron Modules (such as `ipc`, `app`)
+  * Local Modules (using relative paths)
+* Place class properties in the following order:
+  * Class methods and properties (methods starting with a `@`)
+  * Instance methods and properties
+* Avoid platform-dependent code:
+  * Use `path.join()` to concatenate filenames.
+  * Use `os.tmpdir()` rather than `/tmp` when you need to reference the
+    temporary directory.
+* Using a plain `return` when returning explicitly at the end of a function.
+  * Not `return null`, `return undefined`, `null`, or `undefined`
 
-## Style Guides
-
-See [Coding Style](https://electronjs.org/docs/development/coding-style) for information about which standards Electron adheres to in different parts of its codebase.
+### Git Commit Messages
 
+* Use the present tense ("Add feature" not "Added feature")
+* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
+* Limit the first line to 72 characters or less
+* Reference issues and pull requests liberally
+* When only changing documentation, include `[ci skip]` in the commit description
+* Consider starting the commit message with an applicable emoji:
+  * :art: `:art:` when improving the format/structure of the code
+  * :racehorse: `:racehorse:` when improving performance
+  * :non-potable_water: `:non-potable_water:` when plugging memory leaks
+  * :memo: `:memo:` when writing docs
+  * :penguin: `:penguin:` when fixing something on Linux
+  * :apple: `:apple:` when fixing something on macOS
+  * :checkered_flag: `:checkered_flag:` when fixing something on Windows
+  * :bug: `:bug:` when fixing a bug
+  * :fire: `:fire:` when removing code or files
+  * :green_heart: `:green_heart:` when fixing the CI build
+  * :white_check_mark: `:white_check_mark:` when adding tests
+  * :lock: `:lock:` when dealing with security
+  * :arrow_up: `:arrow_up:` when upgrading dependencies
+  * :arrow_down: `:arrow_down:` when downgrading dependencies
+  * :shirt: `:shirt:` when removing linter warnings

Dockerfile

@@ -1,21 +0,0 @@
-FROM electronbuilds/libchromiumcontent:0.0.4
-
-USER root
-
-# Set up HOME directory
-ENV HOME=/home
-RUN chmod a+rwx /home
-
-# Install node.js
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get update && apt-get install -y nodejs
-
-# Install wget used by crash reporter
-RUN apt-get install -y wget
-
-# Install python-dbusmock
-RUN apt-get install -y python-dbusmock
-
-# Add xvfb init script
-ADD tools/xvfb-init.sh /etc/init.d/xvfb
-RUN chmod a+x /etc/init.d/xvfb

Dockerfile.arm64

@@ -1,34 +0,0 @@
-FROM multiarch/debian-debootstrap:arm64-jessie
-
-RUN apt-get update && apt-get install -y\
- bison \
- build-essential \
- clang \
- curl \
- gperf \
- libasound2 \
- libasound2-dev \
- libcap-dev \
- libcups2-dev \
- libdbus-1-dev \
- libgconf-2-4 \
- libgconf2-dev \
- libgnome-keyring-dev \
- libgtk-3-0 \
- libgtk-3-dev \
- libnotify-dev \
- libnss3 \
- libnss3-dev \
- libx11-xcb-dev \
- libxss1 \
- libxtst-dev \
- libxtst6 \
- python-dbusmock \
- wget \
- xvfb
-
-ADD tools/xvfb-init.sh /etc/init.d/xvfb
-RUN chmod a+x /etc/init.d/xvfb
-ADD tools/run-electron.sh /run-electron.sh
-RUN chmod a+x /run-electron.sh
-CMD sh /run-electron.sh

Dockerfile.armv7

@@ -1,40 +0,0 @@
-FROM multiarch/debian-debootstrap:armhf-jessie
-
-RUN apt-get update && apt-get install -y\
- bison \
- build-essential \
- clang \
- curl \
- gperf \
- libasound2 \
- libasound2-dev \
- libcap-dev \
- libcups2-dev \
- libdbus-1-dev \
- libgconf-2-4 \
- libgconf2-dev \
- libgnome-keyring-dev \
- libgtk-3-0 \
- libgtk-3-dev \
- libnotify-dev \
- libnss3 \
- libnss3-dev \
- libx11-xcb-dev \
- libxss1 \
- libxtst-dev \
- libxtst6 \
- python-dbusmock \
- git \
- wget \
- xvfb
-
-# Install node.js
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get update && apt-get install -y nodejs
-
-ADD tools/xvfb-init.sh /etc/init.d/xvfb
-RUN chmod a+x /etc/init.d/xvfb
-ADD tools/run-electron.sh /run-electron.sh
-RUN chmod a+x /run-electron.sh
-
-CMD sh /run-electron.sh

Dockerfile.circleci

@@ -1,20 +0,0 @@
-FROM electronbuilds/libchromiumcontent:0.0.4
-
-USER root
-
-# Install node.js
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get update && apt-get install -y nodejs
-
-# Install wget used by crash reporter
-RUN apt-get install -y wget
-
-# Install python-dbusmock
-RUN apt-get install -y python-dbusmock
-
-# Add xvfb init script
-ADD tools/xvfb-init.sh /etc/init.d/xvfb
-RUN chmod a+x /etc/init.d/xvfb
-
-USER builduser
-WORKDIR /home/builduser

Jenkinsfile

@@ -1,48 +0,0 @@
-pipeline {
-  agent none
-  stages {
-    stage('Build') {
-      parallel {
-        stage('electron-osx-x64') {
-            agent {
-              label 'osx'
-            }
-            steps {
-              timeout(60) {
-                sh 'script/bootstrap.py --target_arch=x64 --dev'
-                sh 'npm run lint'
-                sh 'script/build.py -c D'
-                sh 'script/test.py --ci --rebuild_native_modules'
-              }
-            }
-            post {
-              always {
-                cleanWs()
-              }
-            }
-        }
-        stage('electron-mas-x64') {
-          agent {
-            label 'osx'
-          }
-          environment {
-            MAS_BUILD = '1'
-          }
-          steps {
-            timeout(60) {
-              sh 'script/bootstrap.py --target_arch=x64 --dev'
-              sh 'npm run lint'
-              sh 'script/build.py -c D'
-              sh 'script/test.py --ci --rebuild_native_modules'
-            }
-          }
-          post {
-            always {
-              cleanWs()
-            }
-          }
-        }
-      }
-    }
-  }
-}

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018 GitHub Inc.
+Copyright (c) 2013-2017 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -1,107 +1,83 @@
-[![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)
+[![Electron Logo](https://electron.atom.io/images/electron-logo.svg)](https://electron.atom.io/)
 
-
-[![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/master.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/master)
-[![AppVeyor Build Status](https://windows-ci.electronjs.org/api/projects/status/nilyf07hcef14dvj/branch/master?svg=true)](https://windows-ci.electronjs.org/project/AppVeyor/electron/branch/master)
-[![Jenkins Build Status](https://mac-ci.electronjs.org/buildStatus/icon?job=Electron%20org/electron/master)](https://mac-ci.electronjs.org/blue/organizations/jenkins/Electron%20org%2Felectron/activity?branch=master)
+[![Travis Build Status](https://travis-ci.org/electron/electron.svg?branch=master)](https://travis-ci.org/electron/electron)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/bc56v83355fi3369/branch/master?svg=true)](https://ci.appveyor.com/project/electron-bot/electron/branch/master)
 [![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/)
+[![Join the Electron Community on Slack](http://atom-slack.herokuapp.com/badge.svg)](http://atom-slack.herokuapp.com/)
 
-:memo: Available Translations: 🇨🇳 🇹🇼 🇧🇷 🇪🇸 🇰🇷 🇯🇵 🇷🇺 🇫🇷 🇹🇭 🇳🇱 🇹🇷 🇮🇩 🇺🇦 🇨🇿 🇮🇹.
-View these docs in other languages at [electron/electron-i18n](https://github.com/electron/electron-i18n/tree/master/content/).
+:memo: Available Translations: [Korean](https://github.com/electron/electron/tree/master/docs-translations/ko-KR/project/README.md) | [Simplified Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-CN/project/README.md) | [Brazilian Portuguese](https://github.com/electron/electron/tree/master/docs-translations/pt-BR/project/README.md) | [Traditional Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-TW/project/README.md) | [Spanish](https://github.com/electron/electron/tree/master/docs-translations/es/project/README.md) | [Turkish](https://github.com/electron/electron/tree/master/docs-translations/tr-TR/project/README.md)
 
 The Electron framework lets you write cross-platform desktop applications
 using JavaScript, HTML and CSS. It is based on [Node.js](https://nodejs.org/) and
-[Chromium](https://www.chromium.org) and is used by the [Atom
-editor](https://github.com/atom/atom) and many other [apps](https://electronjs.org/apps).
+[Chromium](http://www.chromium.org) and is used by the [Atom
+editor](https://github.com/atom/atom) and many other [apps](https://electron.atom.io/apps).
 
 Follow [@ElectronJS](https://twitter.com/electronjs) on Twitter for important
 announcements.
 
-This project adheres to the Contributor Covenant
-[code of conduct](https://github.com/electron/electron/tree/master/CODE_OF_CONDUCT.md).
+This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code. Please report unacceptable
-behavior to [electron@github.com](mailto:electron@github.com).
+behavior to electron@github.com.
 
-## Installation
+## Downloads
 
-To install prebuilt Electron binaries, use [`npm`](https://docs.npmjs.com/).
-The preferred method is to install Electron as a development dependency in your
-app:
+To install prebuilt Electron binaries, use
+[`npm`](https://docs.npmjs.com/):
 
 ```sh
-npm install electron --save-dev --save-exact
+# Install as a development dependency
+npm install electron --save-dev
+
+# Install the `electron` command globally in your $PATH
+npm install electron -g
 ```
 
-The `--save-exact` flag is recommended as Electron does not follow semantic
-versioning. For info on how to manage Electron versions in your apps, see
-[Electron versioning](docs/tutorial/electron-versioning.md).
-
-For more installation options and troubleshooting tips, see
-[installation](docs/tutorial/installation.md).
-
-## Quick start
-
-Clone and run the
-[electron/electron-quick-start](https://github.com/electron/electron-quick-start)
-repository to see a minimal Electron app in action:
-
-```sh
-git clone https://github.com/electron/electron-quick-start
-cd electron-quick-start
-npm install
-npm start
-```
-
-## Resources for learning Electron
-
-- [electronjs.org/docs](https://electronjs.org/docs) - all of Electron's documentation
-- [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - a very basic starter Electron app
-- [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - sample starter apps created by the community
-- [electron/simple-samples](https://github.com/electron/simple-samples) - small applications with ideas for taking them further
-- [electron/electron-api-demos](https://github.com/electron/electron-api-demos) - an Electron app that teaches you how to use Electron
-- [hokein/electron-sample-apps](https://github.com/hokein/electron-sample-apps) - small demo apps for the various Electron APIs
-
-## Programmatic usage
-
-Most people use Electron from the command line, but if you require `electron` inside
-your **Node app** (not your Electron app) it will return the file path to the
-binary. Use this to spawn Electron from Node scripts:
-
-```javascript
-const electron = require('electron')
-const proc = require('child_process')
-
-// will print something similar to /Users/maf/.../Electron
-console.log(electron)
-
-// spawn Electron
-const child = proc.spawn(electron)
-```
+See the [releases page](https://github.com/electron/electron/releases) for
+prebuilt binaries, debug symbols, and more.
 
 ### Mirrors
 
 - [China](https://npm.taobao.org/mirrors/electron)
 
+## Documentation
+
+Guides and the API reference are located in the
+[docs](https://github.com/electron/electron/tree/master/docs) directory. It also
+contains documents describing how to build and contribute to Electron.
+
 ## Documentation Translations
 
-Find documentation translations in [electron/electron-i18n](https://github.com/electron/electron-i18n).
+- [Brazilian Portuguese](https://github.com/electron/electron/tree/master/docs-translations/pt-BR)
+- [Korean](https://github.com/electron/electron/tree/master/docs-translations/ko-KR)
+- [Japanese](https://github.com/electron/electron/tree/master/docs-translations/jp)
+- [Spanish](https://github.com/electron/electron/tree/master/docs-translations/es)
+- [Simplified Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-CN)
+- [Traditional Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-TW)
+- [Turkish](https://github.com/electron/electron/tree/master/docs-translations/tr-TR)
+- [Thai](https://github.com/electron/electron/tree/master/docs-Translations/th-TH)
+- [Ukrainian](https://github.com/electron/electron/tree/master/docs-translations/uk-UA)
+- [Russian](https://github.com/electron/electron/tree/master/docs-translations/ru-RU)
+- [French](https://github.com/electron/electron/tree/master/docs-translations/fr-FR)
+
+## Quick Start
+
+Clone and run the [`electron/electron-quick-start`](https://github.com/electron/electron-quick-start)
+repository to see a minimal Electron app in action.
 
 ## Community
 
 You can ask questions and interact with the community in the following
 locations:
-- [`electron`](https://discuss.atom.io/c/electron) category on the Atom
+- [`electron`](http://discuss.atom.io/c/electron) category on the Atom
 forums
 - `#atom-shell` channel on Freenode
-- [`Atom`](https://atom-slack.herokuapp.com) channel on Slack
+- [`Atom`](http://atom-slack.herokuapp.com/) channel on Slack
 - [`electron-ru`](https://telegram.me/electron_ru) *(Russian)*
 - [`electron-br`](https://electron-br.slack.com) *(Brazilian Portuguese)*
-- [`electron-kr`](https://electron-kr.github.io/electron-kr) *(Korean)*
+- [`electron-kr`](http://www.meetup.com/electron-kr/) *(Korean)*
 - [`electron-jp`](https://electron-jp.slack.com) *(Japanese)*
-- [`electron-tr`](https://electron-tr.herokuapp.com) *(Turkish)*
+- [`electron-tr`](http://electron-tr.herokuapp.com) *(Turkish)*
 - [`electron-id`](https://electron-id.slack.com) *(Indonesia)*
-- [`electron-pl`](https://electronpl.github.io) *(Poland)*
 
 Check out [awesome-electron](https://github.com/sindresorhus/awesome-electron)
 for a community maintained list of useful example apps, tools and resources.

SECURITY.md

@@ -7,6 +7,3 @@ To report a security issue, email [electron@github.com](mailto:electron@github.c
 The Electron team will send a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
 
 Report security bugs in third-party modules to the person or team maintaining the module. You can also report a vulnerability through the [Node Security Project](https://nodesecurity.io/report).
-
-## Learning More About Security
-To learn more about securing an Electron application, please see the [security tutorial](docs/tutorial/security.md).

appveyor.yml

@@ -0,0 +1,25 @@
+# appveyor file
+# http://www.appveyor.com/docs/appveyor-yml
+version: "{build}"
+
+os: Visual Studio 2015
+
+init:
+  - git config --global core.autocrlf input
+
+platform:
+  - x86
+  - x64
+
+install:
+  - cmd: SET PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH%
+  - cmd: SET PATH=C:\python27;%PATH%
+  - cmd: python script/cibuild
+
+branches:
+  only:
+    - master
+
+# disable build and test pahses
+build: off
+test: off

atom/app/atom_content_client.cc

@@ -93,9 +93,9 @@ content::PepperPluginInfo CreateWidevineCdmInfo(const base::FilePath& path,
   std::vector<std::string> codecs;
   codecs.push_back(kCdmSupportedCodecVp8);
   codecs.push_back(kCdmSupportedCodecVp9);
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
   codecs.push_back(kCdmSupportedCodecAvc1);
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
   std::string codec_string = base::JoinString(
       codecs, std::string(1, kCdmSupportedCodecsValueDelimiter));
   widevine_cdm_mime_type.additional_param_names.push_back(
@@ -198,19 +198,11 @@ base::string16 AtomContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
-void AtomContentClient::AddAdditionalSchemes(Schemes* schemes) {
-  schemes->standard_schemes.push_back("chrome-extension");
-
-  std::vector<std::string> splited;
-  ConvertStringWithSeparatorToVector(&splited, ",",
-                                     switches::kRegisterServiceWorkerSchemes);
-  for (const std::string& scheme : splited)
-    schemes->service_worker_schemes.push_back(scheme);
-  schemes->service_worker_schemes.push_back(url::kFileScheme);
-
-  ConvertStringWithSeparatorToVector(&splited, ",", switches::kSecureSchemes);
-  for (const std::string& scheme : splited)
-    schemes->secure_schemes.push_back(scheme);
+void AtomContentClient::AddAdditionalSchemes(
+    std::vector<url::SchemeWithType>* standard_schemes,
+    std::vector<url::SchemeWithType>* referrer_schemes,
+    std::vector<std::string>* savable_schemes) {
+  standard_schemes->push_back({"chrome-extension", url::SCHEME_WITHOUT_PORT});
 }
 
 void AtomContentClient::AddPepperPlugins(
@@ -222,4 +214,25 @@ void AtomContentClient::AddPepperPlugins(
   ComputeBuiltInPlugins(plugins);
 }
 
+void AtomContentClient::AddServiceWorkerSchemes(
+    std::set<std::string>* service_worker_schemes) {
+  std::vector<std::string> schemes;
+  ConvertStringWithSeparatorToVector(&schemes, ",",
+                                     switches::kRegisterServiceWorkerSchemes);
+  for (const std::string& scheme : schemes)
+    service_worker_schemes->insert(scheme);
+
+  service_worker_schemes->insert(url::kFileScheme);
+}
+
+void AtomContentClient::AddSecureSchemesAndOrigins(
+    std::set<std::string>* secure_schemes,
+    std::set<GURL>* secure_origins) {
+  std::vector<std::string> schemes;
+  ConvertStringWithSeparatorToVector(&schemes, ",", switches::kSecureSchemes);
+  for (const std::string& scheme : schemes)
+    secure_schemes->insert(scheme);
+}
+
+
 }  // namespace atom

atom/app/atom_content_client.h

@@ -23,9 +23,17 @@ class AtomContentClient : public brightray::ContentClient {
   std::string GetProduct() const override;
   std::string GetUserAgent() const override;
   base::string16 GetLocalizedString(int message_id) const override;
-  void AddAdditionalSchemes(Schemes* schemes) override;
+  void AddAdditionalSchemes(
+      std::vector<url::SchemeWithType>* standard_schemes,
+      std::vector<url::SchemeWithType>* referrer_schemes,
+      std::vector<std::string>* savable_schemes) override;
   void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) override;
+  void AddServiceWorkerSchemes(
+      std::set<std::string>* service_worker_schemes) override;
+  void AddSecureSchemesAndOrigins(
+      std::set<std::string>* secure_schemes,
+      std::set<GURL>* secure_origins) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AtomContentClient);

atom/app/atom_library_main.h

@@ -10,7 +10,7 @@
 #if defined(OS_MACOSX)
 extern "C" {
 __attribute__((visibility("default")))
-int AtomMain(int argc, char* argv[]);
+int AtomMain(int argc, const char* argv[]);
 
 __attribute__((visibility("default")))
 int AtomInitializeICUandStartNode(int argc, char *argv[]);

atom/app/atom_library_main.mm

@@ -15,11 +15,11 @@
 #include "content/public/app/content_main.h"
 
 #if defined(OS_MACOSX)
-int AtomMain(int argc, char* argv[]) {
+int AtomMain(int argc, const char* argv[]) {
   atom::AtomMainDelegate delegate;
   content::ContentMainParams params(&delegate);
   params.argc = argc;
-  params.argv = const_cast<const char**>(argv);
+  params.argv = argv;
   atom::AtomCommandLine::Init(argc, argv);
   return content::ContentMain(params);
 }

atom/app/atom_login_helper.mm

@@ -1,11 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-int main(int argc, char* argv[]) {
-  NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-  NSArray* pathComponents = [[[NSBundle mainBundle] bundlePath] pathComponents];
-  pathComponents = [pathComponents subarrayWithRange:NSMakeRange(0, [pathComponents count] - 4)];
-  NSString* path = [NSString pathWithComponents:pathComponents];
-  [[NSWorkspace sharedWorkspace] launchApplication:path];
-  [pool drain];
-  return 0;
-}

atom/app/atom_main.cc

@@ -4,23 +4,19 @@
 
 #include "atom/app/atom_main.h"
 
-#include <cstdlib>
-#include <vector>
+#include <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>  // windows.h must be included first
 
-#include <atlbase.h>  // ensures that ATL statics like `_AtlWinModule` are initialized (it's an issue in static debug build)
 #include <shellapi.h>
 #include <shellscalingapi.h>
 #include <tchar.h>
 
 #include "atom/app/atom_main_delegate.h"
-#include "atom/app/command_line_args.h"
 #include "atom/common/crash_reporter/win/crash_service_main.h"
 #include "base/environment.h"
 #include "base/process/launch.h"
-#include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "content/public/app/sandbox_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
@@ -38,9 +34,7 @@
 
 namespace {
 
-#ifdef ENABLE_RUN_AS_NODE
-const auto kRunAsNode = "ELECTRON_RUN_AS_NODE";
-#endif
+const char* kRunAsNode = "ELECTRON_RUN_AS_NODE";
 
 bool IsEnvSet(const char* name) {
 #if defined(OS_WIN)
@@ -57,91 +51,58 @@ bool IsEnvSet(const char* name) {
 
 #if defined(OS_WIN)
 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
-  struct Arguments {
-    int argc = 0;
-    wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
+  int argc = 0;
+  wchar_t** wargv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
 
-    ~Arguments() { LocalFree(argv); }
-  } arguments;
-
-  if (!arguments.argv)
-    return -1;
-
-#ifdef _DEBUG
-  // Don't display assert dialog boxes in CI test runs
-  static const auto kCI = "ELECTRON_CI";
-  bool is_ci = IsEnvSet(kCI);
-  if (!is_ci) {
-    for (int i = 0; i < arguments.argc; ++i) {
-      if (!_wcsicmp(arguments.argv[i], L"--ci")) {
-        is_ci = true;
-        _putenv_s(kCI, "1");  // set flag for child processes
-        break;
-      }
-    }
-  }
-  if (is_ci) {
-    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-    _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-
-    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-    _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-
-    _set_error_mode(_OUT_TO_STDERR);
-  }
-#endif
-
-#ifdef ENABLE_RUN_AS_NODE
   bool run_as_node = IsEnvSet(kRunAsNode);
-#else
-  bool run_as_node = false;
-#endif
 
   // Make sure the output is printed to console.
   if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
     base::RouteStdioToConsole(false);
 
-#ifndef DEBUG
-  // Chromium has its own TLS subsystem which supports automatic destruction
-  // of thread-local data, and also depends on memory allocation routines
-  // provided by the CRT. The problem is that the auto-destruction mechanism
-  // uses a hidden feature of the OS loader which calls a callback on thread
-  // exit, but only after all loaded DLLs have been detached. Since the CRT is
-  // also a DLL, it happens that by the time Chromium's `OnThreadExit` function
-  // is called, the heap functions, though still in memory, no longer perform
-  // their duties, and when Chromium calls `free` on its buffer, it triggers
-  // an access violation error.
-  // We work around this problem by invoking Chromium's `OnThreadExit` in time
-  // from within the CRT's atexit facility, ensuring the heap functions are
-  // still active. The second invocation from the OS loader will be a no-op.
-  extern void NTAPI OnThreadExit(PVOID module, DWORD reason, PVOID reserved);
-  atexit([]() {
-    OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr);
-  });
-#endif
+  // Convert argv to to UTF8
+  char** argv = new char*[argc];
+  for (int i = 0; i < argc; i++) {
+    // Compute the size of the required buffer
+    DWORD size = WideCharToMultiByte(CP_UTF8,
+                                     0,
+                                     wargv[i],
+                                     -1,
+                                     NULL,
+                                     0,
+                                     NULL,
+                                     NULL);
+    if (size == 0) {
+      // This should never happen.
+      fprintf(stderr, "Could not convert arguments to utf8.");
+      exit(1);
+    }
+    // Do the actual conversion
+    argv[i] = new char[size];
+    DWORD result = WideCharToMultiByte(CP_UTF8,
+                                       0,
+                                       wargv[i],
+                                       -1,
+                                       argv[i],
+                                       size,
+                                       NULL,
+                                       NULL);
+    if (result == 0) {
+      // This should never happen.
+      fprintf(stderr, "Could not convert arguments to utf8.");
+      exit(1);
+    }
+  }
 
-#ifdef ENABLE_RUN_AS_NODE
   if (run_as_node) {
-    std::vector<char*> argv(arguments.argc);
-    std::transform(
-        arguments.argv, arguments.argv + arguments.argc, argv.begin(),
-        [](auto& a) { return _strdup(base::WideToUTF8(a).c_str()); });
-
+    // Now that argv conversion is done, we can finally start.
     base::AtExitManager atexit_manager;
     base::i18n::InitializeICU();
-    auto ret = atom::NodeMain(argv.size(), argv.data());
-    std::for_each(argv.begin(), argv.end(), free);
-    return ret;
-  }
-#endif
-
-  if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
+    return atom::NodeMain(argc, argv);
+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
     return crash_service::Main(cmd);
   }
 
-  if (!atom::CheckCommandLineArguments(arguments.argc, arguments.argv))
-    return -1;
-
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);
   atom::AtomMainDelegate delegate;
@@ -149,37 +110,34 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   content::ContentMainParams params(&delegate);
   params.instance = instance;
   params.sandbox_info = &sandbox_info;
-  atom::AtomCommandLine::Init(arguments.argc, arguments.argv);
+  atom::AtomCommandLine::Init(argc, argv);
+  atom::AtomCommandLine::InitW(argc, wargv);
   return content::ContentMain(params);
 }
 
 #elif defined(OS_LINUX)  // defined(OS_WIN)
 
-int main(int argc, char* argv[]) {
-#ifdef ENABLE_RUN_AS_NODE
+int main(int argc, const char* argv[]) {
   if (IsEnvSet(kRunAsNode)) {
     base::i18n::InitializeICU();
     base::AtExitManager atexit_manager;
-    return atom::NodeMain(argc, argv);
+    return atom::NodeMain(argc, const_cast<char**>(argv));
   }
-#endif
 
   atom::AtomMainDelegate delegate;
   content::ContentMainParams params(&delegate);
   params.argc = argc;
-  params.argv = const_cast<const char**>(argv);
+  params.argv = argv;
   atom::AtomCommandLine::Init(argc, argv);
   return content::ContentMain(params);
 }
 
 #else  // defined(OS_LINUX)
 
-int main(int argc, char* argv[]) {
-#ifdef ENABLE_RUN_AS_NODE
+int main(int argc, const char* argv[]) {
   if (IsEnvSet(kRunAsNode)) {
-    return AtomInitializeICUandStartNode(argc, argv);
+    return AtomInitializeICUandStartNode(argc, const_cast<char**>(argv));
   }
-#endif
 
   return AtomMain(argc, argv);
 }

atom/app/atom_main_delegate.cc

@@ -21,18 +21,9 @@
 #include "base/logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/common/content_switches.h"
-#include "ipc/ipc_features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
-#define IPC_MESSAGE_MACROS_LOG_ENABLED
-#include "content/public/common/content_ipc_logging.h"
-#define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
-  content::RegisterIPCLogger(msg_id, logger)
-#include "atom/common/common_message_generator.h"
-#endif
-
 namespace atom {
 
 namespace {
@@ -95,10 +86,9 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
   logging::SetLogItems(true, false, true, false);
 
   // Enable convient stack printing.
-#if defined(DEBUG) && defined(OS_LINUX)
-  bool enable_stack_dumping = true;
-#else
   bool enable_stack_dumping = env->HasVar("ELECTRON_ENABLE_STACK_DUMPING");
+#if defined(DEBUG) && defined(OS_LINUX)
+  enable_stack_dumping = true;
 #endif
   if (enable_stack_dumping)
     base::debug::EnableInProcessStackDumping();
@@ -136,15 +126,13 @@ void AtomMainDelegate::PreSandboxStartup() {
   if (!IsBrowserProcess(command_line))
     return;
 
-  if (!command_line->HasSwitch(switches::kEnableMixedSandbox)) {
-    if (command_line->HasSwitch(switches::kEnableSandbox)) {
-      // Disable setuid sandbox since it is not longer required on
-      // linux(namespace sandbox is available on most distros).
-      command_line->AppendSwitch(::switches::kDisableSetuidSandbox);
-    } else {
-      // Disable renderer sandbox for most of node's functions.
-      command_line->AppendSwitch(::switches::kNoSandbox);
-    }
+  if (command_line->HasSwitch(switches::kEnableSandbox)) {
+    // Disable setuid sandbox since it is not longer required on linux(namespace
+    // sandbox is available on most distros).
+    command_line->AppendSwitch(::switches::kDisableSetuidSandbox);
+  } else {
+    // Disable renderer sandbox for most of node's functions.
+    command_line->AppendSwitch(::switches::kNoSandbox);
   }
 
   // Allow file:// URIs to read other file:// URIs by default.
@@ -164,9 +152,7 @@ content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
 content::ContentRendererClient*
     AtomMainDelegate::CreateContentRendererClient() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableSandbox) ||
-      !base::CommandLine::ForCurrentProcess()->HasSwitch(
-        ::switches::kNoSandbox)) {
+        switches::kEnableSandbox)) {
     renderer_client_.reset(new AtomSandboxedRendererClient);
   } else {
     renderer_client_.reset(new AtomRendererClient);

atom/app/atom_main_delegate.h

@@ -44,6 +44,7 @@ class AtomMainDelegate : public brightray::MainDelegate {
   void SetUpBundleOverrides();
 #endif
 
+  brightray::ContentClient content_client_;
   std::unique_ptr<content::ContentBrowserClient> browser_client_;
   std::unique_ptr<content::ContentRendererClient> renderer_client_;
   std::unique_ptr<content::ContentUtilityClient> utility_client_;

atom/app/command_line_args.h

@@ -1,17 +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_APP_COMMAND_LINE_ARGS_H_
-#define ATOM_APP_COMMAND_LINE_ARGS_H_
-
-#include "base/command_line.h"
-
-namespace atom {
-
-bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv);
-
-}  // namespace atom
-
-#endif  // ATOM_APP_COMMAND_LINE_ARGS_H_
-

atom/app/node_main.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifdef ENABLE_RUN_AS_NODE
-
 #include "atom/app/node_main.h"
 
 #include "atom/app/uv_task_runner.h"
@@ -14,7 +12,6 @@
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
@@ -43,11 +40,6 @@ int NodeMain(int argc, char *argv[]) {
 
     gin::V8Initializer::LoadV8Snapshot();
     gin::V8Initializer::LoadV8Natives();
-
-    // V8 requires a task scheduler apparently
-    base::TaskScheduler::CreateAndStartWithDefaultParams("Electron");
-
-    // Initialize gin::IsolateHolder.
     JavascriptEnvironment gin_env;
 
     int exec_argc;
@@ -59,9 +51,10 @@ int NodeMain(int argc, char *argv[]) {
         &isolate_data, gin_env.context(), argc, argv,
         exec_argc, exec_argv);
 
-    // Enable support for v8 inspector.
-    NodeDebugger node_debugger(env);
-    node_debugger.Start(gin_env.platform());
+    // Start our custom debugger implementation.
+    NodeDebugger node_debugger(gin_env.isolate());
+    if (node_debugger.IsRunning())
+      env->AssignToContext(v8::Debug::GetDebugContext(gin_env.isolate()));
 
     mate::Dictionary process(gin_env.isolate(), env->process_object());
 #if defined(OS_WIN)
@@ -96,18 +89,9 @@ int NodeMain(int argc, char *argv[]) {
     node::FreeEnvironment(env);
   }
 
-  // According to "src/gin/shell/gin_main.cc":
-  //
-  // gin::IsolateHolder waits for tasks running in TaskScheduler in its
-  // destructor and thus must be destroyed before TaskScheduler starts skipping
-  // CONTINUE_ON_SHUTDOWN tasks.
-  base::TaskScheduler::GetInstance()->Shutdown();
-
   v8::V8::Dispose();
 
   return exit_code;
 }
 
 }  // namespace atom
-
-#endif  // ENABLE_RUN_AS_NODE

atom/app/node_main.h

@@ -5,14 +5,10 @@
 #ifndef ATOM_APP_NODE_MAIN_H_
 #define ATOM_APP_NODE_MAIN_H_
 
-#ifdef ENABLE_RUN_AS_NODE
-
 namespace atom {
 
 int NodeMain(int argc, char *argv[]);
 
 }  // namespace atom
 
-#endif  // ENABLE_RUN_AS_NODE
-
 #endif  // ATOM_APP_NODE_MAIN_H_

atom/app/resources/mac/loginhelper-Info.plist

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleIdentifier</key>
-	<string>${ATOM_BUNDLE_ID}</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>LSBackgroundOnly</key>
-	<true/>
-</dict>
-</plist>

atom/app/uv_task_runner.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include <utility>
-
 #include "atom/app/uv_task_runner.h"
 
 #include "base/stl_util.h"
@@ -21,25 +19,25 @@ UvTaskRunner::~UvTaskRunner() {
 }
 
 bool UvTaskRunner::PostDelayedTask(const tracked_objects::Location& from_here,
-                                   base::OnceClosure task,
+                                   const base::Closure& task,
                                    base::TimeDelta delay) {
   auto* timer = new uv_timer_t;
   timer->data = this;
   uv_timer_init(loop_, timer);
   uv_timer_start(timer, UvTaskRunner::OnTimeout, delay.InMilliseconds(), 0);
-  tasks_[timer] = std::move(task);
+  tasks_[timer] = task;
   return true;
 }
 
-bool UvTaskRunner::RunsTasksInCurrentSequence() const {
+bool UvTaskRunner::RunsTasksOnCurrentThread() const {
   return true;
 }
 
 bool UvTaskRunner::PostNonNestableDelayedTask(
     const tracked_objects::Location& from_here,
-    base::OnceClosure task,
+    const base::Closure& task,
     base::TimeDelta delay) {
-  return PostDelayedTask(from_here, std::move(task), delay);
+  return PostDelayedTask(from_here, task, delay);
 }
 
 // static
@@ -48,7 +46,7 @@ void UvTaskRunner::OnTimeout(uv_timer_t* timer) {
   if (!ContainsKey(self->tasks_, timer))
     return;
 
-  std::move(self->tasks_[timer]).Run();
+  self->tasks_[timer].Run();
   self->tasks_.erase(timer);
   uv_timer_stop(timer);
   uv_close(reinterpret_cast<uv_handle_t*>(timer), UvTaskRunner::OnClose);

atom/app/uv_task_runner.h

@@ -21,12 +21,12 @@ class UvTaskRunner : public base::SingleThreadTaskRunner {
 
   // base::SingleThreadTaskRunner:
   bool PostDelayedTask(const tracked_objects::Location& from_here,
-                       base::OnceClosure task,
+                       const base::Closure& task,
                        base::TimeDelta delay) override;
-  bool RunsTasksInCurrentSequence() const override;
+  bool RunsTasksOnCurrentThread() const override;
   bool PostNonNestableDelayedTask(
       const tracked_objects::Location& from_here,
-      base::OnceClosure task,
+      const base::Closure& task,
       base::TimeDelta delay) override;
 
  private:
@@ -35,7 +35,7 @@ class UvTaskRunner : public base::SingleThreadTaskRunner {
 
   uv_loop_t* loop_;
 
-  std::map<uv_timer_t*, base::OnceClosure> tasks_;
+  std::map<uv_timer_t*, base::Closure> tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(UvTaskRunner);
 };

atom/browser/api/atom_api_app.cc

@@ -29,23 +29,18 @@
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
-#include "base/sys_info.h"
 #include "brightray/browser/brightray_paths.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/common/chrome_paths.h"
-#include "content/browser/gpu/compositor_util.h"
-#include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_child_process_host.h"
-#include "content/public/browser/child_process_data.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/content_switches.h"
 #include "media/audio/audio_manager.h"
 #include "native_mate/object_template_builder.h"
-#include "net/ssl/client_cert_identity.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
@@ -55,10 +50,6 @@
 #include "base/strings/utf_string_conversions.h"
 #endif
 
-#if defined(OS_MACOSX)
-#include "atom/browser/ui/cocoa/atom_bundle_mover.h"
-#endif
-
 using atom::Browser;
 
 namespace mate {
@@ -376,8 +367,6 @@ int GetPathConstant(const std::string& name) {
     return brightray::DIR_CACHE;
   else if (name == "userCache")
     return brightray::DIR_USER_CACHE;
-  else if (name == "logs")
-    return brightray::DIR_APP_LOGS;
   else if (name == "home")
     return base::DIR_HOME;
   else if (name == "temp")
@@ -421,26 +410,19 @@ bool NotificationCallbackWrapper(
   return !Browser::Get()->is_shutting_down();
 }
 
-void GotPrivateKey(std::shared_ptr<content::ClientCertificateDelegate> delegate,
-                   scoped_refptr<net::X509Certificate> cert,
-                   scoped_refptr<net::SSLPrivateKey> private_key) {
-  delegate->ContinueWithCertificate(cert, private_key);
-}
-
 void OnClientCertificateSelected(
     v8::Isolate* isolate,
     std::shared_ptr<content::ClientCertificateDelegate> delegate,
-    std::shared_ptr<net::ClientCertIdentityList> identities,
     mate::Arguments* args) {
   if (args->Length() == 2) {
-    delegate->ContinueWithCertificate(nullptr, nullptr);
+    delegate->ContinueWithCertificate(nullptr);
     return;
   }
 
   v8::Local<v8::Value> val;
   args->GetNext(&val);
   if (val->IsNull()) {
-    delegate->ContinueWithCertificate(nullptr, nullptr);
+    delegate->ContinueWithCertificate(nullptr);
     return;
   }
 
@@ -456,17 +438,8 @@ void OnClientCertificateSelected(
 
   auto certs = net::X509Certificate::CreateCertificateListFromBytes(
       data.c_str(), data.length(), net::X509Certificate::FORMAT_AUTO);
-  if (!certs.empty()) {
-    scoped_refptr<net::X509Certificate> cert(certs[0].get());
-    for (size_t i = 0; i < identities->size(); ++i) {
-      if (cert->Equals((*identities)[i]->certificate())) {
-        net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
-            std::move((*identities)[i]),
-            base::Bind(&GotPrivateKey, delegate, std::move(cert)));
-        break;
-      }
-    }
-  }
+  if (!certs.empty())
+    delegate->ContinueWithCertificate(certs[0].get());
 }
 
 void PassLoginInformation(scoped_refptr<LoginHandler> login_handler,
@@ -491,8 +464,8 @@ int ImportIntoCertStore(
 
   if (!cert_path.empty()) {
     if (base::ReadFileToString(base::FilePath(cert_path), &file_data)) {
-      auto module = model->cert_db()->GetPrivateSlot();
-      rv = model->ImportFromPKCS12(module.get(),
+      auto module = model->cert_db()->GetPublicModule();
+      rv = model->ImportFromPKCS12(module,
                                    file_data,
                                    password,
                                    true,
@@ -532,13 +505,6 @@ App::App(v8::Isolate* isolate) {
   static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())->set_delegate(this);
   Browser::Get()->AddObserver(this);
   content::GpuDataManager::GetInstance()->AddObserver(this);
-  base::ProcessId pid = base::GetCurrentProcId();
-  std::unique_ptr<atom::ProcessMetric> process_metric(
-      new atom::ProcessMetric(
-          content::PROCESS_TYPE_BROWSER,
-          pid,
-          base::ProcessMetrics::CreateCurrentProcessMetrics()));
-  app_metrics_[pid] = std::move(process_metric);
   Init(isolate);
 }
 
@@ -547,7 +513,6 @@ App::~App() {
       nullptr);
   Browser::Get()->RemoveObserver(this);
   content::GpuDataManager::GetInstance()->RemoveObserver(this);
-  content::BrowserChildProcessObserver::Remove(this);
 }
 
 void App::OnBeforeQuit(bool* prevent_default) {
@@ -597,103 +562,57 @@ void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
   Emit("ready", launch_info);
 }
 
-void App::OnPreMainMessageLoopRun() {
-  content::BrowserChildProcessObserver::Add(this);
-  if (process_singleton_) {
-    process_singleton_->OnBrowserReady();
-  }
-}
-
 void App::OnAccessibilitySupportChanged() {
   Emit("accessibility-support-changed", IsAccessibilitySupportEnabled());
 }
 
 #if defined(OS_MACOSX)
-void App::OnWillContinueUserActivity(
-    bool* prevent_default,
-    const std::string& type) {
-  *prevent_default = Emit("will-continue-activity", type);
-}
-
-void App::OnDidFailToContinueUserActivity(
-    const std::string& type,
-    const std::string& error) {
-  Emit("continue-activity-error", type, error);
-}
-
 void App::OnContinueUserActivity(
     bool* prevent_default,
     const std::string& type,
     const base::DictionaryValue& user_info) {
   *prevent_default = Emit("continue-activity", type, user_info);
 }
-
-void App::OnUserActivityWasContinued(
-    const std::string& type,
-    const base::DictionaryValue& user_info) {
-  Emit("activity-was-continued", type, user_info);
-}
-
-void App::OnUpdateUserActivityState(
-    bool* prevent_default,
-    const std::string& type,
-    const base::DictionaryValue& user_info) {
-  *prevent_default = Emit("update-activity-state", type, user_info);
-}
-
-void App::OnNewWindowForTab() {
-  Emit("new-window-for-tab");
-}
 #endif
 
 void App::OnLogin(LoginHandler* login_handler,
                   const base::DictionaryValue& request_details) {
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
-  bool prevent_default = false;
-  content::WebContents* web_contents = login_handler->GetWebContents();
-  if (web_contents) {
-    prevent_default =
-        Emit("login",
-             WebContents::CreateFrom(isolate(), web_contents),
-             request_details,
-             login_handler->auth_info(),
-             base::Bind(&PassLoginInformation,
-                        make_scoped_refptr(login_handler)));
-  }
+  bool prevent_default = Emit(
+      "login",
+      WebContents::CreateFrom(isolate(), login_handler->GetWebContents()),
+      request_details,
+      login_handler->auth_info(),
+      base::Bind(&PassLoginInformation, make_scoped_refptr(login_handler)));
 
   // Default behavior is to always cancel the auth.
   if (!prevent_default)
     login_handler->CancelAuth();
 }
 
-bool App::CanCreateWindow(
-    content::RenderFrameHost* opener,
-    const GURL& opener_url,
-    const GURL& opener_top_level_frame_url,
-    const GURL& source_origin,
-    content::mojom::WindowContainerType container_type,
+void App::OnCreateWindow(
     const GURL& target_url,
-    const content::Referrer& referrer,
     const std::string& frame_name,
     WindowOpenDisposition disposition,
-    const blink::mojom::WindowFeatures& features,
-    const std::vector<std::string>& additional_features,
-    const scoped_refptr<content::ResourceRequestBody>& body,
-    bool user_gesture,
-    bool opener_suppressed,
-    bool* no_javascript_access) {
+    const std::vector<std::string>& features,
+    const scoped_refptr<content::ResourceRequestBodyImpl>& body,
+    int render_process_id,
+    int render_frame_id) {
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
+  content::RenderFrameHost* rfh =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
   content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(opener);
+      content::WebContents::FromRenderFrameHost(rfh);
   if (web_contents) {
     auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents);
-    api_web_contents->OnCreateWindow(target_url, frame_name, disposition,
-                                     additional_features, body);
+    api_web_contents->OnCreateWindow(target_url,
+                                     frame_name,
+                                     disposition,
+                                     features,
+                                     body);
   }
-
-  return false;
 }
 
 void App::AllowCertificateError(
@@ -724,35 +643,22 @@ void App::AllowCertificateError(
 void App::SelectClientCertificate(
     content::WebContents* web_contents,
     net::SSLCertRequestInfo* cert_request_info,
-    net::ClientCertIdentityList identities,
     std::unique_ptr<content::ClientCertificateDelegate> delegate) {
   std::shared_ptr<content::ClientCertificateDelegate>
       shared_delegate(delegate.release());
-
-  // Convert the ClientCertIdentityList to a CertificateList
-  // to avoid changes in the API.
-  auto client_certs = net::CertificateList();
-  for (const std::unique_ptr<net::ClientCertIdentity>& identity : identities)
-    client_certs.push_back(identity->certificate());
-
-  auto shared_identities =
-      std::make_shared<net::ClientCertIdentityList>(std::move(identities));
-
   bool prevent_default =
       Emit("select-client-certificate",
            WebContents::CreateFrom(isolate(), web_contents),
-           cert_request_info->host_and_port.ToString(), std::move(client_certs),
-           base::Bind(&OnClientCertificateSelected, isolate(), shared_delegate,
-                      shared_identities));
+           cert_request_info->host_and_port.ToString(),
+           cert_request_info->client_certs,
+           base::Bind(&OnClientCertificateSelected,
+                      isolate(),
+                      shared_delegate));
 
   // Default to first certificate from the platform store.
-  if (!prevent_default) {
-    scoped_refptr<net::X509Certificate> cert =
-        (*shared_identities)[0]->certificate();
-    net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
-        std::move((*shared_identities)[0]),
-        base::Bind(&GotPrivateKey, shared_delegate, std::move(cert)));
-  }
+  if (!prevent_default)
+    shared_delegate->ContinueWithCertificate(
+        cert_request_info->client_certs[0].get());
 }
 
 void App::OnGpuProcessCrashed(base::TerminationStatus status) {
@@ -760,54 +666,6 @@ void App::OnGpuProcessCrashed(base::TerminationStatus status) {
     status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
 }
 
-void App::BrowserChildProcessLaunchedAndConnected(
-    const content::ChildProcessData& data) {
-  ChildProcessLaunched(data.process_type, data.handle);
-}
-
-void App::BrowserChildProcessHostDisconnected(
-    const content::ChildProcessData& data) {
-  ChildProcessDisconnected(base::GetProcId(data.handle));
-}
-
-void App::BrowserChildProcessCrashed(const content::ChildProcessData& data,
-                                     int exit_code) {
-  ChildProcessDisconnected(base::GetProcId(data.handle));
-}
-
-void App::BrowserChildProcessKilled(const content::ChildProcessData& data,
-                                    int exit_code) {
-  ChildProcessDisconnected(base::GetProcId(data.handle));
-}
-
-void App::RenderProcessReady(content::RenderProcessHost* host) {
-  ChildProcessLaunched(content::PROCESS_TYPE_RENDERER, host->GetHandle());
-}
-
-void App::RenderProcessDisconnected(base::ProcessId host_pid) {
-  ChildProcessDisconnected(host_pid);
-}
-
-void App::ChildProcessLaunched(int process_type, base::ProcessHandle handle) {
-  auto pid = base::GetProcId(handle);
-
-#if defined(OS_MACOSX)
-  std::unique_ptr<base::ProcessMetrics> metrics(
-      base::ProcessMetrics::CreateProcessMetrics(
-          handle, content::BrowserChildProcessHost::GetPortProvider()));
-#else
-  std::unique_ptr<base::ProcessMetrics> metrics(
-      base::ProcessMetrics::CreateProcessMetrics(handle));
-#endif
-  std::unique_ptr<atom::ProcessMetric> process_metric(
-      new atom::ProcessMetric(process_type, pid, std::move(metrics)));
-  app_metrics_[pid] = std::move(process_metric);
-}
-
-void App::ChildProcessDisconnected(base::ProcessId pid) {
-  app_metrics_.erase(pid);
-}
-
 base::FilePath App::GetAppPath() const {
   return app_path_;
 }
@@ -851,7 +709,7 @@ void App::SetDesktopName(const std::string& desktop_name) {
 }
 
 std::string App::GetLocale() {
-  return g_browser_process->GetApplicationLocale();
+  return l10n_util::GetApplicationLocale("");
 }
 
 bool App::MakeSingleInstance(
@@ -867,10 +725,9 @@ bool App::MakeSingleInstance(
   switch (process_singleton_->NotifyOtherProcessOrCreate()) {
     case ProcessSingleton::NotifyResult::LOCK_ERROR:
     case ProcessSingleton::NotifyResult::PROFILE_IN_USE:
-    case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED: {
+    case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED:
       process_singleton_.reset();
       return true;
-    }
     case ProcessSingleton::NotifyResult::PROCESS_NONE:
     default:  // Shouldn't be needed, but VS warns if it is not there.
       return false;
@@ -897,7 +754,11 @@ bool App::Relaunch(mate::Arguments* js_args) {
   }
 
   if (!override_argv) {
+#if defined(OS_WIN)
+    const relauncher::StringVector& argv = atom::AtomCommandLine::wargv();
+#else
     const relauncher::StringVector& argv = atom::AtomCommandLine::argv();
+#endif
     return relauncher::RelaunchApp(argv);
   }
 
@@ -926,32 +787,11 @@ void App::DisableHardwareAcceleration(mate::Arguments* args) {
   content::GpuDataManager::GetInstance()->DisableHardwareAcceleration();
 }
 
-void App::DisableDomainBlockingFor3DAPIs(mate::Arguments* args) {
-  if (Browser::Get()->is_ready()) {
-    args->ThrowError(
-        "app.disableDomainBlockingFor3DAPIs() can only be called "
-        "before app is ready");
-    return;
-  }
-  content::GpuDataManagerImpl::GetInstance()
-      ->DisableDomainBlockingFor3DAPIsForTesting();
-}
-
 bool App::IsAccessibilitySupportEnabled() {
   auto ax_state = content::BrowserAccessibilityState::GetInstance();
   return ax_state->IsAccessibleBrowser();
 }
 
-void App::SetAccessibilitySupportEnabled(bool enabled) {
-  auto ax_state = content::BrowserAccessibilityState::GetInstance();
-  if (enabled) {
-    ax_state->OnScreenReaderDetected();
-  } else {
-    ax_state->DisableAccessibility();
-  }
-  Browser::Get()->OnAccessibilitySupportChanged();
-}
-
 Browser::LoginItemSettings App::GetLoginItemSettings(mate::Arguments* args) {
   Browser::LoginItemSettings options;
   args->GetNext(&options);
@@ -1083,97 +923,47 @@ void App::GetFileIcon(const base::FilePath& path,
   }
 }
 
-std::vector<mate::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
+std::vector<mate::Dictionary> App::GetAppMemoryInfo(v8::Isolate* isolate) {
+  AppIdProcessIterator process_iterator;
+  auto process_entry = process_iterator.NextProcessEntry();
   std::vector<mate::Dictionary> result;
-  int processor_count = base::SysInfo::NumberOfProcessors();
 
-  for (const auto& process_metric : app_metrics_) {
+  while (process_entry != nullptr) {
+    int64_t pid = process_entry->pid();
+    auto process = base::Process::OpenWithExtraPrivileges(pid);
+
+#if defined(OS_MACOSX)
+    std::unique_ptr<base::ProcessMetrics> metrics(
+      base::ProcessMetrics::CreateProcessMetrics(
+        process.Handle(), content::BrowserChildProcessHost::GetPortProvider()));
+#else
+    std::unique_ptr<base::ProcessMetrics> metrics(
+      base::ProcessMetrics::CreateProcessMetrics(process.Handle()));
+#endif
+
     mate::Dictionary pid_dict = mate::Dictionary::CreateEmpty(isolate);
     mate::Dictionary memory_dict = mate::Dictionary::CreateEmpty(isolate);
-    mate::Dictionary cpu_dict = mate::Dictionary::CreateEmpty(isolate);
 
     memory_dict.Set("workingSetSize",
-        static_cast<double>(
-            process_metric.second->metrics->GetWorkingSetSize() >> 10));
+            static_cast<double>(metrics->GetWorkingSetSize() >> 10));
     memory_dict.Set("peakWorkingSetSize",
-        static_cast<double>(
-            process_metric.second->metrics->GetPeakWorkingSetSize() >> 10));
+            static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
 
     size_t private_bytes, shared_bytes;
-    if (process_metric.second->metrics->GetMemoryBytes(&private_bytes,
-                                                       &shared_bytes)) {
+    if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
       memory_dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
       memory_dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
     }
 
     pid_dict.Set("memory", memory_dict);
-    cpu_dict.Set("percentCPUUsage",
-        process_metric.second->metrics->GetPlatformIndependentCPUUsage()
-        / processor_count);
-
-#if !defined(OS_WIN)
-    cpu_dict.Set("idleWakeupsPerSecond",
-        process_metric.second->metrics->GetIdleWakeupsPerSecond());
-#else
-    // Chrome's underlying process_metrics.cc will throw a non-fatal warning
-    // that this method isn't implemented on Windows, so set it to 0 instead
-    // of calling it
-    cpu_dict.Set("idleWakeupsPerSecond", 0);
-#endif
-
-    pid_dict.Set("cpu", cpu_dict);
-    pid_dict.Set("pid", process_metric.second->pid);
-    pid_dict.Set("type",
-        content::GetProcessTypeNameInEnglish(process_metric.second->type));
+    pid_dict.Set("pid", pid);
     result.push_back(pid_dict);
+    process_entry = process_iterator.NextProcessEntry();
   }
 
   return result;
 }
 
-v8::Local<v8::Value> App::GetGPUFeatureStatus(v8::Isolate* isolate) {
-  auto status = content::GetFeatureStatus();
-  return mate::ConvertToV8(isolate,
-                           status ? *status : base::DictionaryValue());
-}
-
-void App::EnableMixedSandbox(mate::Arguments* args) {
-  if (Browser::Get()->is_ready()) {
-    args->ThrowError("app.enableMixedSandbox() can only be called "
-                     "before app is ready");
-    return;
-  }
-
-  auto command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(::switches::kNoSandbox)) {
-#if defined(OS_WIN)
-    const base::CommandLine::CharType* noSandboxArg = L"--no-sandbox";
-#else
-    const base::CommandLine::CharType* noSandboxArg = "--no-sandbox";
-#endif
-
-    // Remove the --no-sandbox switch
-    base::CommandLine::StringVector modified_command_line;
-    for (auto& arg : command_line->argv()) {
-      if (arg.compare(noSandboxArg) != 0) {
-        modified_command_line.push_back(arg);
-      }
-    }
-    command_line->InitFromArgv(modified_command_line);
-  }
-  command_line->AppendSwitch(switches::kEnableMixedSandbox);
-}
-
-#if defined(OS_MACOSX)
-bool App::MoveToApplicationsFolder(mate::Arguments* args) {
-  return ui::cocoa::AtomBundleMover::Move(args);
-}
-
-bool App::IsInApplicationsFolder() {
-  return ui::cocoa::AtomBundleMover::IsCurrentAppInApplicationsFolder();
-}
-#endif
-
 // static
 mate::Handle<App> App::Create(v8::Isolate* isolate) {
   return mate::CreateHandle(isolate, new App(isolate));
@@ -1217,10 +1007,6 @@ void App::BuildPrototype(
                  base::Bind(&Browser::SetUserActivity, browser))
       .SetMethod("getCurrentActivityType",
                  base::Bind(&Browser::GetCurrentActivityType, browser))
-      .SetMethod("invalidateCurrentActivity",
-                 base::Bind(&Browser::InvalidateCurrentActivity, browser))
-      .SetMethod("updateCurrentActivity",
-                 base::Bind(&Browser::UpdateCurrentActivity, browser))
       .SetMethod("setAboutPanelOptions",
                  base::Bind(&Browser::SetAboutPanelOptions, browser))
 #endif
@@ -1247,25 +1033,10 @@ void App::BuildPrototype(
       .SetMethod("relaunch", &App::Relaunch)
       .SetMethod("isAccessibilitySupportEnabled",
                  &App::IsAccessibilitySupportEnabled)
-      .SetMethod("setAccessibilitySupportEnabled",
-                 &App::SetAccessibilitySupportEnabled)
       .SetMethod("disableHardwareAcceleration",
                  &App::DisableHardwareAcceleration)
-      .SetMethod("disableDomainBlockingFor3DAPIs",
-                 &App::DisableDomainBlockingFor3DAPIs)
       .SetMethod("getFileIcon", &App::GetFileIcon)
-      .SetMethod("getAppMetrics", &App::GetAppMetrics)
-      .SetMethod("getGPUFeatureStatus", &App::GetGPUFeatureStatus)
-      // TODO(juturu): Remove in 2.0, deprecate before then with warnings
-      #if defined(OS_MACOSX)
-      .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
-      .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
-      #endif
-      #if defined(MAS_BUILD)
-      .SetMethod("startAccessingSecurityScopedResource",
-                 &App::StartAccessingSecurityScopedResource)
-      #endif
-      .SetMethod("enableMixedSandbox", &App::EnableMixedSandbox);
+      .SetMethod("getAppMemoryInfo", &App::GetAppMemoryInfo);
 }
 
 }  // namespace api

atom/browser/api/atom_api_app.h

@@ -5,9 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_APP_H_
 #define ATOM_BROWSER_API_ATOM_API_APP_H_
 
-#include <memory>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "atom/browser/api/event_emitter.h"
@@ -19,13 +17,10 @@
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/process_singleton.h"
-#include "content/public/browser/browser_child_process_observer.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
-#include "content/public/browser/render_process_host.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/handle.h"
 #include "net/base/completion_callback.h"
-#include "net/ssl/client_cert_identity.h"
 
 #if defined(USE_NSS_CERTS)
 #include "chrome/browser/certificate_manager_model.h"
@@ -45,27 +40,12 @@ namespace atom {
 enum class JumpListResult : int;
 #endif
 
-struct ProcessMetric {
-  int type;
-  base::ProcessId pid;
-  std::unique_ptr<base::ProcessMetrics> metrics;
-
-  ProcessMetric(int type,
-                base::ProcessId pid,
-                std::unique_ptr<base::ProcessMetrics> metrics) {
-    this->type = type;
-    this->pid = pid;
-    this->metrics = std::move(metrics);
-  }
-};
-
 namespace api {
 
 class App : public AtomBrowserClient::Delegate,
             public mate::EventEmitter<App>,
             public BrowserObserver,
-            public content::GpuDataManagerObserver,
-            public content::BrowserChildProcessObserver {
+            public content::GpuDataManagerObserver {
  public:
   using FileIconCallback = base::Callback<void(v8::Local<v8::Value>,
                                                const gfx::Image&)>;
@@ -75,6 +55,16 @@ class App : public AtomBrowserClient::Delegate,
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype);
 
+  // Called when window with disposition needs to be created.
+  void OnCreateWindow(
+      const GURL& target_url,
+      const std::string& frame_name,
+      WindowOpenDisposition disposition,
+      const std::vector<std::string>& features,
+      const scoped_refptr<content::ResourceRequestBodyImpl>& body,
+      int render_process_id,
+      int render_frame_id);
+
 #if defined(USE_NSS_CERTS)
   void OnCertificateManagerModelCreated(
       std::unique_ptr<base::DictionaryValue> options,
@@ -83,9 +73,6 @@ class App : public AtomBrowserClient::Delegate,
 #endif
 
   base::FilePath GetAppPath() const;
-  void RenderProcessReady(content::RenderProcessHost* host);
-  void RenderProcessDisconnected(base::ProcessId host_pid);
-  void PreMainMessageLoopRun();
 
  protected:
   explicit App(v8::Isolate* isolate);
@@ -104,26 +91,11 @@ class App : public AtomBrowserClient::Delegate,
   void OnLogin(LoginHandler* login_handler,
                const base::DictionaryValue& request_details) override;
   void OnAccessibilitySupportChanged() override;
-  void OnPreMainMessageLoopRun() override;
 #if defined(OS_MACOSX)
-  void OnWillContinueUserActivity(
-      bool* prevent_default,
-      const std::string& type) override;
-  void OnDidFailToContinueUserActivity(
-      const std::string& type,
-      const std::string& error) override;
   void OnContinueUserActivity(
       bool* prevent_default,
       const std::string& type,
       const base::DictionaryValue& user_info) override;
-  void OnUserActivityWasContinued(
-      const std::string& type,
-      const base::DictionaryValue& user_info) override;
-  void OnUpdateUserActivityState(
-      bool* prevent_default,
-      const std::string& type,
-      const base::DictionaryValue& user_info) override;
-  void OnNewWindowForTab() override;
 #endif
 
   // content::ContentBrowserClient:
@@ -141,41 +113,13 @@ class App : public AtomBrowserClient::Delegate,
   void SelectClientCertificate(
       content::WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
-      net::ClientCertIdentityList client_certs,
       std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
-  bool CanCreateWindow(content::RenderFrameHost* opener,
-                       const GURL& opener_url,
-                       const GURL& opener_top_level_frame_url,
-                       const GURL& source_origin,
-                       content::mojom::WindowContainerType container_type,
-                       const GURL& target_url,
-                       const content::Referrer& referrer,
-                       const std::string& frame_name,
-                       WindowOpenDisposition disposition,
-                       const blink::mojom::WindowFeatures& features,
-                       const std::vector<std::string>& additional_features,
-                       const scoped_refptr<content::ResourceRequestBody>& body,
-                       bool user_gesture,
-                       bool opener_suppressed,
-                       bool* no_javascript_access) override;
 
   // content::GpuDataManagerObserver:
   void OnGpuProcessCrashed(base::TerminationStatus status) override;
 
-  // content::BrowserChildProcessObserver:
-  void BrowserChildProcessLaunchedAndConnected(
-      const content::ChildProcessData& data) override;
-  void BrowserChildProcessHostDisconnected(
-      const content::ChildProcessData& data) override;
-  void BrowserChildProcessCrashed(
-      const content::ChildProcessData& data, int exit_code) override;
-  void BrowserChildProcessKilled(
-      const content::ChildProcessData& data, int exit_code) override;
-
  private:
   void SetAppPath(const base::FilePath& app_path);
-  void ChildProcessLaunched(int process_type, base::ProcessHandle handle);
-  void ChildProcessDisconnected(base::ProcessId pid);
 
   // Get/Set the pre-defined path in PathService.
   base::FilePath GetPath(mate::Arguments* args, const std::string& name);
@@ -190,9 +134,7 @@ class App : public AtomBrowserClient::Delegate,
   void ReleaseSingleInstance();
   bool Relaunch(mate::Arguments* args);
   void DisableHardwareAcceleration(mate::Arguments* args);
-  void DisableDomainBlockingFor3DAPIs(mate::Arguments* args);
   bool IsAccessibilitySupportEnabled();
-  void SetAccessibilitySupportEnabled(bool enabled);
   Browser::LoginItemSettings GetLoginItemSettings(mate::Arguments* args);
 #if defined(USE_NSS_CERTS)
   void ImportCertificate(const base::DictionaryValue& options,
@@ -201,18 +143,7 @@ class App : public AtomBrowserClient::Delegate,
   void GetFileIcon(const base::FilePath& path,
                    mate::Arguments* args);
 
-  std::vector<mate::Dictionary> GetAppMetrics(v8::Isolate* isolate);
-  v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate);
-  void EnableMixedSandbox(mate::Arguments* args);
-
-#if defined(OS_MACOSX)
-  bool MoveToApplicationsFolder(mate::Arguments* args);
-  bool IsInApplicationsFolder();
-#endif
-#if defined(MAS_BUILD)
-  base::Callback<void()> StartAccessingSecurityScopedResource(
-    mate::Arguments* args);
-#endif
+  std::vector<mate::Dictionary> GetAppMemoryInfo(v8::Isolate* isolate);
 
 #if defined(OS_WIN)
   // Get the current Jump List settings.
@@ -233,11 +164,6 @@ class App : public AtomBrowserClient::Delegate,
 
   base::FilePath app_path_;
 
-  using ProcessMetricMap =
-      std::unordered_map<base::ProcessId,
-                         std::unique_ptr<atom::ProcessMetric>>;
-  ProcessMetricMap app_metrics_;
-
   DISALLOW_COPY_AND_ASSIGN(App);
 };
 

atom/browser/api/atom_api_app_mas.mm

@@ -1,59 +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/api/atom_api_app.h"
-
-#import <Cocoa/Cocoa.h>
-
-#include "base/strings/sys_string_conversions.h"
-
-namespace atom {
-
-namespace api {
-
-// Callback passed to js which will stop accessing the given bookmark.
-void OnStopAccessingSecurityScopedResource(NSURL* bookmarkUrl) {
-  [bookmarkUrl stopAccessingSecurityScopedResource];
-  [bookmarkUrl release];
-}
-
-// Get base64 encoded NSData, create a bookmark for it and start accessing it.
-base::Callback<void ()> App::StartAccessingSecurityScopedResource(mate::Arguments* args) {
-  std::string data;
-  args->GetNext(&data);
-  NSString *base64str = base::SysUTF8ToNSString(data);
-  NSData *bookmarkData = [[NSData alloc] initWithBase64EncodedString: base64str options: 0];
-
-  // Create bookmarkUrl from NSData.
-  BOOL isStale = false;
-  NSError *error = nil;
-  NSURL *bookmarkUrl = [NSURL URLByResolvingBookmarkData: bookmarkData
-                                                 options: NSURLBookmarkResolutionWithSecurityScope
-                                           relativeToURL: nil
-                                     bookmarkDataIsStale: &isStale
-                                                   error: &error];
-
-  if (error != nil) {
-    NSString *err = [NSString stringWithFormat: @"NSError: %@ %@", error, [error userInfo]];
-    args->ThrowError(base::SysNSStringToUTF8(err));
-  }
-
-  if (isStale) {
-    args->ThrowError("bookmarkDataIsStale - try recreating the bookmark");
-  }
-
-  if (error == nil && isStale == false) {
-    [bookmarkUrl startAccessingSecurityScopedResource];
-  }
-
-  // Stop the NSURL from being GC'd.
-  [bookmarkUrl retain];
-
-  // Return a js callback which will close the bookmark.
-  return base::Bind(&OnStopAccessingSecurityScopedResource, bookmarkUrl);
-}
-
-} // namespace atom
-
-} // namespace api

atom/browser/api/atom_api_auto_updater.cc

@@ -57,23 +57,6 @@ void AutoUpdater::OnError(const std::string& message) {
       message);
 }
 
-void AutoUpdater::OnError(const std::string& message,
-                          const int code, const std::string& domain) {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
-  auto errorObject = error->ToObject(
-    isolate()->GetCurrentContext()).ToLocalChecked();
-
-  // add two new params for better error handling
-  errorObject->Set(mate::StringToV8(isolate(), "code"),
-                   v8::Integer::New(isolate(), code));
-  errorObject->Set(mate::StringToV8(isolate(), "domain"),
-                   mate::StringToV8(isolate(), domain));
-
-  mate::EmitEvent(isolate(), GetWrapper(), "error", errorObject, message);
-}
-
 void AutoUpdater::OnCheckingForUpdate() {
   Emit("checking-for-update");
 }
@@ -99,8 +82,10 @@ void AutoUpdater::OnWindowAllClosed() {
   QuitAndInstall();
 }
 
-void AutoUpdater::SetFeedURL(mate::Arguments* args) {
-  auto_updater::AutoUpdater::SetFeedURL(args);
+void AutoUpdater::SetFeedURL(const std::string& url, mate::Arguments* args) {
+  auto_updater::AutoUpdater::HeaderMap headers;
+  args->GetNext(&headers);
+  auto_updater::AutoUpdater::SetFeedURL(url, headers);
 }
 
 void AutoUpdater::QuitAndInstall() {

atom/browser/api/atom_api_auto_updater.h

@@ -32,8 +32,6 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
 
   // Delegate implementations.
   void OnError(const std::string& error) override;
-  void OnError(const std::string& message, const int code,
-               const std::string& domain);
   void OnCheckingForUpdate() override;
   void OnUpdateAvailable() override;
   void OnUpdateNotAvailable() override;
@@ -47,7 +45,7 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
 
  private:
   std::string GetFeedURL();
-  void SetFeedURL(mate::Arguments* args);
+  void SetFeedURL(const std::string& url, mate::Arguments* args);
   void QuitAndInstall();
 
   DISALLOW_COPY_AND_ASSIGN(AutoUpdater);

atom/browser/api/atom_api_browser_view.cc

@@ -114,7 +114,7 @@ void BrowserView::SetBackgroundColor(const std::string& color_name) {
   view_->SetBackgroundColor(ParseHexColor(color_name));
 }
 
-v8::Local<v8::Value> BrowserView::GetWebContents() {
+v8::Local<v8::Value> BrowserView::WebContents() {
   if (web_contents_.IsEmpty()) {
     return v8::Null(isolate());
   }
@@ -131,7 +131,7 @@ void BrowserView::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setAutoResize", &BrowserView::SetAutoResize)
       .SetMethod("setBounds", &BrowserView::SetBounds)
       .SetMethod("setBackgroundColor", &BrowserView::SetBackgroundColor)
-      .SetProperty("webContents", &BrowserView::GetWebContents)
+      .SetProperty("webContents", &BrowserView::WebContents)
       .SetProperty("id", &BrowserView::ID);
 }
 
@@ -152,10 +152,7 @@ void Initialize(v8::Local<v8::Object> exports,
 
   mate::Dictionary browser_view(
       isolate, BrowserView::GetConstructor(isolate)->GetFunction());
-  browser_view.SetMethod("fromId",
-                          &mate::TrackableObject<BrowserView>::FromWeakMapID);
-  browser_view.SetMethod("getAllViews",
-                          &mate::TrackableObject<BrowserView>::GetAll);
+
   mate::Dictionary dict(isolate, exports);
   dict.Set("BrowserView", browser_view);
 }

atom/browser/api/atom_api_browser_view.h

@@ -36,7 +36,6 @@ class BrowserView : public mate::TrackableObject<BrowserView> {
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype);
 
-  WebContents* web_contents() const { return api_web_contents_; }
   NativeBrowserView* view() const { return view_.get(); }
 
   int32_t ID() const;
@@ -56,7 +55,7 @@ class BrowserView : public mate::TrackableObject<BrowserView> {
   void SetBounds(const gfx::Rect& bounds);
   void SetBackgroundColor(const std::string& color_name);
 
-  v8::Local<v8::Value> GetWebContents();
+  v8::Local<v8::Value> WebContents();
 
   v8::Global<v8::Value> web_contents_;
   class WebContents* api_web_contents_;

atom/browser/api/atom_api_cookies.cc

@@ -62,10 +62,6 @@ struct Converter<net::CookieStore::ChangeCause> {
     switch (val) {
       case net::CookieStore::ChangeCause::INSERTED:
       case net::CookieStore::ChangeCause::EXPLICIT:
-      case net::CookieStore::ChangeCause::EXPLICIT_DELETE_BETWEEN:
-      case net::CookieStore::ChangeCause::EXPLICIT_DELETE_PREDICATE:
-      case net::CookieStore::ChangeCause::EXPLICIT_DELETE_SINGLE:
-      case net::CookieStore::ChangeCause::EXPLICIT_DELETE_CANONICAL:
         return mate::StringToV8(isolate, "explicit");
       case net::CookieStore::ChangeCause::OVERWRITE:
         return mate::StringToV8(isolate, "overwrite");
@@ -232,8 +228,8 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
   GetCookieStore(getter)->SetCookieWithDetailsAsync(
       GURL(url), name, value, domain, path, creation_time,
       expiration_time, last_access_time, secure, http_only,
-      net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT,
-      base::Bind(OnSetCookie, callback));
+      net::CookieSameSite::DEFAULT_MODE, false,
+      net::COOKIE_PRIORITY_DEFAULT, base::Bind(OnSetCookie, callback));
 }
 
 }  // namespace

atom/browser/api/atom_api_debugger.cc

@@ -9,9 +9,7 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/web_contents.h"
 #include "native_mate/dictionary.h"
@@ -49,11 +47,20 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
 
-  std::unique_ptr<base::Value> parsed_message = base::JSONReader::Read(message);
-  if (!parsed_message || !parsed_message->is_dict())
+  v8::Local<v8::String> local_message =
+      v8::String::NewFromUtf8(isolate(), message.data());
+  v8::MaybeLocal<v8::Value> parsed_message = v8::JSON::Parse(
+      isolate()->GetCurrentContext(), local_message);
+  if (parsed_message.IsEmpty()) {
     return;
-  base::DictionaryValue* dict =
-      static_cast<base::DictionaryValue*>(parsed_message.get());
+  }
+
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+  if (!mate::ConvertFromV8(isolate(), parsed_message.ToLocalChecked(),
+                           dict.get())) {
+    return;
+  }
+
   int id;
   if (!dict->GetInteger("id", &id)) {
     std::string method;
@@ -136,7 +143,7 @@ void Debugger::SendCommand(mate::Arguments* args) {
   request.SetInteger("id", request_id);
   request.SetString("method", method);
   if (!command_params.empty())
-    request.Set("params", base::WrapUnique(command_params.DeepCopy()));
+    request.Set("params", command_params.DeepCopy());
 
   std::string json_args;
   base::JSONWriter::Write(request, &json_args);

atom/browser/api/atom_api_desktop_capturer.cc

@@ -4,13 +4,10 @@
 
 #include "atom/browser/api/atom_api_desktop_capturer.h"
 
-using base::PlatformThreadRef;
-
 #include "atom/common/api/atom_api_native_image.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/desktop_media_list.h"
-#include "content/public/browser/desktop_capture.h"
 #include "native_mate/dictionary.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
@@ -51,7 +48,17 @@ void DesktopCapturer::StartHandling(bool capture_window,
                                     bool capture_screen,
                                     const gfx::Size& thumbnail_size) {
   webrtc::DesktopCaptureOptions options =
-    content::CreateDesktopCaptureOptions();
+      webrtc::DesktopCaptureOptions::CreateDefault();
+
+#if defined(OS_WIN)
+  // On windows, desktop effects (e.g. Aero) will be disabled when the Desktop
+  // capture API is active by default.
+  // We keep the desktop effects in most times. Howerver, the screen still
+  // fickers when the API is capturing the window due to limitation of current
+  // implemetation. This is a known and wontFix issue in webrtc (see:
+  // http://code.google.com/p/webrtc/issues/detail?id=3373)
+  options.set_disable_effects(false);
+#endif
 
   std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
       capture_screen ? webrtc::DesktopCapturer::CreateScreenCapturer(options)

atom/browser/api/atom_api_dialog.cc

@@ -54,9 +54,6 @@ struct Converter<file_dialog::DialogSettings> {
     dict.Get("filters", &(out->filters));
     dict.Get("properties", &(out->properties));
     dict.Get("showsTagField", &(out->shows_tag_field));
-    #if defined(MAS_BUILD)
-    dict.Get("securityScopedBookmarks", &(out->security_scoped_bookmarks));
-    #endif
     return true;
   }
 };

atom/browser/api/atom_api_in_app_purchase.cc

@@ -1,115 +0,0 @@
-// Copyright (c) 2017 Amaplex Software, 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_in_app_purchase.h"
-
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "atom/common/native_mate_converters/callback.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-namespace mate {
-
-template <>
-struct Converter<in_app_purchase::Payment> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const in_app_purchase::Payment& payment) {
-    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-    dict.SetHidden("simple", true);
-    dict.Set("productIdentifier", payment.productIdentifier);
-    dict.Set("quantity", payment.quantity);
-    return dict.GetHandle();
-  }
-};
-
-template <>
-struct Converter<in_app_purchase::Transaction> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const in_app_purchase::Transaction& val) {
-    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-    dict.SetHidden("simple", true);
-    dict.Set("transactionIdentifier", val.transactionIdentifier);
-    dict.Set("transactionDate", val.transactionDate);
-    dict.Set("originalTransactionIdentifier",
-             val.originalTransactionIdentifier);
-    dict.Set("transactionState", val.transactionState);
-    dict.Set("errorCode", val.errorCode);
-    dict.Set("errorMessage", val.errorMessage);
-    dict.Set("payment", val.payment);
-    return dict.GetHandle();
-  }
-};
-
-}  // namespace mate
-
-namespace atom {
-
-namespace api {
-
-#if defined(OS_MACOSX)
-// static
-mate::Handle<InAppPurchase> InAppPurchase::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new InAppPurchase(isolate));
-}
-
-// static
-void InAppPurchase::BuildPrototype(v8::Isolate* isolate,
-                                   v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "InAppPurchase"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("canMakePayments", &in_app_purchase::CanMakePayments)
-      .SetMethod("getReceiptURL", &in_app_purchase::GetReceiptURL)
-      .SetMethod("purchaseProduct", &InAppPurchase::PurchaseProduct);
-}
-
-InAppPurchase::InAppPurchase(v8::Isolate* isolate) {
-  Init(isolate);
-}
-
-InAppPurchase::~InAppPurchase() {
-}
-
-void InAppPurchase::PurchaseProduct(const std::string& product_id,
-                                    mate::Arguments* args) {
-  int quantity = 1;
-  in_app_purchase::InAppPurchaseCallback callback;
-  args->GetNext(&quantity);
-  args->GetNext(&callback);
-  in_app_purchase::PurchaseProduct(product_id, quantity, callback);
-}
-
-void InAppPurchase::OnTransactionsUpdated(
-    const std::vector<in_app_purchase::Transaction>& transactions) {
-  Emit("transactions-updated", transactions);
-}
-#endif
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::InAppPurchase;
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-#if defined(OS_MACOSX)
-  v8::Isolate* isolate = context->GetIsolate();
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("inAppPurchase", InAppPurchase::Create(isolate));
-  dict.Set("InAppPurchase",
-           InAppPurchase::GetConstructor(isolate)->GetFunction());
-#endif
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_in_app_purchase, Initialize)

atom/browser/api/atom_api_in_app_purchase.h

@@ -1,46 +0,0 @@
-// Copyright (c) 2017 Amaplex Software, 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_IN_APP_PURCHASE_H_
-#define ATOM_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
-
-#include <string>
-#include <vector>
-
-#include "atom/browser/api/event_emitter.h"
-#include "atom/browser/mac/in_app_purchase.h"
-#include "atom/browser/mac/in_app_purchase_observer.h"
-#include "native_mate/handle.h"
-
-namespace atom {
-
-namespace api {
-
-class InAppPurchase: public mate::EventEmitter<InAppPurchase>,
-                     public in_app_purchase::TransactionObserver {
- public:
-  static mate::Handle<InAppPurchase> Create(v8::Isolate* isolate);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
- protected:
-  explicit InAppPurchase(v8::Isolate* isolate);
-  ~InAppPurchase() override;
-
-  void PurchaseProduct(const std::string& product_id, mate::Arguments* args);
-
-  // TransactionObserver:
-  void OnTransactionsUpdated(
-      const std::vector<in_app_purchase::Transaction>& transactions) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(InAppPurchase);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_

atom/browser/api/atom_api_menu.cc

@@ -23,13 +23,9 @@ Menu::Menu(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
     : model_(new AtomMenuModel(this)),
       parent_(nullptr) {
   InitWith(isolate, wrapper);
-  model_->AddObserver(this);
 }
 
 Menu::~Menu() {
-  if (model_) {
-    model_->RemoveObserver(this);
-  }
 }
 
 void Menu::AfterInit(v8::Isolate* isolate) {
@@ -47,21 +43,15 @@ void Menu::AfterInit(v8::Isolate* isolate) {
 }
 
 bool Menu::IsCommandIdChecked(int command_id) const {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  return is_checked_.Run(GetWrapper(), command_id);
+  return is_checked_.Run(command_id);
 }
 
 bool Menu::IsCommandIdEnabled(int command_id) const {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  return is_enabled_.Run(GetWrapper(), command_id);
+  return is_enabled_.Run(command_id);
 }
 
 bool Menu::IsCommandIdVisible(int command_id) const {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  return is_visible_.Run(GetWrapper(), command_id);
+  return is_visible_.Run(command_id);
 }
 
 bool Menu::GetAcceleratorForCommandIdWithParams(
@@ -71,23 +61,18 @@ bool Menu::GetAcceleratorForCommandIdWithParams(
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Local<v8::Value> val = get_accelerator_.Run(
-      GetWrapper(), command_id, use_default_accelerator);
+      command_id, use_default_accelerator);
   return mate::ConvertFromV8(isolate(), val, accelerator);
 }
 
 void Menu::ExecuteCommand(int command_id, int flags) {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
   execute_command_.Run(
-      GetWrapper(),
       mate::internal::CreateEventFromFlags(isolate(), flags),
       command_id);
 }
 
 void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  menu_will_show_.Run(GetWrapper());
+  menu_will_show_.Run();
 }
 
 void Menu::InsertItemAt(
@@ -168,14 +153,6 @@ bool Menu::IsVisibleAt(int index) const {
   return model_->IsVisibleAt(index);
 }
 
-void Menu::OnMenuWillClose() {
-  Emit("menu-will-close");
-}
-
-void Menu::OnMenuWillShow() {
-  Emit("menu-will-show");
-}
-
 // static
 void Menu::BuildPrototype(v8::Isolate* isolate,
                           v8::Local<v8::FunctionTemplate> prototype) {

atom/browser/api/atom_api_menu.h

@@ -18,8 +18,7 @@ namespace atom {
 namespace api {
 
 class Menu : public mate::TrackableObject<Menu>,
-              public AtomMenuModel::Delegate,
-              public AtomMenuModel::Observer {
+             public AtomMenuModel::Delegate {
  public:
   static mate::WrappableBase* New(mate::Arguments* args);
 
@@ -54,17 +53,13 @@ class Menu : public mate::TrackableObject<Menu>,
   void ExecuteCommand(int command_id, int event_flags) override;
   void MenuWillShow(ui::SimpleMenuModel* source) override;
 
-  virtual void PopupAt(Window* window, int x, int y, int positioning_item,
-                       const base::Closure& callback) = 0;
+  virtual void PopupAt(
+      Window* window, int x, int y, int positioning_item, bool async) = 0;
   virtual void ClosePopupAt(int32_t window_id) = 0;
 
   std::unique_ptr<AtomMenuModel> model_;
   Menu* parent_;
 
-  // Observable:
-  void OnMenuWillClose() override;
-  void OnMenuWillShow() override;
-
  private:
   void InsertItemAt(int index, int command_id, const base::string16& label);
   void InsertSeparatorAt(int index);
@@ -93,14 +88,12 @@ class Menu : public mate::TrackableObject<Menu>,
   bool IsVisibleAt(int index) const;
 
   // Stored delegate methods.
-  base::Callback<bool(v8::Local<v8::Value>, int)> is_checked_;
-  base::Callback<bool(v8::Local<v8::Value>, int)> is_enabled_;
-  base::Callback<bool(v8::Local<v8::Value>, int)> is_visible_;
-  base::Callback<v8::Local<v8::Value>(v8::Local<v8::Value>, int, bool)>
-      get_accelerator_;
-  base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>, int)>
-      execute_command_;
-  base::Callback<void(v8::Local<v8::Value>)> menu_will_show_;
+  base::Callback<bool(int)> is_checked_;
+  base::Callback<bool(int)> is_enabled_;
+  base::Callback<bool(int)> is_visible_;
+  base::Callback<v8::Local<v8::Value>(int, bool)> get_accelerator_;
+  base::Callback<void(v8::Local<v8::Value>, int)> execute_command_;
+  base::Callback<void()> menu_will_show_;
 
   DISALLOW_COPY_AND_ASSIGN(Menu);
 };

atom/browser/api/atom_api_menu_mac.h

@@ -22,20 +22,17 @@ class MenuMac : public Menu {
  protected:
   MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
 
-  void PopupAt(Window* window, int x, int y, int positioning_item,
-               const base::Closure& callback) override;
+  void PopupAt(
+      Window* window, int x, int y, int positioning_item, bool async) override;
   void PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
-                 int32_t window_id,
-                 int x,
-                 int y,
-                 int positioning_item,
-                 base::Closure callback);
+                 int32_t window_id, int x, int y, int positioning_item,
+                 bool async);
   void ClosePopupAt(int32_t window_id) override;
 
  private:
   friend class Menu;
 
-  void OnClosed(int32_t window_id, base::Closure callback);
+  static void SendActionToFirstResponder(const std::string& action);
 
   scoped_nsobject<AtomMenuController> menu_controller_;
 

atom/browser/api/atom_api_menu_mac.mm

@@ -27,24 +27,24 @@ MenuMac::MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
       weak_factory_(this) {
 }
 
-void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item,
-                      const base::Closure& callback) {
+void MenuMac::PopupAt(
+    Window* window, int x, int y, int positioning_item, bool async) {
   NativeWindow* native_window = window->window();
   if (!native_window)
     return;
 
   auto popup = base::Bind(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
                           native_window->GetWeakPtr(), window->ID(), x, y,
-                          positioning_item, callback);
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, popup);
+                          positioning_item, async);
+  if (async)
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, popup);
+  else
+    popup.Run();
 }
 
 void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
-                        int32_t window_id,
-                        int x,
-                        int y,
-                        int positioning_item,
-                        base::Closure callback) {
+                        int32_t window_id, int x, int y, int positioning_item,
+                        bool async) {
   if (!native_window)
     return;
   brightray::InspectableWebContents* web_contents =
@@ -52,8 +52,8 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
   if (!web_contents)
     return;
 
-  auto close_callback = base::Bind(
-      &MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
+  auto close_callback = base::Bind(&MenuMac::ClosePopupAt,
+                                   weak_factory_.GetWeakPtr(), window_id);
   popup_controllers_[window_id] = base::scoped_nsobject<AtomMenuController>(
       [[AtomMenuController alloc] initWithModel:model()
                           useDefaultAccelerator:NO]);
@@ -92,41 +92,33 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
   if (rightmostMenuPoint > screenRight)
     position.x = position.x - [menu size].width;
 
-  [popup_controllers_[window_id] setCloseCallback:close_callback];
-  // Make sure events can be pumped while the menu is up.
-  base::MessageLoop::ScopedNestableTaskAllower allow(
-      base::MessageLoop::current());
 
-  // One of the events that could be pumped is |window.close()|.
-  // User-initiated event-tracking loops protect against this by
-  // setting flags in -[CrApplication sendEvent:], but since
-  // web-content menus are initiated by IPC message the setup has to
-  // be done manually.
-  base::mac::ScopedSendingEvent sendingEventScoper;
+  if (async) {
+    [popup_controllers_[window_id] setCloseCallback:close_callback];
+    // Make sure events can be pumped while the menu is up.
+    base::MessageLoop::ScopedNestableTaskAllower allow(
+        base::MessageLoop::current());
 
-  // Don't emit unresponsive event when showing menu.
-  atom::UnresponsiveSuppressor suppressor;
-  [menu popUpMenuPositioningItem:item atLocation:position inView:view];
-}
+    // One of the events that could be pumped is |window.close()|.
+    // User-initiated event-tracking loops protect against this by
+    // setting flags in -[CrApplication sendEvent:], but since
+    // web-content menus are initiated by IPC message the setup has to
+    // be done manually.
+    base::mac::ScopedSendingEvent sendingEventScoper;
 
-void MenuMac::ClosePopupAt(int32_t window_id) {
-  auto controller = popup_controllers_.find(window_id);
-  if (controller != popup_controllers_.end()) {
-    // Close the controller for the window.
-    [controller->second cancel];
-  } else if (window_id == -1) {
-    // Or just close all opened controllers.
-    for (auto it = popup_controllers_.begin();
-         it != popup_controllers_.end();) {
-      // The iterator is invalidated after the call.
-      [(it++)->second cancel];
-    }
+    // Don't emit unresponsive event when showing menu.
+    atom::UnresponsiveSuppressor suppressor;
+    [menu popUpMenuPositioningItem:item atLocation:position inView:view];
+  } else {
+    // Don't emit unresponsive event when showing menu.
+    atom::UnresponsiveSuppressor suppressor;
+    [menu popUpMenuPositioningItem:item atLocation:position inView:view];
+    close_callback.Run();
   }
 }
 
-void MenuMac::OnClosed(int32_t window_id, base::Closure callback) {
+void MenuMac::ClosePopupAt(int32_t window_id) {
   popup_controllers_.erase(window_id);
-  callback.Run();
 }
 
 // static

atom/browser/api/atom_api_menu_views.cc

@@ -6,8 +6,7 @@
 
 #include "atom/browser/native_window_views.h"
 #include "atom/browser/unresponsive_suppressor.h"
-#include "brightray/browser/inspectable_web_contents.h"
-#include "brightray/browser/inspectable_web_contents_view.h"
+#include "content/public/browser/render_widget_host_view.h"
 #include "ui/display/screen.h"
 
 using views::MenuRunner;
@@ -21,26 +20,30 @@ MenuViews::MenuViews(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
       weak_factory_(this) {
 }
 
-void MenuViews::PopupAt(Window* window, int x, int y, int positioning_item,
-                        const base::Closure& callback) {
+void MenuViews::PopupAt(
+    Window* window, int x, int y, int positioning_item, bool async) {
   NativeWindow* native_window = static_cast<NativeWindow*>(window->window());
   if (!native_window)
     return;
-  auto* web_contents = native_window->inspectable_web_contents();
+  content::WebContents* web_contents = native_window->web_contents();
   if (!web_contents)
     return;
+  content::RenderWidgetHostView* view = web_contents->GetRenderWidgetHostView();
+  if (!view)
+    return;
 
   // (-1, -1) means showing on mouse location.
   gfx::Point location;
   if (x == -1 || y == -1) {
     location = display::Screen::GetScreen()->GetCursorScreenPoint();
   } else {
-    auto* view = web_contents->GetView()->GetWebView();
-    gfx::Point origin = view->bounds().origin();
+    gfx::Point origin = view->GetViewBounds().origin();
     location = gfx::Point(origin.x() + x, origin.y() + y);
   }
 
   int flags = MenuRunner::CONTEXT_MENU | MenuRunner::HAS_MNEMONICS;
+  if (async)
+    flags |= MenuRunner::ASYNC;
 
   // Don't emit unresponsive event when showing menu.
   atom::UnresponsiveSuppressor suppressor;
@@ -48,34 +51,19 @@ void MenuViews::PopupAt(Window* window, int x, int y, int positioning_item,
   // Show the menu.
   int32_t window_id = window->ID();
   auto close_callback = base::Bind(
-      &MenuViews::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
+      &MenuViews::ClosePopupAt, weak_factory_.GetWeakPtr(), window_id);
   menu_runners_[window_id] = std::unique_ptr<MenuRunner>(new MenuRunner(
       model(), flags, close_callback));
-  menu_runners_[window_id]->RunMenuAt(
+  ignore_result(menu_runners_[window_id]->RunMenuAt(
       static_cast<NativeWindowViews*>(window->window())->widget(),
       NULL,
       gfx::Rect(location, gfx::Size()),
       views::MENU_ANCHOR_TOPLEFT,
-      ui::MENU_SOURCE_MOUSE);
+      ui::MENU_SOURCE_MOUSE));
 }
 
 void MenuViews::ClosePopupAt(int32_t window_id) {
-  auto runner = menu_runners_.find(window_id);
-  if (runner != menu_runners_.end()) {
-    // Close the runner for the window.
-    runner->second->Cancel();
-  } else if (window_id == -1) {
-    // Or just close all opened runners.
-    for (auto it = menu_runners_.begin(); it != menu_runners_.end();) {
-      // The iterator is invalidated after the call.
-      (it++)->second->Cancel();
-    }
-  }
-}
-
-void MenuViews::OnClosed(int32_t window_id, base::Closure callback) {
   menu_runners_.erase(window_id);
-  callback.Run();
 }
 
 // static

atom/browser/api/atom_api_menu_views.h

@@ -21,13 +21,11 @@ class MenuViews : public Menu {
   MenuViews(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
 
  protected:
-  void PopupAt(Window* window, int x, int y, int positioning_item,
-               const base::Closure& callback) override;
+  void PopupAt(
+      Window* window, int x, int y, int positioning_item, bool async) override;
   void ClosePopupAt(int32_t window_id) override;
 
  private:
-  void OnClosed(int32_t window_id, base::Closure callback);
-
   // window ID -> open context menu
   std::map<int32_t, std::unique_ptr<views::MenuRunner>> menu_runners_;
 

atom/browser/api/atom_api_notification.cc

@@ -1,273 +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 "atom/browser/api/atom_api_notification.h"
-
-#include "atom/browser/api/atom_api_menu.h"
-#include "atom/browser/browser.h"
-#include "atom/common/native_mate_converters/gfx_converter.h"
-#include "atom/common/native_mate_converters/image_converter.h"
-#include "atom/common/native_mate_converters/string16_converter.h"
-#include "base/strings/utf_string_conversions.h"
-#include "brightray/browser/browser_client.h"
-#include "native_mate/constructor.h"
-#include "native_mate/dictionary.h"
-#include "native_mate/object_template_builder.h"
-#include "url/gurl.h"
-// Must be the last in the includes list.
-// See https://github.com/electron/electron/issues/10363
-#include "atom/common/node_includes.h"
-
-namespace mate {
-template<>
-struct Converter<brightray::NotificationAction> {
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                      brightray::NotificationAction* out) {
-    mate::Dictionary dict;
-    if (!ConvertFromV8(isolate, val, &dict))
-      return false;
-
-    if (!dict.Get("type", &(out->type))) {
-      return false;
-    }
-    dict.Get("text", &(out->text));
-    return true;
-  }
-
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                    brightray::NotificationAction val) {
-    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-    dict.Set("text", val.text);
-    dict.Set("type", val.type);
-    return dict.GetHandle();
-  }
-};
-}  // namespace mate
-
-namespace atom {
-
-namespace api {
-
-Notification::Notification(v8::Isolate* isolate,
-                           v8::Local<v8::Object> wrapper,
-                           mate::Arguments* args) {
-  InitWith(isolate, wrapper);
-
-  presenter_ = brightray::BrowserClient::Get()->GetNotificationPresenter();
-
-  mate::Dictionary opts;
-  if (args->GetNext(&opts)) {
-    opts.Get("title", &title_);
-    opts.Get("subtitle", &subtitle_);
-    opts.Get("body", &body_);
-    has_icon_ = opts.Get("icon", &icon_);
-    if (has_icon_) {
-      opts.Get("icon", &icon_path_);
-    }
-    opts.Get("silent", &silent_);
-    opts.Get("replyPlaceholder", &reply_placeholder_);
-    opts.Get("hasReply", &has_reply_);
-    opts.Get("actions", &actions_);
-    opts.Get("sound", &sound_);
-    opts.Get("closeButtonText", &close_button_text_);
-  }
-}
-
-Notification::~Notification() {
-  if (notification_)
-    notification_->set_delegate(nullptr);
-}
-
-// static
-mate::WrappableBase* Notification::New(mate::Arguments* args) {
-  if (!Browser::Get()->is_ready()) {
-    args->ThrowError("Cannot create Notification before app is ready");
-    return nullptr;
-  }
-  return new Notification(args->isolate(), args->GetThis(), args);
-}
-
-// Getters
-base::string16 Notification::GetTitle() const {
-  return title_;
-}
-
-base::string16 Notification::GetSubtitle() const {
-  return subtitle_;
-}
-
-base::string16 Notification::GetBody() const {
-  return body_;
-}
-
-bool Notification::GetSilent() const {
-  return silent_;
-}
-
-bool Notification::GetHasReply() const {
-  return has_reply_;
-}
-
-base::string16 Notification::GetReplyPlaceholder() const {
-  return reply_placeholder_;
-}
-
-base::string16 Notification::GetSound() const {
-  return sound_;
-}
-
-std::vector<brightray::NotificationAction> Notification::GetActions() const {
-  return actions_;
-}
-
-base::string16 Notification::GetCloseButtonText() const {
-  return close_button_text_;
-}
-
-// Setters
-void Notification::SetTitle(const base::string16& new_title) {
-  title_ = new_title;
-}
-
-void Notification::SetSubtitle(const base::string16& new_subtitle) {
-  subtitle_ = new_subtitle;
-}
-
-void Notification::SetBody(const base::string16& new_body) {
-  body_ = new_body;
-}
-
-void Notification::SetSilent(bool new_silent) {
-  silent_ = new_silent;
-}
-
-void Notification::SetHasReply(bool new_has_reply) {
-  has_reply_ = new_has_reply;
-}
-
-void Notification::SetReplyPlaceholder(const base::string16& new_placeholder) {
-  reply_placeholder_ = new_placeholder;
-}
-
-void Notification::SetSound(const base::string16& new_sound) {
-  sound_ = new_sound;
-}
-
-void Notification::SetActions(
-  const std::vector<brightray::NotificationAction>& actions) {
-  actions_ = actions;
-}
-
-void Notification::SetCloseButtonText(const base::string16& text) {
-  close_button_text_ = text;
-}
-
-void Notification::NotificationAction(int index) {
-  Emit("action", index);
-}
-
-void Notification::NotificationClick() {
-  Emit("click");
-}
-
-void Notification::NotificationReplied(const std::string& reply) {
-  Emit("reply", reply);
-}
-
-void Notification::NotificationDisplayed() {
-  Emit("show");
-}
-
-void Notification::NotificationDestroyed() {
-}
-
-void Notification::NotificationClosed() {
-  Emit("close");
-}
-
-void Notification::Close() {
-  if (notification_) {
-    notification_->Dismiss();
-    notification_.reset();
-  }
-}
-
-// Showing notifications
-void Notification::Show() {
-  Close();
-  if (presenter_) {
-    notification_ = presenter_->CreateNotification(this);
-    if (notification_) {
-      brightray::NotificationOptions options;
-      options.title = title_;
-      options.subtitle = subtitle_;
-      options.msg = body_;
-      options.icon_url = GURL();
-      options.icon = icon_.AsBitmap();
-      options.silent = silent_;
-      options.has_reply = has_reply_;
-      options.reply_placeholder = reply_placeholder_;
-      options.actions = actions_;
-      options.sound = sound_;
-      options.close_button_text = close_button_text_;
-      notification_->Show(options);
-    }
-  }
-}
-
-bool Notification::IsSupported() {
-  return !!brightray::BrowserClient::Get()->GetNotificationPresenter();
-}
-
-// static
-void Notification::BuildPrototype(v8::Isolate* isolate,
-                                  v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Notification"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .MakeDestroyable()
-      .SetMethod("show", &Notification::Show)
-      .SetMethod("close", &Notification::Close)
-      .SetProperty("title", &Notification::GetTitle, &Notification::SetTitle)
-      .SetProperty("subtitle", &Notification::GetSubtitle,
-                   &Notification::SetSubtitle)
-      .SetProperty("body", &Notification::GetBody, &Notification::SetBody)
-      .SetProperty("silent", &Notification::GetSilent,
-                   &Notification::SetSilent)
-      .SetProperty("hasReply", &Notification::GetHasReply,
-                   &Notification::SetHasReply)
-      .SetProperty("replyPlaceholder", &Notification::GetReplyPlaceholder,
-                   &Notification::SetReplyPlaceholder)
-      .SetProperty("sound", &Notification::GetSound,
-                   &Notification::SetSound)
-      .SetProperty("actions", &Notification::GetActions,
-                   &Notification::SetActions)
-      .SetProperty("closeButtonText", &Notification::GetCloseButtonText,
-                   &Notification::SetCloseButtonText);
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::Notification;
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  v8::Isolate* isolate = context->GetIsolate();
-  Notification::SetConstructor(isolate, base::Bind(&Notification::New));
-
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("Notification",
-           Notification::GetConstructor(isolate)->GetFunction());
-
-  dict.SetMethod("isSupported", &Notification::IsSupported);
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_common_notification, Initialize)

atom/browser/api/atom_api_notification.h

@@ -1,97 +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_BROWSER_API_ATOM_API_NOTIFICATION_H_
-#define ATOM_BROWSER_API_ATOM_API_NOTIFICATION_H_
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "atom/browser/api/trackable_object.h"
-#include "base/strings/utf_string_conversions.h"
-#include "brightray/browser/notification.h"
-#include "brightray/browser/notification_delegate.h"
-#include "brightray/browser/notification_presenter.h"
-#include "native_mate/handle.h"
-#include "ui/gfx/image/image.h"
-
-namespace atom {
-
-namespace api {
-
-class Notification : public mate::TrackableObject<Notification>,
-                     public brightray::NotificationDelegate {
- public:
-  static mate::WrappableBase* New(mate::Arguments* args);
-  static bool IsSupported();
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  // NotificationDelegate:
-  void NotificationAction(int index) override;
-  void NotificationClick() override;
-  void NotificationReplied(const std::string& reply) override;
-  void NotificationDisplayed() override;
-  void NotificationDestroyed() override;
-  void NotificationClosed() override;
-
- protected:
-  Notification(v8::Isolate* isolate,
-               v8::Local<v8::Object> wrapper,
-               mate::Arguments* args);
-  ~Notification() override;
-
-  void Show();
-  void Close();
-
-  // Prop Getters
-  base::string16 GetTitle() const;
-  base::string16 GetSubtitle() const;
-  base::string16 GetBody() const;
-  bool GetSilent() const;
-  bool GetHasReply() const;
-  base::string16 GetReplyPlaceholder() const;
-  base::string16 GetSound() const;
-  std::vector<brightray::NotificationAction> GetActions() const;
-  base::string16 GetCloseButtonText() const;
-
-  // Prop Setters
-  void SetTitle(const base::string16& new_title);
-  void SetSubtitle(const base::string16& new_subtitle);
-  void SetBody(const base::string16& new_body);
-  void SetSilent(bool new_silent);
-  void SetHasReply(bool new_has_reply);
-  void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
-  void SetSound(const base::string16& sound);
-  void SetActions(const std::vector<brightray::NotificationAction>& actions);
-  void SetCloseButtonText(const base::string16& text);
-
- private:
-  base::string16 title_;
-  base::string16 subtitle_;
-  base::string16 body_;
-  gfx::Image icon_;
-  base::string16 icon_path_;
-  bool has_icon_ = false;
-  bool silent_ = false;
-  bool has_reply_ = false;
-  base::string16 reply_placeholder_;
-  base::string16 sound_;
-  std::vector<brightray::NotificationAction> actions_;
-  base::string16 close_button_text_;
-
-  brightray::NotificationPresenter* presenter_;
-
-  base::WeakPtr<brightray::Notification> notification_;
-
-  DISALLOW_COPY_AND_ASSIGN(Notification);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_NOTIFICATION_H_

atom/browser/api/atom_api_power_monitor.cc

@@ -16,13 +16,6 @@ namespace atom {
 namespace api {
 
 PowerMonitor::PowerMonitor(v8::Isolate* isolate) {
-#if defined(OS_LINUX)
-  SetShutdownHandler(base::Bind(&PowerMonitor::ShouldShutdown,
-                                base::Unretained(this)));
-#elif defined(OS_MACOSX)
-  Browser::Get()->SetShutdownHandler(base::Bind(&PowerMonitor::ShouldShutdown,
-                                                base::Unretained(this)));
-#endif
   base::PowerMonitor::Get()->AddObserver(this);
   Init(isolate);
 }
@@ -31,20 +24,6 @@ PowerMonitor::~PowerMonitor() {
   base::PowerMonitor::Get()->RemoveObserver(this);
 }
 
-bool PowerMonitor::ShouldShutdown() {
-  return !Emit("shutdown");
-}
-
-#if defined(OS_LINUX)
-void PowerMonitor::BlockShutdown() {
-  PowerObserverLinux::BlockShutdown();
-}
-
-void PowerMonitor::UnblockShutdown() {
-  PowerObserverLinux::UnblockShutdown();
-}
-#endif
-
 void PowerMonitor::OnPowerStateChange(bool on_battery_power) {
   if (on_battery_power)
     Emit("on-battery");
@@ -76,11 +55,6 @@ v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
 void PowerMonitor::BuildPrototype(
     v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
   prototype->SetClassName(mate::StringToV8(isolate, "PowerMonitor"));
-#if defined(OS_LINUX)
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("blockShutdown", &PowerMonitor::BlockShutdown)
-      .SetMethod("unblockShutdown", &PowerMonitor::UnblockShutdown);
-#endif
 }
 
 }  // namespace api
@@ -94,6 +68,10 @@ using atom::api::PowerMonitor;
 
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
+#if defined(OS_MACOSX)
+  base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
+#endif
+
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.Set("powerMonitor", PowerMonitor::Create(isolate));

atom/browser/api/atom_api_power_monitor.h

@@ -6,8 +6,8 @@
 #define ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
 
 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/lib/power_observer.h"
 #include "base/compiler_specific.h"
+#include "base/power_monitor/power_observer.h"
 #include "native_mate/handle.h"
 
 namespace atom {
@@ -15,7 +15,7 @@ namespace atom {
 namespace api {
 
 class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
-                     public PowerObserver {
+                     public base::PowerObserver {
  public:
   static v8::Local<v8::Value> Create(v8::Isolate* isolate);
 
@@ -26,15 +26,6 @@ class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
   explicit PowerMonitor(v8::Isolate* isolate);
   ~PowerMonitor() override;
 
-  // Called by native calles.
-  bool ShouldShutdown();
-
-#if defined(OS_LINUX)
-  // Private JS APIs.
-  void BlockShutdown();
-  void UnblockShutdown();
-#endif
-
   // base::PowerObserver implementations:
   void OnPowerStateChange(bool on_battery_power) override;
   void OnSuspend() override;

atom/browser/api/atom_api_power_save_blocker.h

@@ -9,8 +9,8 @@
 #include <memory>
 
 #include "atom/browser/api/trackable_object.h"
+#include "device/power_save_blocker/power_save_blocker.h"
 #include "native_mate/handle.h"
-#include "services/device/wake_lock/power_save_blocker/power_save_blocker.h"
 
 namespace mate {
 class Dictionary;

atom/browser/api/atom_api_protocol.cc

@@ -10,7 +10,6 @@
 #include "atom/browser/net/url_request_async_asar_job.h"
 #include "atom/browser/net/url_request_buffer_job.h"
 #include "atom/browser/net/url_request_fetch_job.h"
-#include "atom/browser/net/url_request_stream_job.h"
 #include "atom/browser/net/url_request_string_job.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/value_converter.h"
@@ -51,25 +50,20 @@ void RegisterStandardSchemes(const std::vector<std::string>& schemes,
                              mate::Arguments* args) {
   g_standard_schemes = schemes;
 
-  mate::Dictionary opts;
-  bool secure = false;
-  args->GetNext(&opts) && opts.Get("secure", &secure);
-
-  // Dynamically register the schemes.
   auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
   for (const std::string& scheme : schemes) {
     url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
-    if (secure) {
-      url::AddSecureScheme(scheme.c_str());
-    }
     policy->RegisterWebSafeScheme(scheme);
   }
 
-  // Add the schemes to command line switches, so child processes can also
-  // register them.
+  // add switches to register as standard
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       atom::switches::kStandardSchemes, base::JoinString(schemes, ","));
-  if (secure) {
+
+  mate::Dictionary opts;
+  bool secure = false;
+  if (args->GetNext(&opts) && opts.Get("secure", &secure) && secure) {
+    // add switches to register as secure
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       atom::switches::kSecureSchemes, base::JoinString(schemes, ","));
   }
@@ -209,8 +203,6 @@ void Protocol::BuildPrototype(
                  &Protocol::RegisterProtocol<URLRequestAsyncAsarJob>)
       .SetMethod("registerHttpProtocol",
                  &Protocol::RegisterProtocol<URLRequestFetchJob>)
-      .SetMethod("registerStreamProtocol",
-                 &Protocol::RegisterProtocol<URLRequestStreamJob>)
       .SetMethod("unregisterProtocol", &Protocol::UnregisterProtocol)
       .SetMethod("isProtocolHandled", &Protocol::IsProtocolHandled)
       .SetMethod("interceptStringProtocol",
@@ -221,8 +213,6 @@ void Protocol::BuildPrototype(
                  &Protocol::InterceptProtocol<URLRequestAsyncAsarJob>)
       .SetMethod("interceptHttpProtocol",
                  &Protocol::InterceptProtocol<URLRequestFetchJob>)
-      .SetMethod("interceptStreamProtocol",
-                 &Protocol::InterceptProtocol<URLRequestStreamJob>)
       .SetMethod("uninterceptProtocol", &Protocol::UninterceptProtocol);
 }
 

atom/browser/api/atom_api_screen.cc

@@ -120,9 +120,6 @@ void Screen::BuildPrototype(
       .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
       .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
       .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
-#if defined(OS_MACOSX)
-      .SetMethod("getMenuBarHeight", &Screen::getMenuBarHeight)
-#endif
       .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
 }
 

atom/browser/api/atom_api_screen.h

@@ -40,10 +40,6 @@ class Screen : public mate::EventEmitter<Screen>,
   display::Display GetDisplayNearestPoint(const gfx::Point& point);
   display::Display GetDisplayMatching(const gfx::Rect& match_rect);
 
-#if defined(OS_MACOSX)
-  int getMenuBarHeight();
-#endif
-
   // display::DisplayObserver:
   void OnDisplayAdded(const display::Display& new_display) override;
   void OnDisplayRemoved(const display::Display& old_display) override;

atom/browser/api/atom_api_screen_mac.mm

@@ -1,18 +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.
-
-#import "atom/browser/api/atom_api_screen.h"
-#import <Cocoa/Cocoa.h>
-
-namespace atom {
-
-namespace api {
-
-int Screen::getMenuBarHeight() {
-  return [[NSApp mainMenu] menuBarHeight];
-}
-
-}// namespace api
-
-}// namespace atom

atom/browser/api/atom_api_session.cc

@@ -17,7 +17,6 @@
 #include "atom/browser/atom_permission_manager.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/net/atom_cert_verifier.h"
-#include "atom/browser/session_preferences.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
@@ -33,7 +32,6 @@
 #include "brightray/browser/media/media_device_id_salt.h"
 #include "brightray/browser/net/devtools_network_conditions.h"
 #include "brightray/browser/net/devtools_network_controller_handle.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
@@ -214,7 +212,6 @@ struct Converter<atom::VerifyRequestParams> {
     dict.Set("hostname", val.hostname);
     dict.Set("certificate", val.certificate);
     dict.Set("verificationResult", val.default_result);
-    dict.Set("errorCode", val.error_code);
     return dict.GetHandle();
   }
 };
@@ -435,20 +432,7 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
       last_modified, offset, length, std::string(),
       content::DownloadItem::INTERRUPTED,
       content::DownloadDangerType::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      content::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false,
-      base::Time(), false,
-      std::vector<content::DownloadItem::ReceivedSlice>());
-}
-
-void SetDevToolsNetworkEmulationClientIdInIO(
-    brightray::URLRequestContextGetter* context_getter,
-    const std::string& client_id) {
-  if (!context_getter)
-    return;
-  auto network_delegate =
-      static_cast<AtomNetworkDelegate*>(context_getter->network_delegate());
-  if (network_delegate)
-    network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
+      content::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false);
 }
 
 }  // namespace
@@ -460,8 +444,6 @@ Session::Session(v8::Isolate* isolate, AtomBrowserContext* browser_context)
   content::BrowserContext::GetDownloadManager(browser_context)->
       AddObserver(this);
 
-  new SessionPreferences(browser_context);
-
   Init(isolate);
   AttachAsUserData(browser_context);
 }
@@ -560,24 +542,16 @@ void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
 
   browser_context_->network_controller_handle()->SetNetworkState(
       devtools_network_emulation_client_id_, std::move(conditions));
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(
-          &SetDevToolsNetworkEmulationClientIdInIO,
-          base::RetainedRef(browser_context_->url_request_context_getter()),
-          devtools_network_emulation_client_id_));
+  browser_context_->network_delegate()->SetDevToolsNetworkEmulationClientId(
+      devtools_network_emulation_client_id_);
 }
 
 void Session::DisableNetworkEmulation() {
   std::unique_ptr<brightray::DevToolsNetworkConditions> conditions;
   browser_context_->network_controller_handle()->SetNetworkState(
       devtools_network_emulation_client_id_, std::move(conditions));
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(
-          &SetDevToolsNetworkEmulationClientIdInIO,
-          base::RetainedRef(browser_context_->url_request_context_getter()),
-          std::string()));
+  browser_context_->network_delegate()->SetDevToolsNetworkEmulationClientId(
+      std::string());
 }
 
 void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
@@ -643,11 +617,10 @@ void Session::SetUserAgent(const std::string& user_agent,
                            mate::Arguments* args) {
   browser_context_->SetUserAgent(user_agent);
 
-  std::string accept_lang = g_browser_process->GetApplicationLocale();
+  std::string accept_lang = l10n_util::GetApplicationLocale("");
   args->GetNext(&accept_lang);
 
-  scoped_refptr<brightray::URLRequestContextGetter> getter(
-      browser_context_->GetRequestContext());
+  auto getter = browser_context_->GetRequestContext();
   getter->GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&SetUserAgentInIO, getter, accept_lang, user_agent));
@@ -703,19 +676,6 @@ void Session::CreateInterruptedDownload(const mate::Dictionary& options) {
       length, last_modified, etag, base::Time::FromDoubleT(start_time)));
 }
 
-void Session::SetPreloads(
-    const std::vector<base::FilePath::StringType>& preloads) {
-  auto* prefs = SessionPreferences::FromBrowserContext(browser_context());
-  DCHECK(prefs);
-  prefs->set_preloads(preloads);
-}
-
-std::vector<base::FilePath::StringType> Session::GetPreloads() const {
-  auto* prefs = SessionPreferences::FromBrowserContext(browser_context());
-  DCHECK(prefs);
-  return prefs->preloads();
-}
-
 v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
   if (cookies_.IsEmpty()) {
     auto handle = Cookies::Create(isolate, browser_context());
@@ -802,8 +762,6 @@ void Session::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getBlobData", &Session::GetBlobData)
       .SetMethod("createInterruptedDownload",
                  &Session::CreateInterruptedDownload)
-      .SetMethod("setPreloads", &Session::SetPreloads)
-      .SetMethod("getPreloads", &Session::GetPreloads)
       .SetProperty("cookies", &Session::Cookies)
       .SetProperty("protocol", &Session::Protocol)
       .SetProperty("webRequest", &Session::WebRequest);

atom/browser/api/atom_api_session.h

@@ -6,7 +6,6 @@
 #define ATOM_BROWSER_API_ATOM_API_SESSION_H_
 
 #include <string>
-#include <vector>
 
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/atom_blob_reader.h"
@@ -82,8 +81,6 @@ class Session: public mate::TrackableObject<Session>,
   void GetBlobData(const std::string& uuid,
                    const AtomBlobReader::CompletionCallback& callback);
   void CreateInterruptedDownload(const mate::Dictionary& options);
-  void SetPreloads(const std::vector<base::FilePath::StringType>& preloads);
-  std::vector<base::FilePath::StringType> GetPreloads() const;
   v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
   v8::Local<v8::Value> Protocol(v8::Isolate* isolate);
   v8::Local<v8::Value> WebRequest(v8::Isolate* isolate);

atom/browser/api/atom_api_system_preferences.cc

@@ -65,10 +65,8 @@ void SystemPreferences::BuildPrototype(
                  &SystemPreferences::SubscribeLocalNotification)
       .SetMethod("unsubscribeLocalNotification",
                  &SystemPreferences::UnsubscribeLocalNotification)
-      .SetMethod("registerDefaults", &SystemPreferences::RegisterDefaults)
       .SetMethod("getUserDefault", &SystemPreferences::GetUserDefault)
       .SetMethod("setUserDefault", &SystemPreferences::SetUserDefault)
-      .SetMethod("removeUserDefault", &SystemPreferences::RemoveUserDefault)
       .SetMethod("isSwipeTrackingFromScrollEventsEnabled",
                  &SystemPreferences::IsSwipeTrackingFromScrollEventsEnabled)
 #endif

atom/browser/api/atom_api_system_preferences.h

@@ -73,11 +73,9 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
   void UnsubscribeLocalNotification(int request_id);
   v8::Local<v8::Value> GetUserDefault(const std::string& name,
                                       const std::string& type);
-  void RegisterDefaults(mate::Arguments* args);
   void SetUserDefault(const std::string& name,
                       const std::string& type,
                       mate::Arguments* args);
-  void RemoveUserDefault(const std::string& name);
   bool IsSwipeTrackingFromScrollEventsEnabled();
 #endif
   bool IsDarkMode();

atom/browser/api/atom_api_system_preferences_mac.mm

@@ -144,28 +144,6 @@ v8::Local<v8::Value> SystemPreferences::GetUserDefault(
   }
 }
 
-void SystemPreferences::RegisterDefaults(mate::Arguments* args) {
-  base::DictionaryValue value;
-
-  if(!args->GetNext(&value)) {
-    args->ThrowError("Invalid userDefault data provided");
-  } else {
-    @try {
-      NSDictionary* dict = DictionaryValueToNSDictionary(value);
-      for (id key in dict) {
-        id value = [dict objectForKey:key];
-        if ([value isKindOfClass:[NSNull class]] || value == nil) {
-          args->ThrowError("Invalid userDefault data provided");
-          return;
-        }
-      }
-      [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
-    } @catch (NSException* exception) {
-      args->ThrowError("Invalid userDefault data provided");
-    }
-  }
-}
-
 void SystemPreferences::SetUserDefault(const std::string& name,
                                        const std::string& type,
                                        mate::Arguments* args) {
@@ -251,11 +229,6 @@ void SystemPreferences::SetUserDefault(const std::string& name,
   }
 }
 
-void SystemPreferences::RemoveUserDefault(const std::string& name) {
-  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-  [defaults removeObjectForKey:base::SysUTF8ToNSString(name)];
-}
-
 bool SystemPreferences::IsDarkMode() {
   NSString* mode = [[NSUserDefaults standardUserDefaults]
       stringForKey:@"AppleInterfaceStyle"];

atom/browser/api/atom_api_system_preferences_win.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include <iomanip>
-
 #include "atom/browser/api/atom_api_system_preferences.h"
 
 #include "atom/common/color_util.h"
@@ -28,10 +26,10 @@ bool SystemPreferences::IsAeroGlassEnabled() {
 }
 
 std::string hexColorDWORDToRGBA(DWORD color) {
-  DWORD rgba = color << 8 | color >> 24;
   std::ostringstream stream;
-  stream << std::hex << std::setw(8) << std::setfill('0') << rgba;
-  return stream.str();
+  stream << std::hex << color;
+  std::string hexColor = stream.str();
+  return hexColor.substr(2) + hexColor.substr(0, 2);
 }
 
 std::string SystemPreferences::GetAccentColor() {

atom/browser/api/atom_api_tray.cc

@@ -40,6 +40,8 @@ struct Converter<atom::TrayIcon::HighlightMode> {
       }
     }
 
+    // Support old boolean parameter
+    // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
     bool highlight;
     if (ConvertFromV8(isolate, val, &highlight)) {
       if (highlight)
@@ -84,10 +86,8 @@ mate::WrappableBase* Tray::New(mate::Handle<NativeImage> image,
   return new Tray(args->isolate(), args->GetThis(), image);
 }
 
-void Tray::OnClicked(const gfx::Rect& bounds,
-                     const gfx::Point& location,
-                     int modifiers) {
-  EmitWithFlags("click", modifiers, bounds, location);
+void Tray::OnClicked(const gfx::Rect& bounds, int modifiers) {
+  EmitWithFlags("click", modifiers, bounds);
 }
 
 void Tray::OnDoubleClicked(const gfx::Rect& bounds, int modifiers) {
@@ -122,18 +122,6 @@ void Tray::OnDropText(const std::string& text) {
   Emit("drop-text", text);
 }
 
-void Tray::OnMouseEntered(const gfx::Point& location, int modifiers) {
-  EmitWithFlags("mouse-enter", modifiers, location);
-}
-
-void Tray::OnMouseExited(const gfx::Point& location, int modifiers) {
-  EmitWithFlags("mouse-leave", modifiers, location);
-}
-
-void Tray::OnMouseMoved(const gfx::Point& location, int modifiers) {
-  EmitWithFlags("mouse-move", modifiers, location);
-}
-
 void Tray::OnDragEntered() {
   Emit("drag-enter");
 }

atom/browser/api/atom_api_tray.h

@@ -47,9 +47,7 @@ class Tray : public mate::TrackableObject<Tray>,
   ~Tray() override;
 
   // TrayIconObserver:
-  void OnClicked(const gfx::Rect& bounds,
-                 const gfx::Point& location,
-                 int modifiers) override;
+  void OnClicked(const gfx::Rect& bounds, int modifiers) override;
   void OnDoubleClicked(const gfx::Rect& bounds, int modifiers) override;
   void OnRightClicked(const gfx::Rect& bounds, int modifiers) override;
   void OnBalloonShow() override;
@@ -61,9 +59,6 @@ class Tray : public mate::TrackableObject<Tray>,
   void OnDragEntered() override;
   void OnDragExited() override;
   void OnDragEnded() override;
-  void OnMouseEntered(const gfx::Point& location, int modifiers) override;
-  void OnMouseExited(const gfx::Point& location, int modifiers) override;
-  void OnMouseMoved(const gfx::Point& location, int modifiers) override;
 
   void SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
   void SetPressedImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);

atom/browser/api/atom_api_web_contents.h

@@ -12,14 +12,12 @@
 #include "atom/browser/api/save_page_handler.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/common_web_contents_delegate.h"
-#include "atom/browser/ui/autofill_popup.h"
 #include "content/common/cursors/webcursor.h"
-#include "content/public/browser/keyboard_event_processing_result.h"
-#include "content/public/browser/web_contents.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/favicon_url.h"
 #include "native_mate/handle.h"
-#include "printing/backend/print_backend.h"
 #include "ui/gfx/image/image.h"
 
 namespace blink {
@@ -31,7 +29,7 @@ class InspectableWebContents;
 }
 
 namespace content {
-class ResourceRequestBody;
+class ResourceRequestBodyImpl;
 }
 
 namespace mate {
@@ -43,7 +41,6 @@ namespace atom {
 
 struct SetSizeParams;
 class AtomBrowserContext;
-class AtomJavaScriptDialogManager;
 class WebContentsZoomController;
 class WebViewGuestDelegate;
 
@@ -51,7 +48,8 @@ namespace api {
 
 class WebContents : public mate::TrackableObject<WebContents>,
                     public CommonWebContentsDelegate,
-                    public content::WebContentsObserver {
+                    public content::WebContentsObserver,
+                    public content::NotificationObserver {
  public:
   enum Type {
     BACKGROUND_PAGE,  // A DevTools extension background page.
@@ -84,7 +82,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
   int64_t GetID() const;
   int GetProcessID() const;
-  base::ProcessId GetOSProcessID() const;
   Type GetType() const;
   bool Equal(const WebContents* web_contents) const;
   void LoadURL(const GURL& url, const mate::Dictionary& options);
@@ -117,17 +114,12 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void DisableDeviceEmulation();
   void InspectElement(int x, int y);
   void InspectServiceWorker();
-  void HasServiceWorker(
-      const base::Callback<void(bool)>&);
+  void HasServiceWorker(const base::Callback<void(bool)>&);
   void UnregisterServiceWorker(const base::Callback<void(bool)>&);
-  void SetIgnoreMenuShortcuts(bool ignore);
   void SetAudioMuted(bool muted);
   bool IsAudioMuted();
   void Print(mate::Arguments* args);
-  std::vector<printing::PrinterBasicInfo> GetPrinterList();
   void SetEmbedder(const WebContents* embedder);
-  void SetDevToolsWebContents(const WebContents* devtools);
-  v8::Local<v8::Value> GetNativeView() const;
 
   // Print current page as PDF.
   void PrintToPDF(const base::DictionaryValue& setting,
@@ -191,7 +183,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void SetFrameRate(int frame_rate);
   int GetFrameRate() const;
   void Invalidate();
-  gfx::Size GetSizeForNewRenderView(content::WebContents*) const override;
 
   // Methods for zoom handling.
   void SetZoomLevel(double level);
@@ -210,7 +201,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const std::vector<std::string>& features,
-      const scoped_refptr<content::ResourceRequestBody>& body);
+      const scoped_refptr<content::ResourceRequestBodyImpl>& body);
 
   // Returns the web preferences of current WebContents.
   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
@@ -218,10 +209,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // Returns the owner window.
   v8::Local<v8::Value> GetOwnerBrowserWindow();
 
-  // Grants the child process the capability to access URLs with the origin of
-  // the specified URL.
-  void GrantOriginAccess(const GURL& url);
-
   // Properties.
   int32_t ID() const;
   v8::Local<v8::Value> Session(v8::Isolate* isolate);
@@ -249,14 +236,12 @@ class WebContents : public mate::TrackableObject<WebContents>,
                               const base::string16& message,
                               int32_t line_no,
                               const base::string16& source_id) override;
-  void WebContentsCreated(
-      content::WebContents* source_contents,
-      int opener_render_process_id,
-      int opener_render_frame_id,
-      const std::string& frame_name,
-      const GURL& target_url,
-      content::WebContents* new_contents)
-      override;
+  void WebContentsCreated(content::WebContents* source_contents,
+                          int opener_render_process_id,
+                          int opener_render_frame_id,
+                          const std::string& frame_name,
+                          const GURL& target_url,
+                          content::WebContents* new_contents) override;
   void AddNewContents(content::WebContents* source,
                       content::WebContents* new_contents,
                       WindowOpenDisposition disposition,
@@ -278,9 +263,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;
-  content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
-      content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) override;
+  bool PreHandleKeyboardEvent(content::WebContents* source,
+                              const content::NativeWebKeyboardEvent& event,
+                              bool* is_keyboard_shortcut) override;
   void EnterFullscreenModeForTab(content::WebContents* source,
                                  const GURL& origin) override;
   void ExitFullscreenModeForTab(content::WebContents* source) override;
@@ -311,8 +296,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser(
       content::RenderFrameHost* frame,
       const content::BluetoothChooser::EventHandler& handler) override;
-  content::JavaScriptDialogManager* GetJavaScriptDialogManager(
-      content::WebContents* source) override;
 
   // content::WebContentsObserver:
   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
@@ -334,11 +317,11 @@ class WebContents : public mate::TrackableObject<WebContents>,
       const content::ResourceRequestDetails& details) override;
   void DidGetRedirectForResourceRequest(
       const content::ResourceRedirectDetails& details) override;
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override;
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
   bool OnMessageReceived(const IPC::Message& message) override;
-  bool OnMessageReceived(const IPC::Message& message,
-                         content::RenderFrameHost* frame_host) override;
   void WebContentsDestroyed() override;
   void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override;
@@ -353,6 +336,12 @@ class WebContents : public mate::TrackableObject<WebContents>,
                            const MediaPlayerId& id) override;
   void DidChangeThemeColor(SkColor theme_color) override;
 
+  // content::NotificationObserver:
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
+  void BeforeUnloadDialogCancelled() override;
+
   // brightray::InspectableWebContentsDelegate:
   void DevToolsReloadPage() override;
 
@@ -361,12 +350,14 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void DevToolsOpened() override;
   void DevToolsClosed() override;
 
-  void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-                         const gfx::RectF& bounds,
-                         const std::vector<base::string16>& values,
-                         const std::vector<base::string16>& labels);
-
  private:
+  struct LoadURLParams {
+    LoadURLParams() : params(GURL()), id(0) {}
+
+    content::NavigationController::LoadURLParams params;
+    int id;
+  };
+
   AtomBrowserContext* GetBrowserContext() const;
 
   uint32_t GetNextRequestId() {
@@ -393,14 +384,10 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // get the zoom level.
   void OnGetZoomLevel(IPC::Message* reply_msg);
 
-  void InitZoomController(content::WebContents* web_contents,
-                          const mate::Dictionary& options);
-
   v8::Global<v8::Value> session_;
   v8::Global<v8::Value> devtools_web_contents_;
   v8::Global<v8::Value> debugger_;
 
-  std::unique_ptr<AtomJavaScriptDialogManager> dialog_manager_;
   std::unique_ptr<WebViewGuestDelegate> guest_delegate_;
 
   // The host webcontents that may contain this webcontents.
@@ -421,6 +408,11 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // Whether to enable devtools.
   bool enable_devtools_;
 
+  // Container to hold url parms for deferred load when
+  // there is a pending navigation entry.
+  LoadURLParams deferred_load_url_;
+  content::NotificationRegistrar registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 

atom/browser/api/atom_api_web_request.cc

@@ -74,16 +74,10 @@ void WebRequest::SetListener(Method method, Event type, mate::Arguments* args) {
     return;
   }
 
-  auto url_request_context_getter =
-      browser_context_->url_request_context_getter();
-  if (!url_request_context_getter)
-    return;
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(method,
-                 base::Unretained(static_cast<AtomNetworkDelegate*>(
-                     url_request_context_getter->network_delegate())),
-                 type, patterns, listener));
+  auto delegate = browser_context_->network_delegate();
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(method, base::Unretained(delegate), type,
+                                     patterns, listener));
 }
 
 // static

atom/browser/api/atom_api_web_view_manager.cc

@@ -7,12 +7,10 @@
 #include "atom/browser/web_view_manager.h"
 #include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "native_mate/dictionary.h"
-// Must be the last in the includes list.
-// See https://github.com/electron/electron/issues/10363
-#include "atom/common/node_includes.h"
 
 using atom::WebContentsPreferences;
 

atom/browser/api/atom_api_window.cc

@@ -3,20 +3,19 @@
 // found in the LICENSE file.
 
 #include "atom/browser/api/atom_api_window.h"
+#include "atom/common/native_mate_converters/value_converter.h"
 
 #include "atom/browser/api/atom_api_browser_view.h"
 #include "atom/browser/api/atom_api_menu.h"
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/web_contents_preferences.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -78,43 +77,28 @@ v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
 Window::Window(v8::Isolate* isolate, v8::Local<v8::Object> wrapper,
                const mate::Dictionary& options) {
   mate::Handle<class WebContents> web_contents;
+  // If no WebContents was passed to the constructor, create it from options.
+  if (!options.Get("webContents", &web_contents)) {
+    // Use options.webPreferences to create WebContents.
+    mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
+    options.Get(options::kWebPreferences, &web_preferences);
 
-  // Use options.webPreferences in WebContents.
-  mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
-  options.Get(options::kWebPreferences, &web_preferences);
+    // Copy the backgroundColor to webContents.
+    v8::Local<v8::Value> value;
+    if (options.Get(options::kBackgroundColor, &value))
+      web_preferences.Set(options::kBackgroundColor, value);
 
-  // Copy the backgroundColor to webContents.
-  v8::Local<v8::Value> value;
-  if (options.Get(options::kBackgroundColor, &value))
-    web_preferences.Set(options::kBackgroundColor, value);
+    v8::Local<v8::Value> transparent;
+    if (options.Get("transparent", &transparent))
+      web_preferences.Set("transparent", transparent);
 
-  v8::Local<v8::Value> transparent;
-  if (options.Get("transparent", &transparent))
-    web_preferences.Set("transparent", transparent);
-
-#if defined(ENABLE_OSR)
-  // Offscreen windows are always created frameless.
-  bool offscreen;
-  if (web_preferences.Get("offscreen", &offscreen) && offscreen) {
-    auto window_options = const_cast<mate::Dictionary&>(options);
-    window_options.Set(options::kFrame, false);
-  }
-#endif
-
-  if (options.Get("webContents", &web_contents) && !web_contents.IsEmpty()) {
-    // Set webPreferences from options if using an existing webContents.
-    // These preferences will be used when the webContent launches new
-    // render processes.
-    auto* existing_preferences =
-        WebContentsPreferences::FromWebContents(web_contents->web_contents());
-    base::DictionaryValue web_preferences_dict;
-    if (mate::ConvertFromV8(isolate, web_preferences.GetHandle(),
-                        &web_preferences_dict)) {
-      existing_preferences->web_preferences()->Clear();
-      existing_preferences->Merge(web_preferences_dict);
+    // Offscreen windows are always created frameless.
+    bool offscreen;
+    if (web_preferences.Get("offscreen", &offscreen) && offscreen) {
+      auto window_options = const_cast<mate::Dictionary&>(options);
+      window_options.Set(options::kFrame, false);
     }
 
-  } else {
     // Creates the WebContents used by BrowserWindow.
     web_contents = WebContents::Create(isolate, web_preferences);
   }
@@ -135,7 +119,7 @@ void Window::Init(v8::Isolate* isolate,
 
   // The parent window.
   mate::Handle<Window> parent;
-  if (options.Get("parent", &parent) && !parent.IsEmpty())
+  if (options.Get("parent", &parent))
     parent_window_.Reset(isolate, parent.ToV8());
 
   // Creates BrowserWindow.
@@ -144,12 +128,11 @@ void Window::Init(v8::Isolate* isolate,
       options,
       parent.IsEmpty() ? nullptr : parent->window_.get()));
   web_contents->SetOwnerWindow(window_.get());
-  window_->set_is_offscreen_dummy(api_web_contents_->IsOffScreen());
 
 #if defined(TOOLKIT_VIEWS)
   // Sets the window icon.
   mate::Handle<NativeImage> icon;
-  if (options.Get(options::kIcon, &icon) && !icon.IsEmpty())
+  if (options.Get(options::kIcon, &icon))
     SetIcon(icon);
 #endif
 
@@ -184,7 +167,7 @@ void Window::WillDestroyNativeObject() {
   v8::HandleScope handle_scope(isolate());
   for (v8::Local<v8::Value> value : child_windows_.Values(isolate())) {
     mate::Handle<Window> child;
-    if (mate::ConvertFromV8(isolate(), value, &child) && !child.IsEmpty())
+    if (mate::ConvertFromV8(isolate(), value, &child))
       child->window_->CloseImmediately();
   }
 }
@@ -203,8 +186,6 @@ void Window::OnWindowClosed() {
 
   RemoveFromParentChildWindows();
 
-  ResetBrowserView();
-
   // Destroy the native class when window is closed.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, GetDestroyClosure());
@@ -319,10 +300,6 @@ void Window::OnTouchBarItemResult(const std::string& item_id,
   Emit("-touch-bar-interaction", item_id, details);
 }
 
-void Window::OnNewWindowForTab() {
-  Emit("new-window-for-tab");
-}
-
 #if defined(OS_WIN)
 void Window::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
   if (IsWindowMessageHooked(message)) {
@@ -393,10 +370,6 @@ bool Window::IsEnabled() {
   return window_->IsEnabled();
 }
 
-void Window::SetEnabled(bool enable) {
-  window_->SetEnabled(enable);
-}
-
 void Window::Maximize() {
   window_->Maximize();
 }
@@ -608,14 +581,6 @@ void Window::SetSkipTaskbar(bool skip) {
   window_->SetSkipTaskbar(skip);
 }
 
-void Window::SetSimpleFullScreen(bool simple_fullscreen) {
-  window_->SetSimpleFullScreen(simple_fullscreen);
-}
-
-bool Window::IsSimpleFullScreen() {
-  return window_->IsSimpleFullScreen();
-}
-
 void Window::SetKiosk(bool kiosk) {
   window_->SetKiosk(kiosk);
 }
@@ -636,14 +601,6 @@ bool Window::HasShadow() {
   return window_->HasShadow();
 }
 
-void Window::SetOpacity(const double opacity) {
-  window_->SetOpacity(opacity);
-}
-
-double Window::GetOpacity() {
-  return window_->GetOpacity();
-}
-
 void Window::FocusOnWebView() {
   window_->FocusOnWebView();
 }
@@ -672,11 +629,8 @@ bool Window::IsDocumentEdited() {
   return window_->IsDocumentEdited();
 }
 
-void Window::SetIgnoreMouseEvents(bool ignore, mate::Arguments* args) {
-  mate::Dictionary options;
-  bool forward = false;
-  args->GetNext(&options) && options.Get("forward", &forward);
-  return window_->SetIgnoreMouseEvents(ignore, forward);
+void Window::SetIgnoreMouseEvents(bool ignore) {
+  return window_->SetIgnoreMouseEvents(ignore);
 }
 
 void Window::SetContentProtection(bool enable) {
@@ -731,7 +685,7 @@ void Window::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
   mate::Handle<Menu> menu;
   if (value->IsObject() &&
       mate::V8ToString(value->ToObject()->GetConstructorName()) == "Menu" &&
-      mate::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
+      mate::ConvertFromV8(isolate, value, &menu)) {
     menu_.Reset(isolate, menu.ToV8());
     window_->SetMenu(menu->model());
   } else if (value->IsNull()) {
@@ -851,7 +805,7 @@ void Window::SetParentWindow(v8::Local<v8::Value> value,
   }
 
   mate::Handle<Window> parent;
-  if (value->IsNull() || value->IsUndefined()) {
+  if (value->IsNull()) {
     RemoveFromParentChildWindows();
     parent_window_.Reset();
     window_->SetParentWindow(nullptr);
@@ -884,32 +838,16 @@ v8::Local<v8::Value> Window::GetBrowserView() const {
 }
 
 void Window::SetBrowserView(v8::Local<v8::Value> value) {
-  ResetBrowserView();
-
   mate::Handle<BrowserView> browser_view;
-  if (value->IsNull() || value->IsUndefined()) {
+  if (value->IsNull()) {
     window_->SetBrowserView(nullptr);
+    browser_view_.Reset();
   } else if (mate::ConvertFromV8(isolate(), value, &browser_view)) {
     window_->SetBrowserView(browser_view->view());
-    browser_view->web_contents()->SetOwnerWindow(window_.get());
     browser_view_.Reset(isolate(), value);
   }
 }
 
-void Window::ResetBrowserView() {
-  if (browser_view_.IsEmpty()) {
-    return;
-  }
-
-  mate::Handle<BrowserView> browser_view;
-  if (mate::ConvertFromV8(isolate(), GetBrowserView(), &browser_view)
-    && !browser_view.IsEmpty()) {
-    browser_view->web_contents()->SetOwnerWindow(nullptr);
-  }
-
-  browser_view_.Reset();
-}
-
 bool Window::IsModal() const {
   return window_->is_modal();
 }
@@ -932,30 +870,6 @@ void Window::SetAutoHideCursor(bool auto_hide) {
   window_->SetAutoHideCursor(auto_hide);
 }
 
-void Window::SelectPreviousTab() {
-  window_->SelectPreviousTab();
-}
-
-void Window::SelectNextTab() {
-  window_->SelectNextTab();
-}
-
-void Window::MergeAllWindows() {
-  window_->MergeAllWindows();
-}
-
-void Window::MoveTabToNewWindow() {
-  window_->MoveTabToNewWindow();
-}
-
-void Window::ToggleTabBar() {
-  window_->ToggleTabBar();
-}
-
-void Window::AddTabbedWindow(NativeWindow* window) {
-  window_->AddTabbedWindow(window);
-}
-
 void Window::SetVibrancy(mate::Arguments* args) {
   std::string type;
 
@@ -992,10 +906,8 @@ void Window::RemoveFromParentChildWindows() {
     return;
 
   mate::Handle<Window> parent;
-  if (!mate::ConvertFromV8(isolate(), GetParentWindow(), &parent)
-    || parent.IsEmpty()) {
+  if (!mate::ConvertFromV8(isolate(), GetParentWindow(), &parent))
     return;
-  }
 
   parent->child_windows_.Remove(ID());
 }
@@ -1015,7 +927,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("hide", &Window::Hide)
       .SetMethod("isVisible", &Window::IsVisible)
       .SetMethod("isEnabled", &Window::IsEnabled)
-      .SetMethod("setEnabled", & Window::SetEnabled)
       .SetMethod("maximize", &Window::Maximize)
       .SetMethod("unmaximize", &Window::Unmaximize)
       .SetMethod("isMaximized", &Window::IsMaximized)
@@ -1070,15 +981,11 @@ void Window::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getTitle", &Window::GetTitle)
       .SetMethod("flashFrame", &Window::FlashFrame)
       .SetMethod("setSkipTaskbar", &Window::SetSkipTaskbar)
-      .SetMethod("setSimpleFullScreen", &Window::SetSimpleFullScreen)
-      .SetMethod("isSimpleFullScreen", &Window::IsSimpleFullScreen)
       .SetMethod("setKiosk", &Window::SetKiosk)
       .SetMethod("isKiosk", &Window::IsKiosk)
       .SetMethod("setBackgroundColor", &Window::SetBackgroundColor)
       .SetMethod("setHasShadow", &Window::SetHasShadow)
       .SetMethod("hasShadow", &Window::HasShadow)
-      .SetMethod("setOpacity", &Window::SetOpacity)
-      .SetMethod("getOpacity", &Window::GetOpacity)
       .SetMethod("setRepresentedFilename", &Window::SetRepresentedFilename)
       .SetMethod("getRepresentedFilename", &Window::GetRepresentedFilename)
       .SetMethod("setDocumentEdited", &Window::SetDocumentEdited)
@@ -1103,12 +1010,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
                  &Window::IsVisibleOnAllWorkspaces)
 #if defined(OS_MACOSX)
       .SetMethod("setAutoHideCursor", &Window::SetAutoHideCursor)
-      .SetMethod("mergeAllWindows", &Window::MergeAllWindows)
-      .SetMethod("selectPreviousTab", &Window::SelectPreviousTab)
-      .SetMethod("selectNextTab", &Window::SelectNextTab)
-      .SetMethod("moveTabToNewWindow", &Window::MoveTabToNewWindow)
-      .SetMethod("toggleTabBar", &Window::ToggleTabBar)
-      .SetMethod("addTabbedWindow", &Window::AddTabbedWindow)
 #endif
       .SetMethod("setVibrancy", &Window::SetVibrancy)
       .SetMethod("_setTouchBarItems", &Window::SetTouchBar)

atom/browser/api/atom_api_window.h

@@ -91,7 +91,6 @@ class Window : public mate::TrackableObject<Window>,
   void OnExecuteWindowsCommand(const std::string& command_name) override;
   void OnTouchBarItemResult(const std::string& item_id,
                             const base::DictionaryValue& details) override;
-  void OnNewWindowForTab() override;
 
   #if defined(OS_WIN)
   void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
@@ -112,7 +111,6 @@ class Window : public mate::TrackableObject<Window>,
   void Hide();
   bool IsVisible();
   bool IsEnabled();
-  void SetEnabled(bool enable);
   void Maximize();
   void Unmaximize();
   bool IsMaximized();
@@ -155,15 +153,11 @@ class Window : public mate::TrackableObject<Window>,
   std::string GetTitle();
   void FlashFrame(bool flash);
   void SetSkipTaskbar(bool skip);
-  void SetSimpleFullScreen(bool simple_fullscreen);
-  bool IsSimpleFullScreen();
   void SetKiosk(bool kiosk);
   bool IsKiosk();
   void SetBackgroundColor(const std::string& color_name);
   void SetHasShadow(bool has_shadow);
   bool HasShadow();
-  void SetOpacity(const double opacity);
-  double GetOpacity();
   void FocusOnWebView();
   void BlurWebView();
   bool IsWebViewFocused();
@@ -171,7 +165,7 @@ class Window : public mate::TrackableObject<Window>,
   std::string GetRepresentedFilename();
   void SetDocumentEdited(bool edited);
   bool IsDocumentEdited();
-  void SetIgnoreMouseEvents(bool ignore, mate::Arguments* args);
+  void SetIgnoreMouseEvents(bool ignore);
   void SetContentProtection(bool enable);
   void SetFocusable(bool focusable);
   void SetProgressBar(double progress, mate::Arguments* args);
@@ -191,7 +185,6 @@ class Window : public mate::TrackableObject<Window>,
   std::vector<v8::Local<v8::Object>> GetChildWindows() const;
   v8::Local<v8::Value> GetBrowserView() const;
   void SetBrowserView(v8::Local<v8::Value> value);
-  void ResetBrowserView();
   bool IsModal() const;
   v8::Local<v8::Value> GetNativeWindowHandle();
 
@@ -217,13 +210,6 @@ class Window : public mate::TrackableObject<Window>,
 
   void SetAutoHideCursor(bool auto_hide);
 
-  void SelectPreviousTab();
-  void SelectNextTab();
-  void MergeAllWindows();
-  void MoveTabToNewWindow();
-  void ToggleTabBar();
-  void AddTabbedWindow(NativeWindow* window);
-
   void SetVibrancy(mate::Arguments* args);
   void SetTouchBar(const std::vector<mate::PersistentDictionary>& items);
   void RefreshTouchBarItem(const std::string& item_id);

atom/browser/api/event_emitter.h

@@ -42,10 +42,8 @@ class EventEmitter : public Wrappable<T> {
 
   // Make the convinient methods visible:
   // https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members
+  v8::Local<v8::Object> GetWrapper() { return Wrappable<T>::GetWrapper(); }
   v8::Isolate* isolate() const { return Wrappable<T>::isolate(); }
-  v8::Local<v8::Object> GetWrapper() const {
-    return Wrappable<T>::GetWrapper();
-  }
 
   // this.emit(name, event, args...);
   template<typename... Args>
@@ -81,12 +79,8 @@ class EventEmitter : public Wrappable<T> {
                       const Args&... args) {
     v8::Locker locker(isolate());
     v8::HandleScope handle_scope(isolate());
-    v8::Local<v8::Object> wrapper = GetWrapper();
-    if (wrapper.IsEmpty()) {
-      return false;
-    }
     v8::Local<v8::Object> event = internal::CreateJSEvent(
-        isolate(), wrapper, sender, message);
+        isolate(), GetWrapper(), sender, message);
     return EmitWithEvent(name, event, args...);
   }
 

atom/browser/api/event_subscriber.cc

@@ -1,121 +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 <string>
-
-#include "atom/browser/api/event_subscriber.h"
-#include "atom/common/native_mate_converters/callback.h"
-
-namespace {
-
-// A FunctionTemplate lifetime is bound to the v8 context, so it can be safely
-// stored as a global here since there's only one for the main process.
-v8::Global<v8::FunctionTemplate> g_cached_template;
-
-struct JSHandlerData {
-  JSHandlerData(v8::Isolate* isolate,
-                mate::internal::EventSubscriberBase* subscriber)
-      : handle_(isolate, v8::External::New(isolate, this)),
-        subscriber_(subscriber) {
-    handle_.SetWeak(this, GC, v8::WeakCallbackType::kFinalizer);
-  }
-
-  static void GC(const v8::WeakCallbackInfo<JSHandlerData>& data) {
-    delete data.GetParameter();
-  }
-
-  v8::Global<v8::External> handle_;
-  mate::internal::EventSubscriberBase* subscriber_;
-};
-
-void InvokeCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-  v8::Locker locker(info.GetIsolate());
-  v8::HandleScope handle_scope(info.GetIsolate());
-  v8::Local<v8::Context> context = info.GetIsolate()->GetCurrentContext();
-  v8::Context::Scope context_scope(context);
-  mate::Arguments args(info);
-  v8::Local<v8::Value> handler, event;
-  args.GetNext(&handler);
-  args.GetNext(&event);
-  DCHECK(handler->IsExternal());
-  DCHECK(event->IsString());
-  JSHandlerData* handler_data = static_cast<JSHandlerData*>(
-      v8::Local<v8::External>::Cast(handler)->Value());
-  handler_data->subscriber_->EventEmitted(mate::V8ToString(event), &args);
-}
-
-}  // namespace
-
-namespace mate {
-
-namespace internal {
-
-EventSubscriberBase::EventSubscriberBase(v8::Isolate* isolate,
-                                         v8::Local<v8::Object> emitter)
-    : isolate_(isolate), emitter_(isolate, emitter) {
-  if (g_cached_template.IsEmpty()) {
-    g_cached_template = v8::Global<v8::FunctionTemplate>(
-        isolate_, v8::FunctionTemplate::New(isolate_, InvokeCallback));
-  }
-}
-
-EventSubscriberBase::~EventSubscriberBase() {
-  if (!isolate_) {
-    return;
-  }
-  RemoveAllListeners();
-  emitter_.Reset();
-  DCHECK_EQ(js_handlers_.size(), 0u);
-}
-
-void EventSubscriberBase::On(const std::string& event_name) {
-  DCHECK(js_handlers_.find(event_name) == js_handlers_.end());
-  v8::Locker locker(isolate_);
-  v8::Isolate::Scope isolate_scope(isolate_);
-  v8::HandleScope handle_scope(isolate_);
-  auto fn_template = g_cached_template.Get(isolate_);
-  auto event = mate::StringToV8(isolate_, event_name);
-  auto js_handler_data = new JSHandlerData(isolate_, this);
-  v8::Local<v8::Value> fn = internal::BindFunctionWith(
-      isolate_, isolate_->GetCurrentContext(), fn_template->GetFunction(),
-      js_handler_data->handle_.Get(isolate_), event);
-  js_handlers_.insert(
-      std::make_pair(event_name, v8::Global<v8::Value>(isolate_, fn)));
-  internal::ValueVector converted_args = {event, fn};
-  internal::CallMethodWithArgs(isolate_, emitter_.Get(isolate_), "on",
-                               &converted_args);
-}
-
-void EventSubscriberBase::Off(const std::string& event_name) {
-  v8::Locker locker(isolate_);
-  v8::Isolate::Scope isolate_scope(isolate_);
-  v8::HandleScope handle_scope(isolate_);
-  auto js_handler = js_handlers_.find(event_name);
-  DCHECK(js_handler != js_handlers_.end());
-  RemoveListener(js_handler);
-}
-
-void EventSubscriberBase::RemoveAllListeners() {
-  v8::Locker locker(isolate_);
-  v8::Isolate::Scope isolate_scope(isolate_);
-  v8::HandleScope handle_scope(isolate_);
-  while (!js_handlers_.empty()) {
-    RemoveListener(js_handlers_.begin());
-  }
-}
-
-std::map<std::string, v8::Global<v8::Value>>::iterator
-EventSubscriberBase::RemoveListener(
-    std::map<std::string, v8::Global<v8::Value>>::iterator it) {
-  internal::ValueVector args = {StringToV8(isolate_, it->first),
-                                it->second.Get(isolate_)};
-  internal::CallMethodWithArgs(
-      isolate_, v8::Local<v8::Object>::Cast(emitter_.Get(isolate_)),
-      "removeListener", &args);
-  it->second.Reset();
-  return js_handlers_.erase(it);
-}
-
-}  // namespace internal
-
-}  // namespace mate

atom/browser/api/event_subscriber.h

@@ -1,139 +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_API_EVENT_SUBSCRIBER_H_
-#define ATOM_BROWSER_API_EVENT_SUBSCRIBER_H_
-
-#include <map>
-#include <string>
-
-#include "atom/common/api/event_emitter_caller.h"
-#include "base/synchronization/lock.h"
-#include "content/public/browser/browser_thread.h"
-#include "native_mate/native_mate/arguments.h"
-
-namespace mate {
-
-namespace internal {
-
-class EventSubscriberBase {
- public:
-  EventSubscriberBase(v8::Isolate* isolate, v8::Local<v8::Object> emitter);
-  virtual ~EventSubscriberBase();
-  virtual void EventEmitted(const std::string& event_name,
-                            mate::Arguments* args) = 0;
-
- protected:
-  void On(const std::string& event_name);
-  void Off(const std::string& event_name);
-  void RemoveAllListeners();
-
- private:
-  std::map<std::string, v8::Global<v8::Value>>::iterator RemoveListener(
-      std::map<std::string, v8::Global<v8::Value>>::iterator it);
-
-  v8::Isolate* isolate_;
-  v8::Global<v8::Object> emitter_;
-  std::map<std::string, v8::Global<v8::Value>> js_handlers_;
-
-  DISALLOW_COPY_AND_ASSIGN(EventSubscriberBase);
-};
-
-}  // namespace internal
-
-template <typename HandlerType>
-class EventSubscriber : internal::EventSubscriberBase {
- public:
-  using EventCallback = void (HandlerType::*)(mate::Arguments* args);
-  // Alias to unique_ptr with deleter.
-  using unique_ptr = std::unique_ptr<EventSubscriber<HandlerType>,
-                                     void (*)(EventSubscriber<HandlerType>*)>;
-  // EventSubscriber should only be created/deleted in the main thread since it
-  // communicates with the V8 engine. This smart pointer makes it simpler to
-  // bind the lifetime of EventSubscriber with a class whose lifetime is managed
-  // by a non-UI thread.
-  class SafePtr : public unique_ptr {
-   public:
-    SafePtr() : SafePtr(nullptr) {}
-    explicit SafePtr(EventSubscriber<HandlerType>* ptr)
-        : unique_ptr(ptr, Deleter) {}
-
-   private:
-    // Custom deleter that schedules destructor invocation to the main thread.
-    static void Deleter(EventSubscriber<HandlerType>* ptr) {
-      DCHECK(
-          !::content::BrowserThread::CurrentlyOn(::content::BrowserThread::UI));
-      DCHECK(ptr);
-      // Acquire handler lock and reset handler_ to ensure that any new events
-      // emitted will be ignored after this function returns
-      base::AutoLock auto_lock(ptr->handler_lock_);
-      ptr->handler_ = nullptr;
-      content::BrowserThread::PostTask(
-          content::BrowserThread::UI, FROM_HERE,
-          base::Bind(
-              [](EventSubscriber<HandlerType>* subscriber) {
-                {
-                  // It is possible that this function will execute in the UI
-                  // thread before the outer function has returned and destroyed
-                  // its auto_lock. We need to acquire the lock before deleting
-                  // or risk a crash.
-                  base::AutoLock auto_lock(subscriber->handler_lock_);
-                }
-                delete subscriber;
-              },
-              ptr));
-    }
-  };
-
-  EventSubscriber(HandlerType* handler,
-                  v8::Isolate* isolate,
-                  v8::Local<v8::Object> emitter)
-      : EventSubscriberBase(isolate, emitter), handler_(handler) {
-    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
-  }
-
-  void On(const std::string& event, EventCallback callback) {
-    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
-    EventSubscriberBase::On(event);
-    callbacks_.insert(std::make_pair(event, callback));
-  }
-
-  void Off(const std::string& event) {
-    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
-    EventSubscriberBase::Off(event);
-    DCHECK(callbacks_.find(event) != callbacks_.end());
-    callbacks_.erase(callbacks_.find(event));
-  }
-
-  void RemoveAllListeners() {
-    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
-    EventSubscriberBase::RemoveAllListeners();
-    callbacks_.clear();
-  }
-
- private:
-  void EventEmitted(const std::string& event_name,
-                    mate::Arguments* args) override {
-    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
-    base::AutoLock auto_lock(handler_lock_);
-    if (!handler_) {
-      // handler_ was probably destroyed by another thread and we should not
-      // access it.
-      return;
-    }
-    auto it = callbacks_.find(event_name);
-    if (it != callbacks_.end()) {
-      auto method = it->second;
-      (handler_->*method)(args);
-    }
-  }
-
-  HandlerType* handler_;
-  base::Lock handler_lock_;
-  std::map<std::string, EventCallback> callbacks_;
-};
-
-}  // namespace mate
-
-#endif  // ATOM_BROWSER_API_EVENT_SUBSCRIBER_H_

atom/browser/api/frame_subscriber.cc

@@ -24,7 +24,6 @@ FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
       view_(view),
       callback_(callback),
       only_dirty_(only_dirty),
-      source_id_for_copy_request_(base::UnguessableToken::Create()),
       weak_factory_(this) {
 }
 
@@ -33,7 +32,8 @@ bool FrameSubscriber::ShouldCaptureFrame(
     base::TimeTicks present_time,
     scoped_refptr<media::VideoFrame>* storage,
     DeliverFrameCallback* callback) {
-  if (!view_)
+  const auto host = view_ ? view_->GetRenderWidgetHost() : nullptr;
+  if (!view_ || !host)
     return false;
 
   if (dirty_rect.IsEmpty())
@@ -45,16 +45,16 @@ bool FrameSubscriber::ShouldCaptureFrame(
 
   gfx::Size view_size = rect.size();
   gfx::Size bitmap_size = view_size;
-  gfx::NativeView native_view = view_->GetNativeView();
+  const gfx::NativeView native_view = view_->GetNativeView();
   const float scale =
-      display::Screen::GetScreen()->GetDisplayNearestView(native_view)
+      display::Screen::GetScreen()->GetDisplayNearestWindow(native_view)
       .device_scale_factor();
   if (scale > 1.0f)
     bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
 
   rect = gfx::Rect(rect.origin(), bitmap_size);
 
-  view_->CopyFromSurface(
+  host->CopyFromBackingStore(
       rect,
       rect.size(),
       base::Bind(&FrameSubscriber::OnFrameDelivered,
@@ -64,10 +64,6 @@ bool FrameSubscriber::ShouldCaptureFrame(
   return false;
 }
 
-const base::UnguessableToken& FrameSubscriber::GetSourceIdForCopyRequest() {
-  return source_id_for_copy_request_;
-}
-
 void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
                                        const gfx::Rect& damage_rect,
                                        const SkBitmap& bitmap,
@@ -78,31 +74,20 @@ void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
   v8::Locker locker(isolate_);
   v8::HandleScope handle_scope(isolate_);
 
-  size_t rgb_row_size = bitmap.width() * bitmap.bytesPerPixel();
-
-  v8::MaybeLocal<v8::Object> buffer =
-      node::Buffer::New(isolate_, rgb_row_size * bitmap.height());
-
+  size_t rgb_arr_size = bitmap.width() * bitmap.height() *
+    bitmap.bytesPerPixel();
+  v8::MaybeLocal<v8::Object> buffer = node::Buffer::New(isolate_, rgb_arr_size);
   if (buffer.IsEmpty())
     return;
 
-  auto local_buffer = buffer.ToLocalChecked();
-
-  {
-    auto source = static_cast<const unsigned char*>(bitmap.getPixels());
-    auto target = node::Buffer::Data(local_buffer);
-
-    for (int y = 0; y < bitmap.height(); ++y) {
-      memcpy(target, source, rgb_row_size);
-      source += bitmap.rowBytes();
-      target += rgb_row_size;
-    }
-  }
+  bitmap.copyPixelsTo(
+    reinterpret_cast<uint8_t*>(node::Buffer::Data(buffer.ToLocalChecked())),
+    rgb_arr_size);
 
   v8::Local<v8::Value> damage =
       mate::Converter<gfx::Rect>::ToV8(isolate_, damage_rect);
 
-  callback_.Run(local_buffer, damage);
+  callback_.Run(buffer.ToLocalChecked(), damage);
 }
 
 }  // namespace api

atom/browser/api/frame_subscriber.h

@@ -7,9 +7,9 @@
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "content/browser/renderer_host/render_widget_host_view_frame_subscriber.h"
 #include "content/public/browser/readback_types.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/render_widget_host_view_frame_subscriber.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 #include "v8/include/v8.h"
@@ -32,7 +32,6 @@ class FrameSubscriber : public content::RenderWidgetHostViewFrameSubscriber {
                           base::TimeTicks present_time,
                           scoped_refptr<media::VideoFrame>* storage,
                           DeliverFrameCallback* callback) override;
-  const base::UnguessableToken& GetSourceIdForCopyRequest() override;
 
  private:
   void OnFrameDelivered(const FrameCaptureCallback& callback,
@@ -45,8 +44,6 @@ class FrameSubscriber : public content::RenderWidgetHostViewFrameSubscriber {
   FrameCaptureCallback callback_;
   bool only_dirty_;
 
-  base::UnguessableToken source_id_for_copy_request_;
-
   base::WeakPtrFactory<FrameSubscriber> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);

atom/browser/api/trackable_object.cc

@@ -6,7 +6,6 @@
 
 #include "atom/browser/atom_browser_main_parts.h"
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 
 namespace mate {
@@ -47,19 +46,16 @@ void TrackableObjectBase::Destroy() {
 }
 
 void TrackableObjectBase::AttachAsUserData(base::SupportsUserData* wrapped) {
-  wrapped->SetUserData(kTrackedObjectKey,
-      base::MakeUnique<IDUserData>(weak_map_id_));
+  wrapped->SetUserData(kTrackedObjectKey, new IDUserData(weak_map_id_));
 }
 
 // static
-int32_t TrackableObjectBase::GetIDFromWrappedClass(
-    base::SupportsUserData* wrapped) {
-  if (wrapped) {
-    auto id = static_cast<IDUserData*>(wrapped->GetUserData(kTrackedObjectKey));
-    if (id)
-      return *id;
-  }
-  return 0;
+int32_t TrackableObjectBase::GetIDFromWrappedClass(base::SupportsUserData* w) {
+  auto id = static_cast<IDUserData*>(w->GetUserData(kTrackedObjectKey));
+  if (id)
+    return *id;
+  else
+    return 0;
 }
 
 // static

atom/browser/api/trackable_object.h

@@ -30,15 +30,15 @@ class TrackableObjectBase {
   // Wrap TrackableObject into a class that SupportsUserData.
   void AttachAsUserData(base::SupportsUserData* wrapped);
 
-  // Get the weak_map_id from SupportsUserData.
-  static int32_t GetIDFromWrappedClass(base::SupportsUserData* wrapped);
-
  protected:
   virtual ~TrackableObjectBase();
 
   // Returns a closure that can destroy the native class.
   base::Closure GetDestroyClosure();
 
+  // Get the weak_map_id from SupportsUserData.
+  static int32_t GetIDFromWrappedClass(base::SupportsUserData* wrapped);
+
   // Register a callback that should be destroyed before JavaScript environment
   // gets destroyed.
   static base::Closure RegisterDestructionCallback(const base::Closure& c);
@@ -62,10 +62,7 @@ class TrackableObject : public TrackableObjectBase,
  public:
   // Mark the JS object as destroyed.
   void MarkDestroyed() {
-    v8::Local<v8::Object> wrapper = Wrappable<T>::GetWrapper();
-    if (!wrapper.IsEmpty()) {
-      wrapper->SetAlignedPointerInInternalField(0, nullptr);
-    }
+    Wrappable<T>::GetWrapper()->SetAlignedPointerInInternalField(0, nullptr);
   }
 
   bool IsDestroyed() {

atom/browser/atom_access_token_store.cc

@@ -29,7 +29,8 @@ class GeoURLRequestContextGetter : public net::URLRequestContextGetter {
       net::URLRequestContextBuilder builder;
       builder.set_proxy_config_service(
           net::ProxyService::CreateSystemProxyConfigService(
-              BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
+              BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
+              BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)));
       url_request_context_ = builder.Build();
     }
     return url_request_context_.get();
@@ -54,6 +55,7 @@ class GeoURLRequestContextGetter : public net::URLRequestContextGetter {
 
 AtomAccessTokenStore::AtomAccessTokenStore()
     : request_context_getter_(new internal::GeoURLRequestContextGetter) {
+  device::GeolocationProvider::GetInstance()->UserDidOptIntoLocationServices();
 }
 
 AtomAccessTokenStore::~AtomAccessTokenStore() {

atom/browser/atom_blob_reader.cc

@@ -72,7 +72,8 @@ void AtomBlobReader::StartReading(
   }
 
   auto blob_reader = blob_data_handle->CreateReader(
-      file_system_context_.get());
+      file_system_context_.get(),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE).get());
   BlobReadHelper* blob_read_helper =
       new BlobReadHelper(std::move(blob_reader), callback);
   blob_read_helper->Read();

atom/browser/atom_browser_client.cc

@@ -15,9 +15,7 @@
 #include "atom/browser/atom_quota_permission_context.h"
 #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
 #include "atom/browser/atom_speech_recognition_manager_delegate.h"
-#include "atom/browser/child_web_contents_tracker.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/session_preferences.h"
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/browser/web_contents_preferences.h"
 #include "atom/browser/window_list.h"
@@ -31,6 +29,7 @@
 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
 #include "chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h"
 #include "chrome/browser/speech/tts_message_filter.h"
+#include "content/common/resource_request_body_impl.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_process_host.h"
@@ -38,9 +37,6 @@
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/content_paths.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/common/resource_request_body.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "net/ssl/ssl_cert_request_info.h"
@@ -81,10 +77,9 @@ AtomBrowserClient::~AtomBrowserClient() {
 
 content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
     int process_id) {
-  // If the process is a pending process, we should use the web contents
-  // for the frame host passed into OverrideSiteInstanceForNavigation.
+  // If the process is a pending process, we should use the old one.
   if (base::ContainsKey(pending_processes_, process_id))
-    return pending_processes_[process_id];
+    process_id = pending_processes_[process_id];
 
   // Certain render process will be created with no associated render view,
   // for example: ServiceWorker.
@@ -92,31 +87,17 @@ content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
 }
 
 bool AtomBrowserClient::ShouldCreateNewSiteInstance(
-    content::RenderFrameHost* render_frame_host,
     content::BrowserContext* browser_context,
     content::SiteInstance* current_instance,
     const GURL& url) {
+
   if (url.SchemeIs(url::kJavaScriptScheme))
     // "javacript:" scheme should always use same SiteInstance
     return false;
 
-  int process_id = current_instance->GetProcess()->GetID();
-  if (!IsRendererSandboxed(process_id)) {
-    if (!RendererUsesNativeWindowOpen(process_id)) {
-      // non-sandboxed renderers without native window.open should always create
-      // a new SiteInstance
-      return true;
-    }
-    auto web_contents =
-        content::WebContents::FromRenderFrameHost(render_frame_host);
-    if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) {
-      // Root WebContents should always create new process to make sure
-      // native addons are loaded correctly after reload / navigation.
-      // (Non-root WebContents opened by window.open() should try to
-      //  reuse process to allow synchronous cross-window scripting.)
-      return true;
-    }
-  }
+  if (!IsRendererSandboxed(current_instance->GetProcess()->GetID()))
+    // non-sandboxed renderers should always create a new SiteInstance
+    return true;
 
   // Create new a SiteInstance if navigating to a different site.
   auto src_url = current_instance->GetSiteURL();
@@ -128,33 +109,19 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
       content::SiteInstance::GetSiteForURL(browser_context, url) != src_url;
 }
 
-void AtomBrowserClient::AddProcessPreferences(
-    int process_id, AtomBrowserClient::ProcessPreferences prefs) {
-  base::AutoLock auto_lock(process_preferences_lock_);
-  process_preferences_[process_id] = prefs;
+void AtomBrowserClient::AddSandboxedRendererId(int process_id) {
+  base::AutoLock auto_lock(sandboxed_renderers_lock_);
+  sandboxed_renderers_.insert(process_id);
 }
 
-void AtomBrowserClient::RemoveProcessPreferences(int process_id) {
-  base::AutoLock auto_lock(process_preferences_lock_);
-  process_preferences_.erase(process_id);
+void AtomBrowserClient::RemoveSandboxedRendererId(int process_id) {
+  base::AutoLock auto_lock(sandboxed_renderers_lock_);
+  sandboxed_renderers_.erase(process_id);
 }
 
 bool AtomBrowserClient::IsRendererSandboxed(int process_id) {
-  base::AutoLock auto_lock(process_preferences_lock_);
-  auto it = process_preferences_.find(process_id);
-  return it != process_preferences_.end() && it->second.sandbox;
-}
-
-bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) {
-  base::AutoLock auto_lock(process_preferences_lock_);
-  auto it = process_preferences_.find(process_id);
-  return it != process_preferences_.end() && it->second.native_window_open;
-}
-
-bool AtomBrowserClient::RendererDisablesPopups(int process_id) {
-  base::AutoLock auto_lock(process_preferences_lock_);
-  auto it = process_preferences_.find(process_id);
-  return it != process_preferences_.end() && it->second.disable_popups;
+  base::AutoLock auto_lock(sandboxed_renderers_lock_);
+  return sandboxed_renderers_.count(process_id);
 }
 
 void AtomBrowserClient::RenderProcessWillLaunch(
@@ -166,18 +133,11 @@ void AtomBrowserClient::RenderProcessWillLaunch(
       new WidevineCdmMessageFilter(process_id, host->GetBrowserContext()));
 
   content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
-  ProcessPreferences process_prefs;
-  process_prefs.sandbox =
-      WebContentsPreferences::IsPreferenceEnabled("sandbox", web_contents);
-  process_prefs.native_window_open =
-      WebContentsPreferences::IsPreferenceEnabled("nativeWindowOpen",
-                                                  web_contents);
-  process_prefs.disable_popups =
-      WebContentsPreferences::IsPreferenceEnabled("disablePopups",
-                                                  web_contents);
-  AddProcessPreferences(host->GetID(), process_prefs);
-  // ensure the ProcessPreferences is removed later
-  host->AddObserver(this);
+  if (WebContentsPreferences::IsSandboxed(web_contents)) {
+    AddSandboxedRendererId(host->GetID());
+    // ensure the sandboxed renderer id is removed later
+    host->AddObserver(this);
+  }
 }
 
 content::SpeechRecognitionManagerDelegate*
@@ -189,6 +149,7 @@ void AtomBrowserClient::OverrideWebkitPrefs(
     content::RenderViewHost* host, content::WebPreferences* prefs) {
   prefs->javascript_enabled = true;
   prefs->web_security_enabled = true;
+  prefs->javascript_can_open_windows_automatically = true;
   prefs->plugins_enabled = true;
   prefs->dom_paste_enabled = true;
   prefs->allow_scripts_to_close_windows = true;
@@ -206,8 +167,12 @@ void AtomBrowserClient::OverrideWebkitPrefs(
   WebContentsPreferences::OverrideWebkitPrefs(web_contents, prefs);
 }
 
+std::string AtomBrowserClient::GetApplicationLocale() {
+  return l10n_util::GetApplicationLocale("");
+}
+
 void AtomBrowserClient::OverrideSiteInstanceForNavigation(
-    content::RenderFrameHost* rfh,
+    content::RenderFrameHost* render_frame_host,
     content::BrowserContext* browser_context,
     content::SiteInstance* current_instance,
     const GURL& url,
@@ -217,70 +182,33 @@ void AtomBrowserClient::OverrideSiteInstanceForNavigation(
     return;
   }
 
-  if (!ShouldCreateNewSiteInstance(rfh, browser_context, current_instance, url))
+  if (!ShouldCreateNewSiteInstance(browser_context, current_instance, url))
     return;
 
-  bool is_new_instance = true;
-  scoped_refptr<content::SiteInstance> site_instance;
-
-  // Do we have an affinity site to manage ?
-  std::string affinity;
-  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-  auto* web_preferences = web_contents ?
-      WebContentsPreferences::FromWebContents(web_contents) : nullptr;
-  if (web_preferences &&
-      web_preferences->web_preferences()->GetString("affinity", &affinity) &&
-      !affinity.empty()) {
-    affinity = base::ToLowerASCII(affinity);
-    auto iter = site_per_affinities.find(affinity);
-    if (iter != site_per_affinities.end()) {
-      site_instance = iter->second;
-      is_new_instance = false;
-    } else {
-      // We must not provide the url.
-      // This site is "isolated" and must not be taken into account
-      // when Chromium looking at a candidate for an url.
-      site_instance = content::SiteInstance::Create(
-          browser_context);
-      site_per_affinities[affinity] = site_instance.get();
-    }
-  } else {
-    site_instance = content::SiteInstance::CreateForURL(
-        browser_context,
-        url);
-  }
+  scoped_refptr<content::SiteInstance> site_instance =
+      content::SiteInstance::CreateForURL(browser_context, url);
   *new_instance = site_instance.get();
 
-  if (is_new_instance) {
-    // Make sure the |site_instance| is not freed
-    // when this function returns.
-    // FIXME(zcbenz): We should adjust
-    // OverrideSiteInstanceForNavigation's interface to solve this.
-    content::BrowserThread::PostTask(
-        content::BrowserThread::UI, FROM_HERE,
-        base::Bind(&Noop, base::RetainedRef(site_instance)));
+  // Make sure the |site_instance| is not freed when this function returns.
+  // FIXME(zcbenz): We should adjust OverrideSiteInstanceForNavigation's
+  // interface to solve this.
+  content::BrowserThread::PostTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&Noop, base::RetainedRef(site_instance)));
 
-    // Remember the original web contents for the pending renderer process.
-    auto pending_process = site_instance->GetProcess();
-    pending_processes_[pending_process->GetID()] = web_contents;
-  }
+  // Remember the original renderer process of the pending renderer process.
+  auto current_process = current_instance->GetProcess();
+  auto pending_process = (*new_instance)->GetProcess();
+  pending_processes_[pending_process->GetID()] = current_process->GetID();
+  // Clear the entry in map when process ends.
+  current_process->AddObserver(this);
 }
 
 void AtomBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line,
     int process_id) {
-  // Make sure we're about to launch a known executable
-  {
-    base::FilePath child_path;
-    PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-  }
-
-  std::string process_type =
-      command_line->GetSwitchValueASCII(::switches::kProcessType);
-  if (process_type != ::switches::kRendererProcess)
+  std::string process_type = command_line->GetSwitchValueASCII("type");
+  if (process_type != "renderer")
     return;
 
   // Copy following switches to child process.
@@ -313,12 +241,11 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
   }
 
   content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
-  if (web_contents) {
-    WebContentsPreferences::AppendExtraCommandLineSwitches(
-        web_contents, command_line);
-    SessionPreferences::AppendExtraCommandLineSwitches(
-        web_contents->GetBrowserContext(), command_line);
-  }
+  if (!web_contents)
+    return;
+
+  WebContentsPreferences::AppendExtraCommandLineSwitches(
+      web_contents, command_line);
 }
 
 void AtomBrowserClient::DidCreatePpapiPlugin(
@@ -354,12 +281,10 @@ void AtomBrowserClient::AllowCertificateError(
 void AtomBrowserClient::SelectClientCertificate(
     content::WebContents* web_contents,
     net::SSLCertRequestInfo* cert_request_info,
-    net::ClientCertIdentityList client_certs,
     std::unique_ptr<content::ClientCertificateDelegate> delegate) {
-  if (!client_certs.empty() && delegate_) {
-    delegate_->SelectClientCertificate(web_contents, cert_request_info,
-                                       std::move(client_certs),
-                                       std::move(delegate));
+  if (!cert_request_info->client_certs.empty() && delegate_) {
+    delegate_->SelectClientCertificate(
+        web_contents, cert_request_info, std::move(delegate));
   }
 }
 
@@ -371,47 +296,42 @@ void AtomBrowserClient::ResourceDispatcherHostCreated() {
 }
 
 bool AtomBrowserClient::CanCreateWindow(
-    content::RenderFrameHost* opener,
     const GURL& opener_url,
     const GURL& opener_top_level_frame_url,
     const GURL& source_origin,
-    content::mojom::WindowContainerType container_type,
+    WindowContainerType container_type,
     const GURL& target_url,
     const content::Referrer& referrer,
     const std::string& frame_name,
     WindowOpenDisposition disposition,
-    const blink::mojom::WindowFeatures& features,
+    const blink::WebWindowFeatures& features,
     const std::vector<std::string>& additional_features,
-    const scoped_refptr<content::ResourceRequestBody>& body,
+    const scoped_refptr<content::ResourceRequestBodyImpl>& body,
     bool user_gesture,
     bool opener_suppressed,
+    content::ResourceContext* context,
+    int render_process_id,
+    int opener_render_view_id,
+    int opener_render_frame_id,
     bool* no_javascript_access) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
-  int opener_render_process_id = opener->GetProcess()->GetID();
-
-  if (IsRendererSandboxed(opener_render_process_id)) {
+  if (IsRendererSandboxed(render_process_id)) {
     *no_javascript_access = false;
     return true;
   }
 
-  if (RendererUsesNativeWindowOpen(opener_render_process_id)) {
-    if (RendererDisablesPopups(opener_render_process_id)) {
-      // <webview> without allowpopups attribute should return
-      // null from window.open calls
-      return false;
-    } else {
-      *no_javascript_access = false;
-      return true;
-    }
-  }
-
   if (delegate_) {
-    return delegate_->CanCreateWindow(
-        opener, opener_url, opener_top_level_frame_url, source_origin,
-        container_type, target_url, referrer, frame_name, disposition, features,
-        additional_features, body, user_gesture, opener_suppressed,
-        no_javascript_access);
+    content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+        base::Bind(&api::App::OnCreateWindow,
+                   base::Unretained(static_cast<api::App*>(delegate_)),
+                                    target_url,
+                                    frame_name,
+                                    disposition,
+                                    additional_features,
+                                    body,
+                                    render_process_id,
+                                    opener_render_frame_id));
   }
 
   return false;
@@ -427,19 +347,6 @@ void AtomBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
   additional_schemes->push_back(content::kChromeDevToolsScheme);
 }
 
-void AtomBrowserClient::SiteInstanceDeleting(
-    content::SiteInstance* site_instance) {
-  // We are storing weak_ptr, is it fundamental to maintain the map up-to-date
-  // when an instance is destroyed.
-  for (auto iter = site_per_affinities.begin();
-      iter != site_per_affinities.end(); ++iter) {
-    if (iter->second == site_instance) {
-      site_per_affinities.erase(iter);
-      break;
-    }
-  }
-}
-
 brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
     const content::MainFunctionParams&) {
   v8::V8::Initialize();  // Init V8 before creating main parts.
@@ -468,28 +375,13 @@ void AtomBrowserClient::WebNotificationAllowed(
 void AtomBrowserClient::RenderProcessHostDestroyed(
     content::RenderProcessHost* host) {
   int process_id = host->GetID();
-  pending_processes_.erase(process_id);
-  RemoveProcessPreferences(process_id);
-}
-
-void AtomBrowserClient::RenderProcessReady(content::RenderProcessHost* host) {
-  render_process_host_pids_[host->GetID()] = base::GetProcId(host->GetHandle());
-  if (delegate_) {
-    static_cast<api::App*>(delegate_)->RenderProcessReady(host);
-  }
-}
-
-void AtomBrowserClient::RenderProcessExited(content::RenderProcessHost* host,
-                                            base::TerminationStatus status,
-                                            int exit_code) {
-  auto host_pid = render_process_host_pids_.find(host->GetID());
-  if (host_pid != render_process_host_pids_.end()) {
-    if (delegate_) {
-      static_cast<api::App*>(delegate_)->RenderProcessDisconnected(
-          host_pid->second);
+  for (const auto& entry : pending_processes_) {
+    if (entry.first == process_id || entry.second == process_id) {
+      pending_processes_.erase(entry.first);
+      break;
     }
-    render_process_host_pids_.erase(host_pid);
   }
+  RemoveSandboxedRendererId(process_id);
 }
 
 }  // namespace atom

atom/browser/atom_browser_client.h

@@ -12,7 +12,6 @@
 
 #include "brightray/browser/browser_client.h"
 #include "content/public/browser/render_process_host_observer.h"
-#include "net/ssl/client_cert_identity.h"
 
 namespace content {
 class QuotaPermissionContext;
@@ -53,6 +52,7 @@ class AtomBrowserClient : public brightray::BrowserClient,
       CreateSpeechRecognitionManagerDelegate() override;
   void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
                            content::WebPreferences* prefs) override;
+  std::string GetApplicationLocale() override;
   void OverrideSiteInstanceForNavigation(
       content::RenderFrameHost* render_frame_host,
       content::BrowserContext* browser_context,
@@ -77,28 +77,29 @@ class AtomBrowserClient : public brightray::BrowserClient,
   void SelectClientCertificate(
       content::WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
-      net::ClientCertIdentityList client_certs,
       std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
   void ResourceDispatcherHostCreated() override;
   bool CanCreateWindow(
-      content::RenderFrameHost* opener,
       const GURL& opener_url,
       const GURL& opener_top_level_frame_url,
       const GURL& source_origin,
-      content::mojom::WindowContainerType container_type,
+      WindowContainerType container_type,
       const GURL& target_url,
       const content::Referrer& referrer,
       const std::string& frame_name,
       WindowOpenDisposition disposition,
-      const blink::mojom::WindowFeatures& features,
+      const blink::WebWindowFeatures& features,
       const std::vector<std::string>& additional_features,
-      const scoped_refptr<content::ResourceRequestBody>& body,
+      const scoped_refptr<content::ResourceRequestBodyImpl>& body,
       bool user_gesture,
       bool opener_suppressed,
+      content::ResourceContext* context,
+      int render_process_id,
+      int opener_render_view_id,
+      int opener_render_frame_id,
       bool* no_javascript_access) override;
   void GetAdditionalAllowedSchemesForFileSystem(
       std::vector<std::string>* schemes) override;
-  void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
 
   // brightray::BrowserClient:
   brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
@@ -109,37 +110,21 @@ class AtomBrowserClient : public brightray::BrowserClient,
 
   // content::RenderProcessHostObserver:
   void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
-  void RenderProcessReady(content::RenderProcessHost* host) override;
-  void RenderProcessExited(content::RenderProcessHost* host,
-                           base::TerminationStatus status,
-                           int exit_code) override;
 
  private:
-  bool ShouldCreateNewSiteInstance(content::RenderFrameHost* render_frame_host,
-                                   content::BrowserContext* browser_context,
+  bool ShouldCreateNewSiteInstance(content::BrowserContext* browser_context,
                                    content::SiteInstance* current_instance,
                                    const GURL& dest_url);
-  struct ProcessPreferences {
-    bool sandbox = false;
-    bool native_window_open = false;
-    bool disable_popups = false;
-  };
-  void AddProcessPreferences(int process_id, ProcessPreferences prefs);
-  void RemoveProcessPreferences(int process_id);
+  // Add/remove a process id to `sandboxed_renderers_`.
+  void AddSandboxedRendererId(int process_id);
+  void RemoveSandboxedRendererId(int process_id);
   bool IsRendererSandboxed(int process_id);
-  bool RendererUsesNativeWindowOpen(int process_id);
-  bool RendererDisablesPopups(int process_id);
 
-  // pending_render_process => web contents.
-  std::map<int, content::WebContents*> pending_processes_;
-
-  std::map<int, ProcessPreferences> process_preferences_;
-  std::map<int, base::ProcessId> render_process_host_pids_;
-
-  // list of site per affinity. weak_ptr to prevent instance locking
-  std::map<std::string, content::SiteInstance*> site_per_affinities;
-
-  base::Lock process_preferences_lock_;
+  // pending_render_process => current_render_process.
+  std::map<int, int> pending_processes_;
+  // Set that contains the process ids of all sandboxed renderers
+  std::set<int> sandboxed_renderers_;
+  base::Lock sandboxed_renderers_lock_;
 
   std::unique_ptr<AtomResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;

atom/browser/atom_browser_context.cc

@@ -13,6 +13,7 @@
 #include "atom/browser/net/about_protocol_handler.h"
 #include "atom/browser/net/asar/asar_protocol_handler.h"
 #include "atom/browser/net/atom_cert_verifier.h"
+#include "atom/browser/net/atom_ct_delegate.h"
 #include "atom/browser/net/atom_network_delegate.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
 #include "atom/browser/net/http_protocol_handler.h"
@@ -71,6 +72,8 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
                                        bool in_memory,
                                        const base::DictionaryValue& options)
     : brightray::BrowserContext(partition, in_memory),
+      ct_delegate_(new AtomCTDelegate),
+      network_delegate_(new AtomNetworkDelegate),
       cookie_delegate_(new AtomCookieDelegate) {
   // Construct user agent string.
   Browser* browser = Browser::Get();
@@ -103,9 +106,8 @@ void AtomBrowserContext::SetUserAgent(const std::string& user_agent) {
   user_agent_ = user_agent;
 }
 
-std::unique_ptr<net::NetworkDelegate>
-AtomBrowserContext::CreateNetworkDelegate() {
-  return base::MakeUnique<AtomNetworkDelegate>();
+net::NetworkDelegate* AtomBrowserContext::CreateNetworkDelegate() {
+  return network_delegate_;
 }
 
 net::CookieMonsterDelegate* AtomBrowserContext::CreateCookieDelegate() {
@@ -190,9 +192,8 @@ content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
   return permission_manager_.get();
 }
 
-std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier(
-    brightray::RequireCTDelegate* ct_delegate) {
-  return base::WrapUnique(new AtomCertVerifier(ct_delegate));
+std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
+  return base::WrapUnique(new AtomCertVerifier(ct_delegate_.get()));
 }
 
 std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
@@ -203,6 +204,11 @@ std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
   return default_schemes;
 }
 
+net::TransportSecurityState::RequireCTDelegate*
+AtomBrowserContext::GetRequireCTDelegate() {
+  return ct_delegate_.get();
+}
+
 void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
   pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
                                       base::FilePath());

atom/browser/atom_browser_context.h

@@ -15,6 +15,7 @@
 namespace atom {
 
 class AtomBlobReader;
+class AtomCTDelegate;
 class AtomDownloadManagerDelegate;
 class AtomNetworkDelegate;
 class AtomPermissionManager;
@@ -32,16 +33,17 @@ class AtomBrowserContext : public brightray::BrowserContext {
   void SetUserAgent(const std::string& user_agent);
 
   // brightray::URLRequestContextGetter::Delegate:
-  std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
+  net::NetworkDelegate* CreateNetworkDelegate() override;
   net::CookieMonsterDelegate* CreateCookieDelegate() override;
   std::string GetUserAgent() override;
   std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
       content::ProtocolHandlerMap* protocol_handlers) override;
   net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
       const base::FilePath& base_path) override;
-  std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-      brightray::RequireCTDelegate* ct_delegate) override;
+  std::unique_ptr<net::CertVerifier> CreateCertVerifier() override;
   std::vector<std::string> GetCookieableSchemes() override;
+  net::TransportSecurityState::RequireCTDelegate* GetRequireCTDelegate()
+      override;
 
   // content::BrowserContext:
   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
@@ -52,6 +54,7 @@ class AtomBrowserContext : public brightray::BrowserContext {
   void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
 
   AtomBlobReader* GetBlobReader();
+  AtomNetworkDelegate* network_delegate() const { return network_delegate_; }
   AtomCookieDelegate* cookie_delegate() const {
     return cookie_delegate_.get();
   }
@@ -66,9 +69,12 @@ class AtomBrowserContext : public brightray::BrowserContext {
   std::unique_ptr<WebViewManager> guest_manager_;
   std::unique_ptr<AtomPermissionManager> permission_manager_;
   std::unique_ptr<AtomBlobReader> blob_reader_;
+  std::unique_ptr<AtomCTDelegate> ct_delegate_;
   std::string user_agent_;
   bool use_cache_;
 
+  // Managed by brightray::BrowserContext.
+  AtomNetworkDelegate* network_delegate_;
   scoped_refptr<AtomCookieDelegate> cookie_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);

atom/browser/atom_browser_main_parts.cc

@@ -4,7 +4,6 @@
 
 #include "atom/browser/atom_browser_main_parts.h"
 
-#include "atom/browser/api/atom_api_app.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/atom_access_token_store.h"
 #include "atom/browser/atom_browser_client.h"
@@ -24,7 +23,6 @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "device/geolocation/geolocation_delegate.h"
 #include "device/geolocation/geolocation_provider.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "v8/include/v8-debug.h"
 
 #if defined(USE_X11)
@@ -39,10 +37,7 @@ namespace {
 // A provider of Geolocation services to override AccessTokenStore.
 class AtomGeolocationDelegate : public device::GeolocationDelegate {
  public:
-  AtomGeolocationDelegate() {
-    device::GeolocationProvider::GetInstance()
-        ->UserDidOptIntoLocationServices();
-  }
+  AtomGeolocationDelegate() = default;
 
   scoped_refptr<device::AccessTokenStore> CreateAccessTokenStore() final {
     return new AtomAccessTokenStore();
@@ -134,14 +129,17 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
 
   node_bindings_->Initialize();
 
+  // Support the "--debug" switch.
+  node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
+
   // Create the global environment.
   node::Environment* env =
       node_bindings_->CreateEnvironment(js_env_->context());
   node_env_.reset(new NodeEnvironment(env));
 
-  // Enable support for v8 inspector
-  node_debugger_.reset(new NodeDebugger(env));
-  node_debugger_->Start(js_env_->platform());
+  // Make sure node can get correct environment when debugging.
+  if (node_debugger_->IsRunning())
+    env->AssignToContext(v8::Debug::GetDebugContext(js_env_->isolate()));
 
   // Add Electron extended APIs.
   atom_bindings_->BindTo(js_env_->isolate(), env->process_object());
@@ -153,15 +151,6 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
   node_bindings_->set_uv_env(env);
 }
 
-int AtomBrowserMainParts::PreCreateThreads() {
-  const int result = brightray::BrowserMainParts::PreCreateThreads();
-  if (!result) {
-    fake_browser_process_->SetApplicationLocale(
-        brightray::BrowserClient::Get()->GetApplicationLocale());
-  }
-  return result;
-}
-
 void AtomBrowserMainParts::PreMainMessageLoopRun() {
   js_env_->OnMessageLoopCreated();
 
@@ -197,9 +186,6 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
   std::unique_ptr<base::DictionaryValue> empty_info(new base::DictionaryValue);
   Browser::Get()->DidFinishLaunching(*empty_info);
 #endif
-
-  // Notify observers that main thread message loop was initialized.
-  Browser::Get()->PreMainMessageLoopRun();
 }
 
 bool AtomBrowserMainParts::MainMessageLoopRun(int* result_code) {

atom/browser/atom_browser_main_parts.h

@@ -49,7 +49,6 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
   // content::BrowserMainParts:
   void PreEarlyInitialization() override;
   void PostEarlyInitialization() override;
-  int PreCreateThreads() override;
   void PreMainMessageLoopRun() override;
   bool MainMessageLoopRun(int* result_code) override;
   void PostMainMessageLoopStart() override;

atom/browser/atom_browser_main_parts_posix.cc

@@ -119,8 +119,9 @@ void ShutdownDetector::ThreadMain() {
 
   int signal;
   size_t bytes_read = 0;
+  ssize_t ret;
   do {
-    ssize_t ret = HANDLE_EINTR(
+    ret = HANDLE_EINTR(
         read(shutdown_fd_,
              reinterpret_cast<char*>(&signal) + bytes_read,
              sizeof(signal) - bytes_read));

atom/browser/atom_download_manager_delegate.cc

@@ -21,32 +21,6 @@
 
 namespace atom {
 
-namespace {
-
-// Generate default file path to save the download.
-void CreateDownloadPath(
-    const GURL& url,
-    const std::string& content_disposition,
-    const std::string& suggested_filename,
-    const std::string& mime_type,
-    const base::FilePath& default_download_path,
-    const AtomDownloadManagerDelegate::CreateDownloadPathCallback& callback) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
-
-  auto generated_name =
-      net::GenerateFileName(url, content_disposition, std::string(),
-                            suggested_filename, mime_type, "download");
-
-  if (!base::PathExists(default_download_path))
-    base::CreateDirectory(default_download_path);
-
-  base::FilePath path(default_download_path.Append(generated_name));
-  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
-                                   base::Bind(callback, path));
-}
-
-}  // namespace
-
 AtomDownloadManagerDelegate::AtomDownloadManagerDelegate(
     content::DownloadManager* manager)
     : download_manager_(manager),
@@ -72,6 +46,30 @@ void AtomDownloadManagerDelegate::GetItemSavePath(content::DownloadItem* item,
     *path = download->GetSavePath();
 }
 
+void AtomDownloadManagerDelegate::CreateDownloadPath(
+    const GURL& url,
+    const std::string& content_disposition,
+    const std::string& suggested_filename,
+    const std::string& mime_type,
+    const base::FilePath& default_download_path,
+    const CreateDownloadPathCallback& callback) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
+
+  auto generated_name = net::GenerateFileName(url,
+                                              content_disposition,
+                                              std::string(),
+                                              suggested_filename,
+                                              mime_type,
+                                              "download");
+
+  if (!base::PathExists(default_download_path))
+    base::CreateDirectory(default_download_path);
+
+  base::FilePath path(default_download_path.Append(generated_name));
+  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+                                   base::Bind(callback, path));
+}
+
 void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
     uint32_t download_id,
     const content::DownloadTargetCallback& callback,
@@ -94,7 +92,6 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
   // Show save dialog if save path was not set already on item
   file_dialog::DialogSettings settings;
   settings.parent_window = window;
-  settings.force_detached = window->is_offscreen_dummy();
   settings.title = item->GetURL().spec();
   settings.default_path = default_path;
   if (path.empty() && file_dialog::ShowSaveDialog(settings, &path)) {
@@ -118,10 +115,7 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
   // If user cancels the file save dialog, run the callback with empty FilePath.
   callback.Run(path,
                content::DownloadItem::TARGET_DISPOSITION_PROMPT,
-               content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
-               path.empty() ?
-                   content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED :
-                   content::DOWNLOAD_INTERRUPT_REASON_NONE);
+               content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path);
 }
 
 void AtomDownloadManagerDelegate::Shutdown() {
@@ -138,8 +132,7 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
     callback.Run(download->GetForcedFilePath(),
                  content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
                  content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                 download->GetForcedFilePath(),
-                 content::DOWNLOAD_INTERRUPT_REASON_NONE);
+                 download->GetForcedFilePath());
     return true;
   }
 
@@ -150,7 +143,7 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
     callback.Run(save_path,
                  content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
                  content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                 save_path, content::DOWNLOAD_INTERRUPT_REASON_NONE);
+                 save_path);
     return true;
   }
 
@@ -166,10 +159,14 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
-      base::Bind(&CreateDownloadPath, download->GetURL(),
+      base::Bind(&AtomDownloadManagerDelegate::CreateDownloadPath,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 download->GetURL(),
                  download->GetContentDisposition(),
-                 download->GetSuggestedFilename(), download->GetMimeType(),
-                 default_download_path, download_path_callback));
+                 download->GetSuggestedFilename(),
+                 download->GetMimeType(),
+                 default_download_path,
+                 download_path_callback));
   return true;
 }
 

atom/browser/atom_download_manager_delegate.h

@@ -24,6 +24,13 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
   explicit AtomDownloadManagerDelegate(content::DownloadManager* manager);
   virtual ~AtomDownloadManagerDelegate();
 
+  // Generate default file path to save the download.
+  void CreateDownloadPath(const GURL& url,
+                          const std::string& suggested_filename,
+                          const std::string& content_disposition,
+                          const std::string& mime_type,
+                          const base::FilePath& path,
+                          const CreateDownloadPathCallback& callback);
   void OnDownloadPathGenerated(uint32_t download_id,
                                const content::DownloadTargetCallback& callback,
                                const base::FilePath& default_path);

atom/browser/atom_javascript_dialog_manager.cc

@@ -7,37 +7,33 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/message_box.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 
-using content::JavaScriptDialogType;
+using content::JavaScriptMessageType;
 
 namespace atom {
 
-AtomJavaScriptDialogManager::AtomJavaScriptDialogManager(
-    api::WebContents* api_web_contents)
-    : api_web_contents_(api_web_contents) {}
-
 void AtomJavaScriptDialogManager::RunJavaScriptDialog(
     content::WebContents* web_contents,
     const GURL& origin_url,
-    JavaScriptDialogType dialog_type,
+    JavaScriptMessageType message_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
-  if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT &&
-      dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
+
+  if (message_type != JavaScriptMessageType::JAVASCRIPT_MESSAGE_TYPE_ALERT &&
+      message_type != JavaScriptMessageType::JAVASCRIPT_MESSAGE_TYPE_CONFIRM) {
     callback.Run(false, base::string16());
     return;
   }
 
   std::vector<std::string> buttons = {"OK"};
-  if (dialog_type == JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
+  if (message_type == JavaScriptMessageType::JAVASCRIPT_MESSAGE_TYPE_CONFIRM) {
     buttons.push_back("Cancel");
   }
 
@@ -53,13 +49,13 @@ void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
     bool is_reload,
     const DialogClosedCallback& callback) {
-  bool default_prevented = api_web_contents_->Emit("will-prevent-unload");
-  callback.Run(default_prevented, base::string16());
-  return;
+  // FIXME(zcbenz): the |message_text| is removed, figure out what should we do.
+  callback.Run(false, base::ASCIIToUTF16("This should not be displayed"));
 }
 
 void AtomJavaScriptDialogManager::CancelDialogs(
     content::WebContents* web_contents,
+    bool suppress_callbacks,
     bool reset_state) {
 }
 

atom/browser/atom_javascript_dialog_manager.h

@@ -11,19 +11,13 @@
 
 namespace atom {
 
-namespace api {
-class WebContents;
-}
-
 class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
  public:
-  explicit AtomJavaScriptDialogManager(api::WebContents* api_web_contents);
-
   // content::JavaScriptDialogManager implementations.
   void RunJavaScriptDialog(
       content::WebContents* web_contents,
       const GURL& origin_url,
-      content::JavaScriptDialogType dialog_type,
+      content::JavaScriptMessageType javascript_message_type,
       const base::string16& message_text,
       const base::string16& default_prompt_text,
       const DialogClosedCallback& callback,
@@ -33,13 +27,13 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
       bool is_reload,
       const DialogClosedCallback& callback) override;
   void CancelDialogs(content::WebContents* web_contents,
+                     bool suppress_callbacks,
                      bool reset_state) override;
 
  private:
   static void OnMessageBoxCallback(const DialogClosedCallback& callback,
                                    int code,
                                    bool checkbox_checked);
-  api::WebContents* api_web_contents_;
 };
 
 }  // namespace atom