Bump v6.0.1

* fix: clear recent documents on windows

* chore: don't check for version < win 7

.circleci/config.yml

@@ -102,12 +102,6 @@ env-mac-large: &env-mac-large
 env-disable-crash-reporter-tests: &env-disable-crash-reporter-tests
   DISABLE_CRASH_REPORTER_TESTS: true
 
-env-ninja-status: &env-ninja-status
-  NINJA_STATUS: "[%r processes, %f/%t @ %o/s : %es] "
-
-env-disable-run-as-node: &env-disable-run-as-node
-  GN_BUILDFLAG_ARGS: 'enable_run_as_node = false'
-
 # Individual (shared) steps.
 step-maybe-notify-slack-failure: &step-maybe-notify-slack-failure
   run:
@@ -150,16 +144,13 @@ step-gclient-sync: &step-gclient-sync
   run:
     name: Gclient sync
     command: |
-      # If we did not restore a complete sync then we need to sync for realz
-      if [ ! -s "src/electron/.circle-sync-done" ]; then
-        gclient config \
-          --name "src/electron" \
-          --unmanaged \
-          $GCLIENT_EXTRA_ARGS \
-          "$CIRCLE_REPOSITORY_URL"
+      gclient config \
+        --name "src/electron" \
+        --unmanaged \
+        $GCLIENT_EXTRA_ARGS \
+        "$CIRCLE_REPOSITORY_URL"
 
-        gclient sync --with_branch_heads --with_tags
-      fi
+      gclient sync --with_branch_heads --with_tags
 
 step-setup-env-for-build: &step-setup-env-for-build
   run:
@@ -254,7 +245,7 @@ step-gn-gen-default: &step-gn-gen-default
     name: Default GN gen
     command: |
       cd src
-      gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS"
 
 step-gn-check: &step-gn-check
   run:
@@ -264,7 +255,7 @@ step-gn-check: &step-gn-check
       gn check out/Default //electron:electron_lib
       gn check out/Default //electron:electron_app
       gn check out/Default //electron:manifests
-      gn check out/Default //electron/shell/common/api:mojo
+      gn check out/Default //electron/atom/common/api:mojo
 
 step-electron-build: &step-electron-build
   run:
@@ -350,10 +341,10 @@ step-electron-publish: &step-electron-publish
       cd src/electron
       if [ "$UPLOAD_TO_S3" == "1" ]; then
         echo 'Uploading Electron release distribution to S3'
-        script/release/uploaders/upload.py --upload_to_s3
+        script/upload.py --upload_to_s3
       else
         echo 'Uploading Electron release distribution to Github releases'
-        script/release/uploaders/upload.py
+        script/upload.py
       fi
 
 step-persist-data-for-tests: &step-persist-data-for-tests
@@ -459,25 +450,13 @@ step-mksnapshot-store: &step-mksnapshot-store
     path: src/out/Default/mksnapshot.zip
     destination: mksnapshot.zip
 
-step-maybe-build-dump-syms: &step-maybe-build-dump-syms
-  run:
-    name: Build dump_syms binary
-    command: |
-      if [ "$GENERATE_SYMBOLS" == "true" ]; then
-        cd src
-        # Build needed dump_syms executable
-        ninja -C out/Default third_party/breakpad:dump_syms
-      fi
-
 step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
   run:
     name: Generate breakpad symbols
     command: |
       if [ "$GENERATE_SYMBOLS" == "true" ]; then
         cd src
-        export BUILD_PATH="$PWD/out/Default"
-        export DEST_PATH="$BUILD_PATH/breakpad_symbols"
-        electron/script/dump-symbols.py -b $BUILD_PATH -d $DEST_PATH -v
+        ninja -C out/Default electron:electron_symbols
       fi
 
 step-maybe-zip-symbols: &step-maybe-zip-symbols
@@ -521,7 +500,7 @@ step-maybe-trigger-arm-test: &step-maybe-trigger-arm-test
       if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
         #Trigger VSTS job, passing along CircleCI job number and branch to build
         echo "Triggering electron-$TARGET_ARCH-testing build on VSTS"
-        node electron/script/release/ci-release-build.js --job=electron-$TARGET_ARCH-testing --ci=VSTS --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
+        node electron/script/ci-release-build.js --job=electron-$TARGET_ARCH-testing --ci=VSTS --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
       fi
 
 step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
@@ -541,12 +520,6 @@ step-fix-known-hosts-linux: &step-fix-known-hosts-linux
         ./src/electron/.circleci/fix-known-hosts.sh
       fi
 
-step-ninja-summary: &step-ninja-summary
-  run:
-    name: Print ninja summary
-    command: |
-      python depot_tools/post_build_ninja_summary.py -C src/out/Default
-
 # Lists of steps.
 steps-lint: &steps-lint
   steps:
@@ -580,7 +553,7 @@ steps-lint: &steps-lint
           # but then we would lint its contents (at least gn format), and it doesn't pass it.
 
           cd src/electron
-          node script/yarn install --frozen-lockfile
+          node script/yarn install
           node script/yarn lint
 
 steps-checkout: &steps-checkout
@@ -592,82 +565,34 @@ steps-checkout: &steps-checkout
     - *step-get-more-space-on-mac
     - *step-install-gnutar-on-mac
 
-    - run:
-        name: Generate DEPS Hash
-        command: node src/electron/script/generate-deps-hash.js
-    - run:
-        name: Touch Sync Done
-        command: touch src/electron/.circle-sync-done
-    # Restore exact src cache based on the hash of DEPS and patches/*
-    # If no cache is matched EXACTLY then the .circle-sync-done file is empty
-    # If a cache is matched EXACTLY then the .circle-sync-done file contains "done"
-    - restore_cache:
-        paths:
-          - ./src
-        keys:
-          - v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
-        name: Restoring src cache
-    # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
-    # If the src cache was restored above then this will match an empty cache
-    # If the src cache was not restored above then this will match a close git cache
     - restore_cache:
         paths:
           - ~/.gclient-cache
         keys:
-          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}
-        name: Conditionally restoring git cache
+          - v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
+          - v1-gclient-cache-{{ arch }}-
     - run:
         name: Set GIT_CACHE_PATH to make gclient to use the cache
         command: |
           # CircleCI does not support interpolation when setting environment variables.
           # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
           echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
-    # This sync call only runs if .circle-sync-done is an EMPTY file
     - *step-gclient-sync
-    # Persist the git cache based on the hash of DEPS and .circle-sync-done
-    # If the src cache was restored above then this will persist an empty cache
     - save_cache:
         paths:
           - ~/.gclient-cache
-        key: v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-        name: Persisting git cache
-    # These next few steps reset Electron to the correct commit regardless of which cache was restored
-    - run:
-        name: Wipe Electron
-        command: rm -rf src/electron
-    - *step-checkout-electron
-    - run:
-        name: Run Electron Only Hooks
-        command: gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
-    - run:
-        name: Generate DEPS Hash
-        command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js
-    # Mark the sync as done for future cache saving
-    - run:
-        name: Mark Sync Done
-        command: echo DONE > src/electron/.circle-sync-done
-    # Minimize the size of the cache
-    - run:
-        name: Remove some unused data to avoid storing it in the workspace/cache
-        command: |
-          rm -rf src/android_webview
-          rm -rf src/ios
-          rm -rf src/third_party/blink/web_tests
-          rm -rf src/third_party/blink/perf_tests
-          rm -rf src/third_party/hunspell_dictionaries
-          rm -rf src/third_party/WebKit/LayoutTests
-    # Save the src cache based on the deps hash
-    - save_cache:
-        paths:
-          - ./src
-        key: v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
-        name: Persisting src cache
+        key: v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
     - save_cache:
         paths:
           - /usr/local/Homebrew
         key: v1-brew-cache-{{ arch }}
-        name: Persisting brew cache
+
+    - run:
+        name: Remove some unused data to avoid storing it in the workspace
+        command: |
+          rm -rf src/android_webview
+          rm -rf src/ios
+          rm -rf src/third_party/WebKit/LayoutTests
     - persist_to_workspace:
         root: .
         paths:
@@ -695,7 +620,6 @@ steps-electron-build: &steps-electron-build
     - *step-electron-build
     - *step-electron-dist-build
     - *step-electron-dist-store
-    - *step-ninja-summary
 
     # Node.js headers
     - *step-nodejs-headers-build
@@ -719,7 +643,6 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     - *step-maybe-electron-dist-strip
     - *step-electron-dist-build
     - *step-electron-dist-store
-    - *step-ninja-summary
 
     # Node.js headers
     - *step-nodejs-headers-build
@@ -741,7 +664,6 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     # Save all data needed for a further tests run.
     - *step-persist-data-for-tests
 
-    - *step-maybe-build-dump-syms
     - *step-maybe-generate-breakpad-symbols
     - *step-maybe-zip-symbols
 
@@ -767,7 +689,6 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-maybe-electron-dist-strip
     - *step-electron-dist-build
     - *step-electron-dist-store
-    - *step-maybe-build-dump-syms
     - *step-maybe-generate-breakpad-symbols
     - *step-maybe-zip-symbols
 
@@ -880,7 +801,7 @@ steps-tests: &steps-tests
         name: Run Electron tests
         environment:
           MOCHA_REPORTER: mocha-multi-reporters
-          MOCHA_FILE: junit/test-results.xml
+          ELECTRON_TEST_RESULTS_DIR: junit
           MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
           ELECTRON_DISABLE_SECURITY_WARNINGS: 1
         command: |
@@ -890,15 +811,13 @@ steps-tests: &steps-tests
     - run:
         name: Check test results existence
         command: |
-          MOCHA_FILE='src/junit/test-results-remote.xml'
-          # Check if it exists and not empty.
-          if [ ! -s "$MOCHA_FILE" ]; then
+          cd src
+
+          # Check if test results exist and are not empty.
+          if [ ! -s "junit/test-results-remote.xml" ]; then
             exit 1
           fi
-
-          MOCHA_FILE='src/junit/test-results-main.xml'
-          # Check if it exists and not empty.
-          if [ ! -s "$MOCHA_FILE" ]; then
+          if [ ! -s "junit/test-results-main.xml" ]; then
             exit 1
           fi
     - store_test_results:
@@ -908,21 +827,6 @@ steps-tests: &steps-tests
 
     - *step-maybe-notify-slack-failure
 
-steps-test-nan: &steps-test-nan
-  steps:
-    - attach_workspace:
-          at: .
-    - *step-depot-tools-add-to-path
-    - *step-electron-dist-unzip
-    - *step-setup-linux-for-headless-testing
-    - *step-fix-known-hosts-linux
-    - run:
-        name: Run Nan Tests
-        command: |
-          cd src
-          export ELECTRON_OUT_DIR=Default
-          node electron/script/nan-spec-runner.js
-
 chromium-upgrade-branches: &chromium-upgrade-branches
   /chromium\-upgrade\/[0-9]+/
 
@@ -972,7 +876,6 @@ jobs:
       <<: *env-linux-2xlarge
       <<: *env-debug-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build
 
   linux-x64-debug-gn-check:
@@ -988,17 +891,6 @@ jobs:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
-    <<: *steps-electron-build-for-tests
-
-  linux-x64-testing-no-run-as-node:
-    <<: *machine-linux-2xlarge
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-testing-build
-      <<: *env-enable-sccache
-      <<: *env-ninja-status
-      <<: *env-disable-run-as-node
     <<: *steps-electron-build-for-tests
 
   linux-x64-testing-gn-check:
@@ -1024,7 +916,6 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-x64-publish:
@@ -1042,7 +933,6 @@ jobs:
       <<: *env-ia32
       <<: *env-debug-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build
 
   linux-ia32-testing:
@@ -1052,7 +942,6 @@ jobs:
       <<: *env-ia32
       <<: *env-testing-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-ia32-chromedriver:
@@ -1073,7 +962,6 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-ia32-publish:
@@ -1092,7 +980,6 @@ jobs:
       <<: *env-arm
       <<: *env-debug-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build
 
   linux-arm-testing:
@@ -1102,7 +989,6 @@ jobs:
       <<: *env-arm
       <<: *env-testing-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
       TRIGGER_ARM_TEST: true
     <<: *steps-electron-build-for-tests
 
@@ -1124,7 +1010,6 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-arm-publish:
@@ -1143,7 +1028,6 @@ jobs:
       <<: *env-arm64
       <<: *env-debug-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build
 
   linux-arm64-debug-gn-check:
@@ -1161,7 +1045,6 @@ jobs:
       <<: *env-arm64
       <<: *env-testing-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
       TRIGGER_ARM_TEST: true
     <<: *steps-electron-build-for-tests
 
@@ -1191,7 +1074,6 @@ jobs:
       <<: *env-release-build
       <<: *env-enable-sccache
       <<: *env-send-slack-notifications
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   linux-arm64-publish:
@@ -1209,7 +1091,6 @@ jobs:
       <<: *env-mac-large
       <<: *env-testing-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   osx-debug-gn-check:
@@ -1241,7 +1122,6 @@ jobs:
       <<: *env-mac-large
       <<: *env-release-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   osx-publish:
@@ -1259,7 +1139,6 @@ jobs:
       <<: *env-mas
       <<: *env-testing-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status
     <<: *steps-electron-build-for-tests
 
   mas-debug-gn-check:
@@ -1294,7 +1173,6 @@ jobs:
       <<: *env-mas
       <<: *env-release-build
       <<: *env-enable-sccache
-      <<: *env-ninja-status      
     <<: *steps-electron-build-for-tests
 
   mas-publish:
@@ -1354,14 +1232,6 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-tests
 
-  linux-x64-testing-nan:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-nan
-
   linux-x64-release-tests:
     <<: *machine-linux-medium
     environment:
@@ -1395,15 +1265,6 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-tests
 
-  linux-ia32-testing-nan:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-nan
-
   linux-ia32-release-tests:
     <<: *machine-linux-medium
     environment:
@@ -1559,18 +1420,12 @@ workflows:
       - linux-x64-testing:
           requires:
             - linux-checkout
-      - linux-x64-testing-no-run-as-node:
-          requires:
-            - linux-checkout
       - linux-x64-testing-gn-check:
           requires:
             - linux-checkout
       - linux-x64-testing-tests:
           requires:
             - linux-x64-testing
-      - linux-x64-testing-nan:
-          requires:
-            - linux-x64-testing
 
       - linux-ia32-debug:
           requires:
@@ -1581,9 +1436,6 @@ workflows:
       - linux-ia32-testing-tests:
           requires:
             - linux-ia32-testing
-      - linux-ia32-testing-nan:
-          requires:
-            - linux-ia32-testing
 
       - linux-arm-debug:
           requires:

.dockerignore

@@ -1,3 +1,4 @@
 *
 !tools/xvfb-init.sh
+!tools/run-electron.sh
 !build/install-build-deps.sh

.github/CODEOWNERS

@@ -4,18 +4,17 @@
 # https://git-scm.com/docs/gitignore
 
 # Most stuff in here is owned by the Community & Safety WG...
-/.github/*                              @electron/wg-community
+/.github/* @electron/wg-community
 
 # ...except the Admin WG maintains this file.
-/.github/CODEOWNERS                     @electron/wg-admin
+/.github/CODEOWNERS @electron/wg-admin
 
 # Upgrades WG
-/patches/                               @electron/wg-upgrades
+/patches/ @electron/wg-upgrades
 
 # Docs & Tooling WG
 /default_app/ @electron/wg-docs-tools
-/docs/                                  @electron/wg-docs-tools
+/docs/ @electron/wg-docs-tools
 
 # Releases WG
-/npm/                                   @electron/wg-releases
-/script/release                         @electron/wg-releases
+/npm/ @electron/wg-releases

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -20,7 +20,7 @@ about: Create a report to help us improve Electron
   * <!-- (output of `node_modules/.bin/electron --version`) e.g. 4.0.3 -->
 * **Operating System:**
   * <!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
-* **Last Known Working Electron version:**
+* **Last Known Working Electron version:**:
   * <!-- (if applicable) e.g. 3.1.0 -->
 
 ### Expected Behavior

.github/main.workflow

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

.gitignore

@@ -62,6 +62,3 @@ spec/.hash
 
 # If someone runs tsc this is where stuff will end up
 ts-gen
-
-# Used to accelerate CI builds
-.depshash

BUILD.gn

@@ -1,6 +1,7 @@
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
+import("//content/public/app/mac_helpers.gni")
 import("//pdf/features.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
@@ -10,10 +11,10 @@ import("//tools/grit/repack.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//v8/gni/snapshot_toolchain.gni")
 import("build/asar.gni")
+import("build/extract_symbols.gni")
+import("build/js_wrap.gni")
 import("build/npm.gni")
-import("build/templated_file.gni")
 import("build/tsc.gni")
-import("build/webpack/webpack.gni")
 import("buildflags/buildflags.gni")
 import("electron_paks.gni")
 import("filenames.auto.gni")
@@ -41,7 +42,7 @@ if (is_linux) {
   }
 }
 
-branding = read_file("shell/app/BRANDING.json", "json")
+branding = read_file("atom/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
 electron_mac_bundle_id = branding.mac_bundle_id
@@ -53,8 +54,8 @@ if (is_mas_build) {
 
 config("branding") {
   defines = [
-    "ELECTRON_PRODUCT_NAME=\"$electron_product_name\"",
-    "ELECTRON_PROJECT_NAME=\"$electron_project_name\"",
+    "ATOM_PRODUCT_NAME=\"$electron_product_name\"",
+    "ATOM_PROJECT_NAME=\"$electron_project_name\"",
   ]
 }
 
@@ -73,70 +74,135 @@ npm_action("build_electron_definitions") {
   ]
 }
 
-webpack_build("electron_browser_bundle") {
+npm_action("atom_browserify_sandbox_unwrapped") {
+  script = "browserify"
   deps = [
     ":build_electron_definitions",
   ]
 
-  inputs = auto_filenames.browser_bundle_deps
+  inputs = auto_filenames.sandbox_browserify_deps
 
-  config_file = "//electron/build/webpack/webpack.config.browser.js"
-  out_file = "$target_gen_dir/js2c/browser_init.js"
+  outputs = [
+    "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
+  ]
+
+  args = [
+    "lib/sandboxed_renderer/init.js",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
+    "-t",
+    "aliasify",
+    "-p",
+    "[",
+    "tsify",
+    "-p",
+    "tsconfig.electron.json",
+    "]",
+    "--standalone",
+    "sandboxed_preload",
+    "-o",
+    rebase_path(outputs[0]),
+  ]
 }
 
-webpack_build("electron_renderer_bundle") {
+npm_action("atom_browserify_isolated_unwrapped") {
+  script = "browserify"
   deps = [
     ":build_electron_definitions",
   ]
 
-  inputs = auto_filenames.renderer_bundle_deps
+  inputs = auto_filenames.isolated_browserify_deps
 
-  config_file = "//electron/build/webpack/webpack.config.renderer.js"
-  out_file = "$target_gen_dir/js2c/renderer_init.js"
+  outputs = [
+    "$target_gen_dir/js2c/isolated_bundle_unwrapped.js",
+  ]
+
+  args = [
+    "lib/isolated_renderer/init.js",
+    "-t",
+    "aliasify",
+    "-p",
+    "[",
+    "tsify",
+    "-p",
+    "tsconfig.electron.json",
+    "]",
+    "--standalone",
+    "isolated_preload",
+    "-o",
+    rebase_path(outputs[0]),
+  ]
 }
 
-webpack_build("electron_worker_bundle") {
+npm_action("atom_browserify_content_script_unwrapped") {
+  script = "browserify"
   deps = [
     ":build_electron_definitions",
   ]
 
-  inputs = auto_filenames.worker_bundle_deps
+  inputs = auto_filenames.context_script_browserify_deps
 
-  config_file = "//electron/build/webpack/webpack.config.worker.js"
-  out_file = "$target_gen_dir/js2c/worker_init.js"
+  outputs = [
+    "$target_gen_dir/js2c/content_script_bundle_unwrapped.js",
+  ]
+
+  args = [
+    "lib/content_script/init.js",
+    "-t",
+    "aliasify",
+    "-p",
+    "[",
+    "tsify",
+    "-p",
+    "tsconfig.electron.json",
+    "]",
+    "--standalone",
+    "content_script_preload",
+    "-o",
+    rebase_path(outputs[0]),
+  ]
 }
 
-webpack_build("electron_sandboxed_renderer_bundle") {
+js_wrap("atom_browserify_content_script") {
   deps = [
-    ":build_electron_definitions",
+    ":atom_browserify_content_script_unwrapped",
   ]
 
-  inputs = auto_filenames.sandbox_bundle_deps
+  inputs = [
+    "$target_gen_dir/js2c/content_script_bundle_unwrapped.js",
+  ]
 
-  config_file = "//electron/build/webpack/webpack.config.sandboxed_renderer.js"
-  out_file = "$target_gen_dir/js2c/sandbox_bundle.js"
+  outputs = [
+    "$target_gen_dir/js2c/content_script_bundle.js",
+  ]
 }
 
-webpack_build("electron_isolated_renderer_bundle") {
+js_wrap("atom_browserify_isolated") {
   deps = [
-    ":build_electron_definitions",
+    ":atom_browserify_isolated_unwrapped",
   ]
 
-  inputs = auto_filenames.isolated_bundle_deps
+  inputs = [
+    "$target_gen_dir/js2c/isolated_bundle_unwrapped.js",
+  ]
 
-  config_file = "//electron/build/webpack/webpack.config.isolated_renderer.js"
-  out_file = "$target_gen_dir/js2c/isolated_bundle.js"
+  outputs = [
+    "$target_gen_dir/js2c/isolated_bundle.js",
+  ]
 }
 
-webpack_build("electron_content_script_bundle") {
+js_wrap("atom_browserify_sandbox") {
   deps = [
-    ":build_electron_definitions",
+    ":atom_browserify_sandbox_unwrapped",
   ]
 
-  inputs = auto_filenames.content_script_bundle_deps
+  inputs = [
+    "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
+  ]
 
-  config_file = "//electron/build/webpack/webpack.config.content_script.js"
-  out_file = "$target_gen_dir/js2c/content_script_bundle.js"
+  outputs = [
+    "$target_gen_dir/js2c/sandbox_bundle.js",
+  ]
 }
 
 copy("atom_js2c_copy") {
@@ -151,30 +217,24 @@ copy("atom_js2c_copy") {
 
 action("atom_js2c") {
   deps = [
+    ":atom_browserify_content_script",
+    ":atom_browserify_isolated",
+    ":atom_browserify_sandbox",
     ":atom_js2c_copy",
-    ":electron_browser_bundle",
-    ":electron_content_script_bundle",
-    ":electron_isolated_renderer_bundle",
-    ":electron_renderer_bundle",
-    ":electron_sandboxed_renderer_bundle",
-    ":electron_worker_bundle",
   ]
 
-  webpack_sources = [
-    "$target_gen_dir/js2c/browser_init.js",
-    "$target_gen_dir/js2c/renderer_init.js",
-    "$target_gen_dir/js2c/worker_init.js",
+  browserify_sources = [
     "$target_gen_dir/js2c/content_script_bundle.js",
     "$target_gen_dir/js2c/isolated_bundle.js",
     "$target_gen_dir/js2c/sandbox_bundle.js",
   ]
 
-  sources = webpack_sources + [
+  sources = browserify_sources + [
               "$target_gen_dir/js2c/asar.js",
               "$target_gen_dir/js2c/asar_init.js",
             ]
 
-  inputs = sources
+  inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
   outputs = [
     "$root_gen_dir/atom_natives.cc",
   ]
@@ -185,8 +245,51 @@ action("atom_js2c") {
          rebase_path(sources, root_build_dir)
 }
 
+target_gen_electron_js = "$target_gen_dir/js/electron"
 target_gen_default_app_js = "$target_gen_dir/js/default_app"
 
+typescript_build("lib_js") {
+  deps = [
+    ":build_electron_definitions",
+  ]
+  type_root = rebase_path("$target_gen_dir/tsc/electron/typings")
+
+  sources = filenames.js_sources
+  if (enable_desktop_capturer) {
+    sources += [
+      "lib/browser/desktop-capturer.js",
+      "lib/renderer/api/desktop-capturer.js",
+    ]
+  }
+  if (enable_view_api) {
+    sources += [
+      "lib/browser/api/views/box-layout.js",
+      "lib/browser/api/views/button.js",
+      "lib/browser/api/views/label-button.js",
+      "lib/browser/api/views/layout-manager.js",
+      "lib/browser/api/views/md-text-button.js",
+      "lib/browser/api/views/resize-area.js",
+      "lib/browser/api/views/text-field.js",
+    ]
+  }
+
+  output_gen_dir = target_gen_electron_js
+  output_dir_name = "lib"
+  tsconfig = "tsconfig.electron.json"
+}
+
+asar("electron_asar") {
+  deps = [
+    ":lib_js",
+  ]
+
+  root = "$target_gen_electron_js/electron/lib"
+  sources = get_target_outputs(":lib_js")
+  outputs = [
+    "$root_out_dir/resources/electron.asar",
+  ]
+}
+
 typescript_build("default_app_js") {
   deps = [
     ":build_electron_definitions",
@@ -287,14 +390,14 @@ if (is_linux) {
 
 source_set("manifests") {
   sources = [
-    "//electron/shell/app/manifests.cc",
-    "//electron/shell/app/manifests.h",
+    "//electron/atom/app/manifests.cc",
+    "//electron/atom/app/manifests.h",
   ]
 
   include_dirs = [ "//electron" ]
 
   deps = [
-    "//electron/shell/common/api:mojo",
+    "//electron/atom/common/api:mojo",
     "//printing/buildflags",
     "//services/proxy_resolver/public/cpp:manifest",
     "//services/service_manager/public/cpp",
@@ -309,32 +412,6 @@ source_set("manifests") {
   }
 }
 
-npm_action("electron_version_args") {
-  script = "generate-version-json"
-
-  outputs = [
-    "$target_gen_dir/electron_version.args",
-  ]
-
-  args = rebase_path(outputs)
-
-  inputs = [
-    "ELECTRON_VERSION",
-    "script/generate-version-json.js",
-  ]
-}
-
-templated_file("electron_version_header") {
-  deps = [
-    ":electron_version_args",
-  ]
-
-  template = "build/templates/electron_version.tmpl"
-  output = "$target_gen_dir/electron_version.h"
-
-  args_files = get_target_outputs(":electron_version_args")
-}
-
 static_library("electron_lib") {
   configs += [ "//v8:external_startup_data" ]
   configs += [ "//third_party/electron_node:node_internals" ]
@@ -343,13 +420,12 @@ static_library("electron_lib") {
 
   deps = [
     ":atom_js2c",
-    ":electron_version_header",
     ":manifests",
     ":resources",
+    "atom/common/api:mojo",
     "buildflags",
     "chromium_src:chrome",
     "native_mate",
-    "shell/common/api:mojo",
     "//base:base_static",
     "//base/allocator:buildflags",
     "//chrome/app/resources:platform_locale_settings",
@@ -363,7 +439,6 @@ static_library("electron_lib") {
     "//content/public/browser",
     "//content/public/child",
     "//content/public/common:service_names",
-    "//content/public/gpu",
     "//content/public/renderer",
     "//content/public/utility",
     "//device/bluetooth",
@@ -466,26 +541,27 @@ static_library("electron_lib") {
 
   if (enable_fake_location_provider) {
     sources += [
-      "shell/browser/fake_location_provider.cc",
-      "shell/browser/fake_location_provider.h",
+      "atom/browser/fake_location_provider.cc",
+      "atom/browser/fake_location_provider.h",
     ]
   }
 
   if (is_mac) {
     deps += [
       "//components/remote_cocoa/app_shim",
+      "//content/common:mac_helpers",
       "//ui/accelerated_widget_mac",
     ]
     sources += [
-      "shell/browser/ui/views/autofill_popup_view.cc",
-      "shell/browser/ui/views/autofill_popup_view.h",
+      "atom/browser/ui/views/autofill_popup_view.cc",
+      "atom/browser/ui/views/autofill_popup_view.h",
     ]
     if (is_mas_build) {
-      sources += [ "shell/browser/api/atom_api_app_mas.mm" ]
+      sources += [ "atom/browser/api/atom_api_app_mas.mm" ]
       sources -= [
-        "shell/browser/auto_updater_mac.mm",
-        "shell/common/crash_reporter/crash_reporter_mac.h",
-        "shell/common/crash_reporter/crash_reporter_mac.mm",
+        "atom/browser/auto_updater_mac.mm",
+        "atom/common/crash_reporter/crash_reporter_mac.h",
+        "atom/common/crash_reporter/crash_reporter_mac.mm",
       ]
       defines += [ "MAS_BUILD" ]
     } else {
@@ -541,8 +617,8 @@ static_library("electron_lib") {
 
   if ((is_mac && !is_mas_build) || is_win) {
     sources += [
-      "shell/common/crash_reporter/crash_reporter_crashpad.cc",
-      "shell/common/crash_reporter/crash_reporter_crashpad.h",
+      "atom/common/crash_reporter/crash_reporter_crashpad.cc",
+      "atom/common/crash_reporter/crash_reporter_crashpad.h",
     ]
     deps += [ "//third_party/crashpad/crashpad/client" ]
   }
@@ -553,25 +629,25 @@ static_library("electron_lib") {
 
   if (enable_run_as_node) {
     sources += [
-      "shell/app/node_main.cc",
-      "shell/app/node_main.h",
+      "atom/app/node_main.cc",
+      "atom/app/node_main.h",
     ]
   }
 
   if (enable_osr) {
     sources += [
-      "shell/browser/osr/osr_host_display_client.cc",
-      "shell/browser/osr/osr_host_display_client.h",
-      "shell/browser/osr/osr_host_display_client_mac.mm",
-      "shell/browser/osr/osr_render_widget_host_view.cc",
-      "shell/browser/osr/osr_render_widget_host_view.h",
-      "shell/browser/osr/osr_video_consumer.cc",
-      "shell/browser/osr/osr_video_consumer.h",
-      "shell/browser/osr/osr_view_proxy.cc",
-      "shell/browser/osr/osr_view_proxy.h",
-      "shell/browser/osr/osr_web_contents_view.cc",
-      "shell/browser/osr/osr_web_contents_view.h",
-      "shell/browser/osr/osr_web_contents_view_mac.mm",
+      "atom/browser/osr/osr_host_display_client.cc",
+      "atom/browser/osr/osr_host_display_client.h",
+      "atom/browser/osr/osr_host_display_client_mac.mm",
+      "atom/browser/osr/osr_render_widget_host_view.cc",
+      "atom/browser/osr/osr_render_widget_host_view.h",
+      "atom/browser/osr/osr_video_consumer.cc",
+      "atom/browser/osr/osr_video_consumer.h",
+      "atom/browser/osr/osr_view_proxy.cc",
+      "atom/browser/osr/osr_view_proxy.h",
+      "atom/browser/osr/osr_web_contents_view.cc",
+      "atom/browser/osr/osr_web_contents_view.h",
+      "atom/browser/osr/osr_web_contents_view_mac.mm",
     ]
     deps += [
       "//components/viz/service",
@@ -587,36 +663,36 @@ static_library("electron_lib") {
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
     sources += [
-      "shell/browser/api/atom_api_desktop_capturer.cc",
-      "shell/browser/api/atom_api_desktop_capturer.h",
+      "atom/browser/api/atom_api_desktop_capturer.cc",
+      "atom/browser/api/atom_api_desktop_capturer.h",
     ]
   }
 
   if (enable_view_api) {
     sources += [
-      "shell/browser/api/views/atom_api_box_layout.cc",
-      "shell/browser/api/views/atom_api_box_layout.h",
-      "shell/browser/api/views/atom_api_button.cc",
-      "shell/browser/api/views/atom_api_button.h",
-      "shell/browser/api/views/atom_api_label_button.cc",
-      "shell/browser/api/views/atom_api_label_button.h",
-      "shell/browser/api/views/atom_api_layout_manager.cc",
-      "shell/browser/api/views/atom_api_layout_manager.h",
-      "shell/browser/api/views/atom_api_md_text_button.cc",
-      "shell/browser/api/views/atom_api_md_text_button.h",
-      "shell/browser/api/views/atom_api_resize_area.cc",
-      "shell/browser/api/views/atom_api_resize_area.h",
-      "shell/browser/api/views/atom_api_text_field.cc",
-      "shell/browser/api/views/atom_api_text_field.h",
+      "atom/browser/api/views/atom_api_box_layout.cc",
+      "atom/browser/api/views/atom_api_box_layout.h",
+      "atom/browser/api/views/atom_api_button.cc",
+      "atom/browser/api/views/atom_api_button.h",
+      "atom/browser/api/views/atom_api_label_button.cc",
+      "atom/browser/api/views/atom_api_label_button.h",
+      "atom/browser/api/views/atom_api_layout_manager.cc",
+      "atom/browser/api/views/atom_api_layout_manager.h",
+      "atom/browser/api/views/atom_api_md_text_button.cc",
+      "atom/browser/api/views/atom_api_md_text_button.h",
+      "atom/browser/api/views/atom_api_resize_area.cc",
+      "atom/browser/api/views/atom_api_resize_area.h",
+      "atom/browser/api/views/atom_api_text_field.cc",
+      "atom/browser/api/views/atom_api_text_field.h",
     ]
   }
 
   if (enable_basic_printing) {
     sources += [
-      "shell/browser/printing/print_preview_message_handler.cc",
-      "shell/browser/printing/print_preview_message_handler.h",
-      "shell/renderer/printing/print_render_frame_helper_delegate.cc",
-      "shell/renderer/printing/print_render_frame_helper_delegate.h",
+      "atom/browser/printing/print_preview_message_handler.cc",
+      "atom/browser/printing/print_preview_message_handler.h",
+      "atom/renderer/printing/print_render_frame_helper_delegate.cc",
+      "atom/renderer/printing/print_render_frame_helper_delegate.h",
     ]
   }
 
@@ -639,6 +715,13 @@ if (is_mac) {
   electron_helper_name = "$electron_product_name Helper"
   electron_login_helper_name = "$electron_product_name Login Helper"
   electron_framework_version = "A"
+  electron_version = read_file("ELECTRON_VERSION", "trim string")
+
+  mac_xib_bundle_data("electron_xibs") {
+    sources = [
+      "atom/common/resources/mac/MainMenu.xib",
+    ]
+  }
 
   bundle_data("electron_framework_resources") {
     public_deps = [
@@ -754,15 +837,15 @@ if (is_mac) {
       ":electron_framework_libraries",
       ":electron_framework_resources",
       ":electron_swiftshader_library",
+      ":electron_xibs",
     ]
     if (!is_mas_build) {
       deps += [ ":electron_crashpad_helper" ]
     }
-    info_plist = "shell/common/resources/mac/Info.plist"
+    info_plist = "atom/common/resources/mac/Info.plist"
 
-    electron_version = read_file("ELECTRON_VERSION", "trim string")
     extra_substitutions = [
-      "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.framework",
+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
       "ELECTRON_VERSION=$electron_version",
     ]
 
@@ -800,37 +883,48 @@ if (is_mac) {
     }
   }
 
-  mac_app_bundle("electron_helper_app") {
-    output_name = electron_helper_name
-    deps = [
-      ":electron_framework+link",
-    ]
-    if (!is_mas_build) {
-      deps += [ "//sandbox/mac:seatbelt" ]
-    }
-    defines = [ "HELPER_EXECUTABLE" ]
-    sources = filenames.app_sources
-    sources += [ "shell/common/atom_constants.cc" ]
-    include_dirs = [ "." ]
-    info_plist = "shell/renderer/resources/mac/Info.plist"
-    extra_substitutions =
-        [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
-    ldflags = [
-      "-rpath",
-      "@executable_path/../../..",
-    ]
-    if (is_component_build) {
-      ldflags += [
-        "-rpath",
-        "@executable_path/../../../../../..",
+  template("electron_helper_app") {
+    mac_app_bundle(target_name) {
+      assert(defined(invoker.helper_name_suffix))
+
+      output_name = electron_helper_name + invoker.helper_name_suffix
+      deps = [
+        ":electron_framework+link",
       ]
+      if (!is_mas_build) {
+        deps += [ "//sandbox/mac:seatbelt" ]
+      }
+      defines = [ "HELPER_EXECUTABLE" ]
+      sources = filenames.app_sources
+      sources += [ "atom/common/atom_constants.cc" ]
+      include_dirs = [ "." ]
+      info_plist = "atom/renderer/resources/mac/Info.plist"
+      extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
+      ldflags = [
+        "-rpath",
+        "@executable_path/../../..",
+      ]
+      if (is_component_build) {
+        ldflags += [
+          "-rpath",
+          "@executable_path/../../../../../..",
+        ]
+      }
+    }
+  }
+
+  foreach(helper_params, content_mac_helpers) {
+    _helper_target = helper_params[0]
+    _helper_bundle_id = helper_params[1]
+    _helper_suffix = helper_params[2]
+    electron_helper_app("electron_helper_app_${_helper_target}") {
+      helper_name_suffix = _helper_suffix
     }
   }
 
   bundle_data("electron_app_framework_bundle_data") {
     sources = [
       "$root_out_dir/$electron_framework_name.framework",
-      "$root_out_dir/$electron_helper_name.app",
     ]
     if (!is_mas_build) {
       sources += [
@@ -844,8 +938,13 @@ if (is_mac) {
     ]
     public_deps = [
       ":electron_framework+link",
-      ":electron_helper_app",
     ]
+
+    foreach(helper_params, content_mac_helpers) {
+      sources +=
+          [ "$root_out_dir/${electron_helper_name}${helper_params[2]}.app" ]
+      public_deps += [ ":electron_helper_app_${helper_params[0]}" ]
+    }
   }
 
   mac_app_bundle("electron_login_helper") {
@@ -853,9 +952,9 @@ if (is_mac) {
     sources = filenames.login_helper_sources
     include_dirs = [ "." ]
     libs = [ "AppKit.framework" ]
-    info_plist = "shell/app/resources/mac/loginhelper-Info.plist"
+    info_plist = "atom/app/resources/mac/loginhelper-Info.plist"
     extra_substitutions =
-        [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
+        [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
   }
 
   bundle_data("electron_login_helper_app") {
@@ -904,10 +1003,12 @@ if (is_mac) {
     public_deps = [
       ":default_app_asar",
       ":electron_app_strings_bundle_data",
+      ":electron_asar",
     ]
     sources = [
       "$root_out_dir/resources/default_app.asar",
-      "shell/browser/resources/mac/electron.icns",
+      "$root_out_dir/resources/electron.asar",
+      "atom/browser/resources/mac/electron.icns",
     ]
     outputs = [
       "{{bundle_resources_dir}}/{{source_file_part}}",
@@ -917,7 +1018,7 @@ if (is_mac) {
   mac_app_bundle("electron_app") {
     output_name = electron_product_name
     sources = filenames.app_sources
-    sources += [ "shell/common/atom_constants.cc" ]
+    sources += [ "atom/common/atom_constants.cc" ]
     include_dirs = [ "." ]
     deps = [
       ":electron_app_framework_bundle_data",
@@ -926,22 +1027,97 @@ if (is_mac) {
     if (is_mas_build) {
       deps += [ ":electron_login_helper_app" ]
     }
-    info_plist = "shell/browser/resources/mac/Info.plist"
-    electron_version = read_file("ELECTRON_VERSION", "trim string")
-    extra_substitutions = [
-      "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id",
-      "ELECTRON_VERSION=$electron_version",
-    ]
+    info_plist = "atom/browser/resources/mac/Info.plist"
+    extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id" ]
     ldflags = [
       "-rpath",
       "@executable_path/../Frameworks",
     ]
   }
+
+  if (enable_dsyms) {
+    extract_symbols("electron_framework_syms") {
+      binary = "$root_out_dir/$electron_framework_name.framework/Versions/$electron_framework_version/$electron_framework_name"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      dsym_file = "$root_out_dir/$electron_framework_name.dSYM/Contents/Resources/DWARF/$electron_framework_name"
+      deps = [
+        ":electron_framework",
+      ]
+    }
+
+    foreach(helper_params, content_mac_helpers) {
+      _helper_target = helper_params[0]
+      _helper_bundle_id = helper_params[1]
+      _helper_suffix = helper_params[2]
+      extract_symbols("electron_helper_syms_${_helper_target}") {
+        binary = "$root_out_dir/$electron_helper_name${_helper_suffix}.app/Contents/MacOS/$electron_helper_name${_helper_suffix}"
+        symbol_dir = "$root_out_dir/breakpad_symbols"
+        dsym_file = "$root_out_dir/$electron_helper_name${_helper_suffix}.dSYM/Contents/Resources/DWARF/$electron_helper_name${_helper_suffix}"
+        deps = [
+          ":electron_helper_app_${_helper_target}",
+        ]
+      }
+    }
+
+    extract_symbols("electron_app_syms") {
+      binary = "$root_out_dir/$electron_product_name.app/Contents/MacOS/$electron_product_name"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      dsym_file = "$root_out_dir/$electron_product_name.dSYM/Contents/Resources/DWARF/$electron_product_name"
+      deps = [
+        ":electron_app",
+      ]
+    }
+
+    extract_symbols("swiftshader_egl_syms") {
+      binary = "$root_out_dir/libswiftshader_libEGL.dylib"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      dsym_file = "$root_out_dir/libswiftshader_libEGL.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libEGL.dylib"
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
+      ]
+    }
+
+    extract_symbols("swiftshader_gles_syms") {
+      binary = "$root_out_dir/libswiftshader_libGLESv2.dylib"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      dsym_file = "$root_out_dir/libswiftshader_libGLESv2.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libGLESv2.dylib"
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
+      ]
+    }
+
+    extract_symbols("crashpad_handler_syms") {
+      binary = "$root_out_dir/crashpad_handler"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      dsym_file = "$root_out_dir/crashpad_handler.dSYM/Contents/Resources/DWARF/crashpad_handler"
+      deps = [
+        "//third_party/crashpad/crashpad/handler:crashpad_handler",
+      ]
+    }
+
+    group("electron_symbols") {
+      deps = [
+        ":crashpad_handler_syms",
+        ":electron_app_syms",
+        ":electron_framework_syms",
+        ":swiftshader_egl_syms",
+        ":swiftshader_gles_syms",
+      ]
+
+      foreach(helper_params, content_mac_helpers) {
+        _helper_target = helper_params[0]
+        deps += [ ":electron_helper_syms_${_helper_target}" ]
+      }
+    }
+  } else {
+    group("electron_symbols") {
+    }
+  }
 } else {
   windows_manifest("electron_app_manifest") {
     sources = [
-      "shell/browser/resources/win/disable_window_filtering.manifest",
-      "shell/browser/resources/win/dpi_aware.manifest",
+      "atom/browser/resources/win/disable_window_filtering.manifest",
+      "atom/browser/resources/win/dpi_aware.manifest",
       as_invoker_manifest,
       common_controls_manifest,
       default_compatibility_manifest,
@@ -955,6 +1131,7 @@ if (is_mac) {
     deps = [
       ":default_app_asar",
       ":electron_app_manifest",
+      ":electron_asar",
       ":electron_lib",
       ":packed_resources",
       "//content:sandbox_helper_win",
@@ -975,6 +1152,7 @@ if (is_mac) {
 
     if (!is_mac) {
       data += [ "$root_out_dir/resources/default_app.asar" ]
+      data += [ "$root_out_dir/resources/electron.asar" ]
     }
 
     public_deps = [
@@ -984,9 +1162,9 @@ if (is_mac) {
     if (is_win) {
       sources += [
         # TODO: we should be generating our .rc files more like how chrome does
-        "shell/browser/resources/win/atom.ico",
-        "shell/browser/resources/win/atom.rc",
-        "shell/browser/resources/win/resource.h",
+        "atom/browser/resources/win/atom.ico",
+        "atom/browser/resources/win/atom.rc",
+        "atom/browser/resources/win/resource.h",
       ]
 
       libs = [
@@ -1023,6 +1201,49 @@ if (is_mac) {
       }
     }
   }
+
+  if (is_official_build) {
+    if (is_linux) {
+      _target_executable_suffix = ""
+      _target_shared_library_suffix = ".so"
+    } else if (is_win) {
+      _target_executable_suffix = ".exe"
+      _target_shared_library_suffix = ".dll"
+    }
+
+    extract_symbols("electron_app_symbols") {
+      binary = "$root_out_dir/$electron_project_name$_target_executable_suffix"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      deps = [
+        ":electron_app",
+      ]
+    }
+
+    extract_symbols("swiftshader_egl_symbols") {
+      binary = "$root_out_dir/swiftshader/libEGL$_target_shared_library_suffix"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
+      ]
+    }
+
+    extract_symbols("swiftshader_gles_symbols") {
+      binary =
+          "$root_out_dir/swiftshader/libGLESv2$_target_shared_library_suffix"
+      symbol_dir = "$root_out_dir/breakpad_symbols"
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
+      ]
+    }
+
+    group("electron_symbols") {
+      deps = [
+        ":electron_app_symbols",
+        ":swiftshader_egl_symbols",
+        ":swiftshader_gles_symbols",
+      ]
+    }
+  }
 }
 
 template("dist_zip") {

CONTRIBUTING.md

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

DEPS

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

ELECTRON_VERSION

@@ -1 +1 @@
-7.0.0-nightly.20190702
+6.0.1

README.md

@@ -91,10 +91,6 @@ const child = proc.spawn(electron)
 
 Find documentation translations in [electron/i18n](https://github.com/electron/i18n).
 
-## Contributing
-
-If you are interested in reporting/fixing issues and contributing directly to the code base, please see [CONTRIBUTING.md](CONTRIBUTING.md) for more information on what we're looking for and how to get started.
-
 ## Community
 
 Info on reporting bugs, getting help, finding third-party tools and sample apps,

appveyor.yml

@@ -23,10 +23,6 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
-# Uncomment these lines to enable RDP
-#on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
 version: 1.0.{build}
 build_cloud: libcc-20
 image: libcc-20-vs2017-15.9
@@ -34,16 +30,6 @@ environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
   ELECTRON_ENABLE_STACK_DUMPING: 1
-notifications:
-  - provider: Webhook
-    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
-    method: POST
-    headers:
-      x-mission-control-secret:
-        secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
-    on_build_success: false
-    on_build_failure: true
-    on_build_status_changed: false
 build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
@@ -59,8 +45,6 @@ build_script:
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         $env:GCLIENT_EXTRA_ARGS="--custom-var=checkout_boto=True --custom-var=checkout_requests=True"
-      } else {
-        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
       }
   - >-
       gclient config
@@ -75,9 +59,8 @@ build_script:
   - gn check out/Default //electron:electron_lib
   - gn check out/Default //electron:electron_app
   - gn check out/Default //electron:manifests
-  - gn check out/Default //electron/shell/common/api:mojo
+  - gn check out/Default //electron/atom/common/api:mojo
   - ninja -C out/Default electron:electron_app
-  - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default )  
   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
   - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
   - ninja -C out/Default electron:electron_dist_zip
@@ -89,9 +72,10 @@ build_script:
   - appveyor PushArtifact out/ffmpeg/ffmpeg.zip
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        ninja -C out/Default third_party/breakpad:dump_syms
+        # Needed for msdia140.dll on 64-bit windows
+        $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
+        ninja -C out/Default electron:electron_symbols
       }
-  - if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\breakpad_symbols -v)
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         python electron\script\zip-symbols.py
@@ -125,9 +109,9 @@ deploy_script:
       if (Test-Path Env:\ELECTRON_RELEASE) {
         if (Test-Path Env:\UPLOAD_TO_S3) {
           Write-Output "Uploading Electron release distribution to s3"
-          & python script\release\uploaders\upload.py --upload_to_s3
+          & python script\upload.py --upload_to_s3
         } else {
           Write-Output "Uploading Electron release distribution to github releases"
-          & python script\release\uploaders\upload.py
+          & python script\upload.py
         }
       }

atom/app/atom_content_client.cc

@@ -2,11 +2,12 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/atom_content_client.h"
+#include "atom/app/atom_content_client.h"
 
 #include <string>
 #include <vector>
 
+#include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
@@ -16,7 +17,6 @@
 #include "content/public/common/pepper_plugin_info.h"
 #include "electron/buildflags/buildflags.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
-#include "shell/common/options_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/url_constants.h"
@@ -30,11 +30,11 @@
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
+#include "atom/common/atom_constants.h"
 #include "pdf/pdf.h"
-#include "shell/common/atom_constants.h"
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 
-namespace electron {
+namespace atom {
 
 namespace {
 
@@ -272,4 +272,4 @@ bool AtomContentClient::IsDataResourceGzipped(int resource_id) const {
   return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
 }
 
-}  // namespace electron
+}  // namespace atom

atom/app/atom_content_client.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_ATOM_CONTENT_CLIENT_H_
-#define SHELL_APP_ATOM_CONTENT_CLIENT_H_
+#ifndef ATOM_APP_ATOM_CONTENT_CLIENT_H_
+#define ATOM_APP_ATOM_CONTENT_CLIENT_H_
 
 #include <set>
 #include <string>
@@ -11,7 +11,7 @@
 
 #include "content/public/common/content_client.h"
 
-namespace electron {
+namespace atom {
 
 class AtomContentClient : public content::ContentClient {
  public:
@@ -37,6 +37,6 @@ class AtomContentClient : public content::ContentClient {
   DISALLOW_COPY_AND_ASSIGN(AtomContentClient);
 };
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_APP_ATOM_CONTENT_CLIENT_H_
+#endif  // ATOM_APP_ATOM_CONTENT_CLIENT_H_

atom/app/atom_library_main.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_ATOM_LIBRARY_MAIN_H_
-#define SHELL_APP_ATOM_LIBRARY_MAIN_H_
+#ifndef ATOM_APP_ATOM_LIBRARY_MAIN_H_
+#define ATOM_APP_ATOM_LIBRARY_MAIN_H_
 
 #include "build/build_config.h"
 #include "electron/buildflags/buildflags.h"
@@ -20,4 +20,4 @@ __attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
 }
 #endif  // OS_MACOSX
 
-#endif  // SHELL_APP_ATOM_LIBRARY_MAIN_H_
+#endif  // ATOM_APP_ATOM_LIBRARY_MAIN_H_

atom/app/atom_library_main.mm

@@ -2,24 +2,24 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/atom_library_main.h"
+#include "atom/app/atom_library_main.h"
 
+#include "atom/app/atom_main_delegate.h"
+#include "atom/app/node_main.h"
+#include "atom/common/atom_command_line.h"
+#include "atom/common/mac/main_application_bundle.h"
 #include "base/at_exit.h"
 #include "base/i18n/icu_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "content/public/app/content_main.h"
-#include "shell/app/atom_main_delegate.h"
-#include "shell/app/node_main.h"
-#include "shell/common/atom_command_line.h"
-#include "shell/common/mac/main_application_bundle.h"
 
 int AtomMain(int argc, char* argv[]) {
-  electron::AtomMainDelegate delegate;
+  atom::AtomMainDelegate delegate;
   content::ContentMainParams params(&delegate);
   params.argc = argc;
   params.argv = const_cast<const char**>(argv);
-  electron::AtomCommandLine::Init(argc, argv);
+  atom::AtomCommandLine::Init(argc, argv);
   return content::ContentMain(params);
 }
 
@@ -28,11 +28,11 @@ int AtomInitializeICUandStartNode(int argc, char* argv[]) {
   base::AtExitManager atexit_manager;
   base::mac::ScopedNSAutoreleasePool pool;
   base::mac::SetOverrideFrameworkBundlePath(
-      electron::MainApplicationBundlePath()
+      atom::MainApplicationBundlePath()
           .Append("Contents")
           .Append("Frameworks")
-          .Append(ELECTRON_PRODUCT_NAME " Framework.framework"));
+          .Append(ATOM_PRODUCT_NAME " Framework.framework"));
   base::i18n::InitializeICU();
-  return electron::NodeMain(argc, argv);
+  return atom::NodeMain(argc, argv);
 }
 #endif

atom/app/atom_login_helper.mm

@@ -1,7 +1,3 @@
-// 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 <Cocoa/Cocoa.h>
 
 int main(int argc, char* argv[]) {

atom/app/atom_main.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/atom_main.h"
+#include "atom/app/atom_main.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -17,33 +17,33 @@
 #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"
-#include "shell/app/atom_main_delegate.h"
-#include "shell/app/command_line_args.h"
-#include "shell/common/crash_reporter/win/crash_service_main.h"
 #elif defined(OS_LINUX)  // defined(OS_WIN)
 #include <unistd.h>
 #include <cstdio>
+#include "atom/app/atom_main_delegate.h"  // NOLINT
 #include "content/public/app/content_main.h"
-#include "shell/app/atom_main_delegate.h"  // NOLINT
-#else                                      // defined(OS_LINUX)
+#else  // defined(OS_LINUX)
 #include <mach-o/dyld.h>
 #include <unistd.h>
 #include <cstdio>
-#include "shell/app/atom_library_main.h"
+#include "atom/app/atom_library_main.h"
 #endif  // defined(OS_MACOSX)
 
+#include "atom/app/node_main.h"
+#include "atom/common/atom_command_line.h"
+#include "atom/common/atom_constants.h"
 #include "base/at_exit.h"
 #include "base/i18n/icu_util.h"
 #include "electron/buildflags/buildflags.h"
-#include "shell/app/node_main.h"
-#include "shell/common/atom_command_line.h"
-#include "shell/common/atom_constants.h"
 
 #if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD)
 #include "sandbox/mac/seatbelt_exec.h"  // nogncheck
@@ -125,7 +125,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
 #endif
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  bool run_as_node = IsEnvSet(electron::kRunAsNode);
+  bool run_as_node = IsEnvSet(atom::kRunAsNode);
 #else
   bool run_as_node = false;
 #endif
@@ -134,23 +134,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   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
-
   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()); });
@@ -158,7 +141,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   if (run_as_node) {
     base::AtExitManager atexit_manager;
     base::i18n::InitializeICU();
-    auto ret = electron::NodeMain(argv.size(), argv.data());
+    auto ret = atom::NodeMain(argv.size(), argv.data());
     std::for_each(argv.begin(), argv.end(), free);
     return ret;
   }
@@ -171,17 +154,17 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
     return crash_service::Main(&argv);
   }
 
-  if (!electron::CheckCommandLineArguments(arguments.argc, arguments.argv))
+  if (!atom::CheckCommandLineArguments(arguments.argc, arguments.argv))
     return -1;
 
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);
-  electron::AtomMainDelegate delegate;
+  atom::AtomMainDelegate delegate;
 
   content::ContentMainParams params(&delegate);
   params.instance = instance;
   params.sandbox_info = &sandbox_info;
-  electron::AtomCommandLine::Init(arguments.argc, arguments.argv);
+  atom::AtomCommandLine::Init(arguments.argc, arguments.argv);
   return content::ContentMain(params);
 }
 
@@ -191,18 +174,18 @@ int main(int argc, char* argv[]) {
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  if (IsEnvSet(electron::kRunAsNode)) {
+  if (IsEnvSet(atom::kRunAsNode)) {
     base::i18n::InitializeICU();
     base::AtExitManager atexit_manager;
-    return electron::NodeMain(argc, argv);
+    return atom::NodeMain(argc, argv);
   }
 #endif
 
-  electron::AtomMainDelegate delegate;
+  atom::AtomMainDelegate delegate;
   content::ContentMainParams params(&delegate);
   params.argc = argc;
   params.argv = const_cast<const char**>(argv);
-  electron::AtomCommandLine::Init(argc, argv);
+  atom::AtomCommandLine::Init(argc, argv);
   return content::ContentMain(params);
 }
 
@@ -212,7 +195,7 @@ int main(int argc, char* argv[]) {
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  if (IsEnvSet(electron::kRunAsNode)) {
+  if (IsEnvSet(atom::kRunAsNode)) {
     return AtomInitializeICUandStartNode(argc, argv);
   }
 #endif

atom/app/atom_main.h

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_ATOM_MAIN_H_
-#define SHELL_APP_ATOM_MAIN_H_
+#ifndef ATOM_APP_ATOM_MAIN_H_
+#define ATOM_APP_ATOM_MAIN_H_
 
 #include "content/public/app/content_main.h"
 
-#endif  // SHELL_APP_ATOM_MAIN_H_
+#endif  // ATOM_APP_ATOM_MAIN_H_

atom/app/atom_main_delegate.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/atom_main_delegate.h"
+#include "atom/app/atom_main_delegate.h"
 
 #include <iostream>
 #include <memory>
@@ -12,6 +12,13 @@
 #include <glib.h>  // for g_setenv()
 #endif
 
+#include "atom/app/atom_content_client.h"
+#include "atom/browser/atom_browser_client.h"
+#include "atom/browser/relauncher.h"
+#include "atom/common/options_switches.h"
+#include "atom/renderer/atom_renderer_client.h"
+#include "atom/renderer/atom_sandboxed_renderer_client.h"
+#include "atom/utility/atom_content_utility_client.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/environment.h"
@@ -24,31 +31,30 @@
 #include "ipc/ipc_buildflags.h"
 #include "services/service_manager/embedder/switches.h"
 #include "services/service_manager/sandbox/switches.h"
-#include "shell/app/atom_content_client.h"
-#include "shell/browser/atom_browser_client.h"
-#include "shell/browser/atom_gpu_client.h"
-#include "shell/browser/feature_list.h"
-#include "shell/browser/relauncher.h"
-#include "shell/common/options_switches.h"
-#include "shell/renderer/atom_renderer_client.h"
-#include "shell/renderer/atom_sandboxed_renderer_client.h"
-#include "shell/utility/atom_content_utility_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.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
+
 #if defined(OS_MACOSX)
-#include "shell/app/atom_main_delegate_mac.h"
+#include "atom/app/atom_main_delegate_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #if defined(_WIN64)
-#include "shell/common/crash_reporter/crash_reporter_win.h"
+#include "atom/common/crash_reporter/crash_reporter_win.h"
 #endif
 #endif
 
-namespace electron {
+namespace atom {
 
 namespace {
 
@@ -146,10 +152,7 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 #if defined(DEBUG)
   // Print logging to debug.log on Windows
   settings.logging_dest = logging::LOG_TO_ALL;
-  base::FilePath log_filename;
-  base::PathService::Get(base::DIR_EXE, &log_filename);
-  log_filename = log_filename.AppendASCII("debug.log");
-  settings.log_file = log_filename.value().c_str();
+  settings.log_file = L"debug.log";
   settings.lock_log = logging::LOCK_LOG_FILE;
   settings.delete_old = logging::DELETE_OLD_LOG_FILE;
 #else
@@ -201,6 +204,14 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
     base::win::PinUser32();
 #endif
 
+#if defined(OS_LINUX)
+  // Check for --no-sandbox parameter when running as root.
+  if (getuid() == 0 && IsSandboxEnabled(command_line))
+    LOG(FATAL) << "Running as root without --"
+               << service_manager::switches::kNoSandbox
+               << " is not supported. See https://crbug.com/638180.";
+#endif
+
   content_client_ = std::make_unique<AtomContentClient>();
   SetContentClient(content_client_.get());
 
@@ -265,10 +276,6 @@ void AtomMainDelegate::PreSandboxStartup() {
 }
 
 void AtomMainDelegate::PreCreateMainMessageLoop() {
-  // This is initialized early because the service manager reads some feature
-  // flags and we need to make sure the feature list is initialized before the
-  // service manager reads the features.
-  InitializeFeatureList();
 #if defined(OS_MACOSX)
   RegisterAtomCrApp();
 #endif
@@ -279,11 +286,6 @@ content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
   return browser_client_.get();
 }
 
-content::ContentGpuClient* AtomMainDelegate::CreateContentGpuClient() {
-  gpu_client_.reset(new AtomGpuClient);
-  return gpu_client_.get();
-}
-
 content::ContentRendererClient*
 AtomMainDelegate::CreateContentRendererClient() {
   auto* command_line = base::CommandLine::ForCurrentProcess();
@@ -330,4 +332,4 @@ bool AtomMainDelegate::ShouldCreateFeatureList() {
   return false;
 }
 
-}  // namespace electron
+}  // namespace atom

atom/app/atom_main_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_ATOM_MAIN_DELEGATE_H_
-#define SHELL_APP_ATOM_MAIN_DELEGATE_H_
+#ifndef ATOM_APP_ATOM_MAIN_DELEGATE_H_
+#define ATOM_APP_ATOM_MAIN_DELEGATE_H_
 
 #include <memory>
 #include <string>
@@ -11,7 +11,7 @@
 #include "content/public/app/content_main_delegate.h"
 #include "content/public/common/content_client.h"
 
-namespace electron {
+namespace atom {
 
 void LoadResourceBundle(const std::string& locale);
 
@@ -27,7 +27,6 @@ class AtomMainDelegate : public content::ContentMainDelegate {
   void PreCreateMainMessageLoop() override;
   void PostEarlyInitialization(bool is_running_tests) override;
   content::ContentBrowserClient* CreateContentBrowserClient() override;
-  content::ContentGpuClient* CreateContentGpuClient() override;
   content::ContentRendererClient* CreateContentRendererClient() override;
   content::ContentUtilityClient* CreateContentUtilityClient() override;
   int RunProcess(
@@ -49,13 +48,12 @@ class AtomMainDelegate : public content::ContentMainDelegate {
 
   std::unique_ptr<content::ContentBrowserClient> browser_client_;
   std::unique_ptr<content::ContentClient> content_client_;
-  std::unique_ptr<content::ContentGpuClient> gpu_client_;
   std::unique_ptr<content::ContentRendererClient> renderer_client_;
   std::unique_ptr<content::ContentUtilityClient> utility_client_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomMainDelegate);
 };
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_APP_ATOM_MAIN_DELEGATE_H_
+#endif  // ATOM_APP_ATOM_MAIN_DELEGATE_H_

atom/app/atom_main_delegate_mac.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
-#define SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
+#ifndef ATOM_APP_ATOM_MAIN_DELEGATE_MAC_H_
+#define ATOM_APP_ATOM_MAIN_DELEGATE_MAC_H_
 
-namespace electron {
+namespace atom {
 
 // Initializes NSApplication.
 void RegisterAtomCrApp();
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
+#endif  // ATOM_APP_ATOM_MAIN_DELEGATE_MAC_H_

atom/app/atom_main_delegate_mac.mm

@@ -2,10 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/atom_main_delegate.h"
-
-#include <string>
+#include "atom/app/atom_main_delegate.h"
 
+#include "atom/browser/mac/atom_application.h"
+#include "atom/common/application_info.h"
+#include "atom/common/mac/main_application_bundle.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/mac/bundle_locations.h"
@@ -13,12 +14,10 @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
+#include "content/common/mac_helpers.h"
 #include "content/public/common/content_paths.h"
-#include "shell/browser/mac/atom_application.h"
-#include "shell/common/application_info.h"
-#include "shell/common/mac/main_application_bundle.h"
 
-namespace electron {
+namespace atom {
 
 namespace {
 
@@ -28,23 +27,39 @@ base::FilePath GetFrameworksPath() {
 
 base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
                                 const std::string& name) {
-  return frameworks_path.Append(name + " Helper.app")
+  // Figure out what helper we are running
+  base::FilePath path;
+  base::PathService::Get(base::FILE_EXE, &path);
+
+  std::string helper_name = "Helper";
+  if (base::EndsWith(path.value(), content::kMacHelperSuffix_renderer,
+                     base::CompareCase::SENSITIVE)) {
+    helper_name += content::kMacHelperSuffix_renderer;
+  } else if (base::EndsWith(path.value(), content::kMacHelperSuffix_gpu,
+                            base::CompareCase::SENSITIVE)) {
+    helper_name += content::kMacHelperSuffix_gpu;
+  } else if (base::EndsWith(path.value(), content::kMacHelperSuffix_plugin,
+                            base::CompareCase::SENSITIVE)) {
+    helper_name += content::kMacHelperSuffix_plugin;
+  }
+
+  return frameworks_path.Append(name + " " + helper_name + ".app")
       .Append("Contents")
       .Append("MacOS")
-      .Append(name + " Helper");
+      .Append(name + " " + helper_name);
 }
 
 }  // namespace
 
 void AtomMainDelegate::OverrideFrameworkBundlePath() {
   base::mac::SetOverrideFrameworkBundlePath(
-      GetFrameworksPath().Append(ELECTRON_PRODUCT_NAME " Framework.framework"));
+      GetFrameworksPath().Append(ATOM_PRODUCT_NAME " Framework.framework"));
 }
 
 void AtomMainDelegate::OverrideChildProcessPath() {
   base::FilePath frameworks_path = GetFrameworksPath();
   base::FilePath helper_path =
-      GetHelperAppPath(frameworks_path, ELECTRON_PRODUCT_NAME);
+      GetHelperAppPath(frameworks_path, ATOM_PRODUCT_NAME);
   if (!base::PathExists(helper_path))
     helper_path = GetHelperAppPath(frameworks_path, GetApplicationName());
   if (!base::PathExists(helper_path))
@@ -68,4 +83,4 @@ void RegisterAtomCrApp() {
   [AtomApplication sharedApplication];
 }
 
-}  // namespace electron
+}  // namespace atom

atom/app/command_line_args.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/command_line_args.h"
+#include "atom/app/command_line_args.h"
 
 namespace {
 
@@ -33,7 +33,7 @@ bool IsUrlArg(const base::CommandLine::CharType* arg) {
 
 }  // namespace
 
-namespace electron {
+namespace atom {
 
 bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
   const base::CommandLine::StringType dashdash(2, '-');
@@ -50,4 +50,4 @@ bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
   return true;
 }
 
-}  // namespace electron
+}  // namespace atom

atom/app/command_line_args.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_COMMAND_LINE_ARGS_H_
-#define SHELL_APP_COMMAND_LINE_ARGS_H_
+#ifndef ATOM_APP_COMMAND_LINE_ARGS_H_
+#define ATOM_APP_COMMAND_LINE_ARGS_H_
 
 #include "base/command_line.h"
 
-namespace electron {
+namespace atom {
 
 bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv);
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_APP_COMMAND_LINE_ARGS_H_
+#endif  // ATOM_APP_COMMAND_LINE_ARGS_H_

atom/app/manifests.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/manifests.h"
+#include "atom/app/manifests.h"
 
 #include "base/no_destructor.h"
-#include "electron/shell/common/api/api.mojom.h"
+#include "electron/atom/common/api/api.mojom.h"
 #include "printing/buildflags/buildflags.h"
 #include "services/proxy_resolver/public/cpp/manifest.h"
 #include "services/service_manager/public/cpp/manifest_builder.h"
@@ -45,7 +45,7 @@ const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
           .ExposeInterfaceFilterCapability_Deprecated(
               "navigation:frame", "renderer",
               service_manager::Manifest::InterfaceList<
-                  electron::mojom::ElectronBrowser>())
+                  atom::mojom::ElectronBrowser>())
           .Build()};
   return *manifest;
 }

atom/app/manifests.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_MANIFESTS_H_
-#define SHELL_APP_MANIFESTS_H_
+#ifndef ATOM_APP_MANIFESTS_H_
+#define ATOM_APP_MANIFESTS_H_
 
 #include <vector>
 
@@ -13,4 +13,4 @@ const service_manager::Manifest& GetElectronContentBrowserOverlayManifest();
 const std::vector<service_manager::Manifest>&
 GetElectronBuiltinServiceManifests();
 
-#endif  // SHELL_APP_MANIFESTS_H_
+#endif  // ATOM_APP_MANIFESTS_H_

atom/app/node_main.cc

@@ -2,34 +2,34 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/app/node_main.h"
+#include "atom/app/node_main.h"
 
 #include <memory>
 #include <utility>
 
+#include "atom/app/uv_task_runner.h"
+#include "atom/browser/javascript_environment.h"
+#include "atom/browser/node_debugger.h"
+#include "atom/common/api/electron_bindings.h"
+#include "atom/common/atom_version.h"
+#include "atom/common/crash_reporter/crash_reporter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/node_bindings.h"
+#include "atom/common/node_includes.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/task/thread_pool/thread_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "electron/electron_version.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/v8_initializer.h"
 #include "native_mate/dictionary.h"
-#include "shell/app/uv_task_runner.h"
-#include "shell/browser/javascript_environment.h"
-#include "shell/browser/node_debugger.h"
-#include "shell/common/api/electron_bindings.h"
-#include "shell/common/crash_reporter/crash_reporter.h"
-#include "shell/common/native_mate_converters/string16_converter.h"
-#include "shell/common/node_bindings.h"
-#include "shell/common/node_includes.h"
 
 #if defined(_WIN64)
-#include "shell/common/crash_reporter/crash_reporter_win.h"
+#include "atom/common/crash_reporter/crash_reporter_win.h"
 #endif
 
-namespace electron {
+namespace atom {
 
 int NodeMain(int argc, char* argv[]) {
   base::CommandLine::Init(argc, argv);
@@ -88,7 +88,7 @@ int NodeMain(int argc, char* argv[]) {
 
     mate::Dictionary versions;
     if (process.Get("versions", &versions)) {
-      versions.SetReadOnly(ELECTRON_PROJECT_NAME, ELECTRON_VERSION_STRING);
+      versions.SetReadOnly(ATOM_PROJECT_NAME, ATOM_VERSION_STRING);
     }
 
     node::LoadEnvironment(env);
@@ -130,4 +130,4 @@ int NodeMain(int argc, char* argv[]) {
   return exit_code;
 }
 
-}  // namespace electron
+}  // namespace atom

atom/app/node_main.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_NODE_MAIN_H_
-#define SHELL_APP_NODE_MAIN_H_
+#ifndef ATOM_APP_NODE_MAIN_H_
+#define ATOM_APP_NODE_MAIN_H_
 
-namespace electron {
+namespace atom {
 
 int NodeMain(int argc, char* argv[]);
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_APP_NODE_MAIN_H_
+#endif  // ATOM_APP_NODE_MAIN_H_

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
-	<string>${ELECTRON_BUNDLE_ID}</string>
+	<string>${ATOM_BUNDLE_ID}</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>

atom/app/uv_task_runner.cc

@@ -4,11 +4,11 @@
 
 #include <utility>
 
-#include "shell/app/uv_task_runner.h"
+#include "atom/app/uv_task_runner.h"
 
 #include "base/stl_util.h"
 
-namespace electron {
+namespace atom {
 
 UvTaskRunner::UvTaskRunner(uv_loop_t* loop) : loop_(loop) {}
 
@@ -57,4 +57,4 @@ void UvTaskRunner::OnClose(uv_handle_t* handle) {
   delete reinterpret_cast<uv_timer_t*>(handle);
 }
 
-}  // namespace electron
+}  // namespace atom

atom/app/uv_task_runner.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_APP_UV_TASK_RUNNER_H_
-#define SHELL_APP_UV_TASK_RUNNER_H_
+#ifndef ATOM_APP_UV_TASK_RUNNER_H_
+#define ATOM_APP_UV_TASK_RUNNER_H_
 
 #include <map>
 
@@ -12,7 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "uv.h"  // NOLINT(build/include)
 
-namespace electron {
+namespace atom {
 
 // TaskRunner implementation that posts tasks into libuv's default loop.
 class UvTaskRunner : public base::SingleThreadTaskRunner {
@@ -40,6 +40,6 @@ class UvTaskRunner : public base::SingleThreadTaskRunner {
   DISALLOW_COPY_AND_ASSIGN(UvTaskRunner);
 };
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_APP_UV_TASK_RUNNER_H_
+#endif  // ATOM_APP_UV_TASK_RUNNER_H_

atom/browser/api/atom_api_app.cc

@@ -2,11 +2,31 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_app.h"
+#include "atom/browser/api/atom_api_app.h"
 
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/api/atom_api_session.h"
+#include "atom/browser/api/atom_api_web_contents.h"
+#include "atom/browser/api/gpuinfo_manager.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/atom_paths.h"
+#include "atom/browser/login_handler.h"
+#include "atom/browser/relauncher.h"
+#include "atom/common/application_info.h"
+#include "atom/common/atom_command_line.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/gurl_converter.h"
+#include "atom/common/native_mate_converters/image_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
+#include "atom/common/native_mate_converters/network_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
+#include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
@@ -30,64 +50,24 @@
 #include "net/ssl/client_cert_identity.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "services/service_manager/sandbox/switches.h"
-#include "shell/browser/api/atom_api_menu.h"
-#include "shell/browser/api/atom_api_session.h"
-#include "shell/browser/api/atom_api_web_contents.h"
-#include "shell/browser/api/gpuinfo_manager.h"
-#include "shell/browser/atom_browser_context.h"
-#include "shell/browser/atom_browser_main_parts.h"
-#include "shell/browser/atom_paths.h"
-#include "shell/browser/login_handler.h"
-#include "shell/browser/relauncher.h"
-#include "shell/common/application_info.h"
-#include "shell/common/atom_command_line.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/file_path_converter.h"
-#include "shell/common/native_mate_converters/gurl_converter.h"
-#include "shell/common/native_mate_converters/image_converter.h"
-#include "shell/common/native_mate_converters/net_converter.h"
-#include "shell/common/native_mate_converters/network_converter.h"
-#include "shell/common/native_mate_converters/once_callback.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/options_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_WIN)
+#include "atom/browser/ui/win/jump_list.h"
 #include "base/strings/utf_string_conversions.h"
-#include "shell/browser/ui/win/jump_list.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
-#include "shell/browser/ui/cocoa/atom_bundle_mover.h"
+#include "atom/browser/ui/cocoa/atom_bundle_mover.h"
 #endif
 
-using electron::Browser;
+using atom::Browser;
 
 namespace mate {
 
 #if defined(OS_WIN)
-template <>
-struct Converter<electron::ProcessIntegrityLevel> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   electron::ProcessIntegrityLevel value) {
-    switch (value) {
-      case electron::ProcessIntegrityLevel::Untrusted:
-        return mate::StringToV8(isolate, "untrusted");
-      case electron::ProcessIntegrityLevel::Low:
-        return mate::StringToV8(isolate, "low");
-      case electron::ProcessIntegrityLevel::Medium:
-        return mate::StringToV8(isolate, "medium");
-      case electron::ProcessIntegrityLevel::High:
-        return mate::StringToV8(isolate, "high");
-      default:
-        return mate::StringToV8(isolate, "unknown");
-    }
-  }
-};
-
 template <>
 struct Converter<Browser::UserTask> {
   static bool FromV8(v8::Isolate* isolate,
@@ -109,9 +89,9 @@ struct Converter<Browser::UserTask> {
   }
 };
 
-using electron::JumpListCategory;
-using electron::JumpListItem;
-using electron::JumpListResult;
+using atom::JumpListCategory;
+using atom::JumpListItem;
+using atom::JumpListResult;
 
 template <>
 struct Converter<JumpListItem::Type> {
@@ -374,12 +354,33 @@ struct Converter<content::CertificateRequestResultType> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
+
+ProcessMetric::ProcessMetric(int type,
+                             base::ProcessId pid,
+                             std::unique_ptr<base::ProcessMetrics> metrics) {
+  this->type = type;
+  this->pid = pid;
+  this->metrics = std::move(metrics);
+}
+
+ProcessMetric::~ProcessMetric() = default;
 
 namespace api {
 
 namespace {
 
+class AppIdProcessIterator : public base::ProcessIterator {
+ public:
+  AppIdProcessIterator() : base::ProcessIterator(nullptr) {}
+
+ protected:
+  bool IncludeEntry() override {
+    return (entry().parent_pid() == base::GetCurrentProcId() ||
+            entry().pid() == base::GetCurrentProcId());
+  }
+};
+
 IconLoader::IconSize GetIconSizeByString(const std::string& size) {
   if (size == "small") {
     return IconLoader::IconSize::SMALL;
@@ -428,7 +429,7 @@ int GetPathConstant(const std::string& name) {
 }
 
 bool NotificationCallbackWrapper(
-    const base::RepeatingCallback<
+    const base::Callback<
         void(const base::CommandLine::StringVector& command_line,
              const base::FilePath& current_directory)>& callback,
     const base::CommandLine::StringVector& cmd,
@@ -487,7 +488,7 @@ void OnClientCertificateSelected(
       if (cert->EqualsExcludingChain((*identities)[i]->certificate())) {
         net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
             std::move((*identities)[i]),
-            base::BindRepeating(&GotPrivateKey, delegate, std::move(cert)));
+            base::Bind(&GotPrivateKey, delegate, std::move(cert)));
         break;
       }
     }
@@ -547,8 +548,8 @@ App::App(v8::Isolate* isolate) {
   content::GpuDataManager::GetInstance()->AddObserver(this);
 
   base::ProcessId pid = base::GetCurrentProcId();
-  auto process_metric = std::make_unique<electron::ProcessMetric>(
-      content::PROCESS_TYPE_BROWSER, base::GetCurrentProcessHandle(),
+  auto process_metric = std::make_unique<atom::ProcessMetric>(
+      content::PROCESS_TYPE_BROWSER, pid,
       base::ProcessMetrics::CreateCurrentProcessMetrics());
   app_metrics_[pid] = std::move(process_metric);
   Init(isolate);
@@ -672,11 +673,10 @@ void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
   bool prevent_default = false;
   content::WebContents* web_contents = login_handler->GetWebContents();
   if (web_contents) {
-    prevent_default =
-        Emit("login", WebContents::FromOrCreate(isolate(), web_contents),
-             request_details, *login_handler->auth_info(),
-             base::BindOnce(&PassLoginInformation,
-                            base::RetainedRef(login_handler)));
+    prevent_default = Emit(
+        "login", WebContents::FromOrCreate(isolate(), web_contents),
+        request_details, *login_handler->auth_info(),
+        base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
   }
 
   // Default behavior is to always cancel the auth.
@@ -724,7 +724,7 @@ void App::AllowCertificateError(
     bool is_main_frame_request,
     bool strict_enforcement,
     bool expired_previous_decision,
-    const base::RepeatingCallback<void(content::CertificateRequestResultType)>&
+    const base::Callback<void(content::CertificateRequestResultType)>&
         callback) {
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
@@ -758,8 +758,8 @@ void App::SelectClientCertificate(
       Emit("select-client-certificate",
            WebContents::FromOrCreate(isolate(), web_contents),
            cert_request_info->host_and_port.ToString(), std::move(client_certs),
-           base::BindOnce(&OnClientCertificateSelected, isolate(),
-                          shared_delegate, shared_identities));
+           base::Bind(&OnClientCertificateSelected, isolate(), shared_delegate,
+                      shared_identities));
 
   // Default to first certificate from the platform store.
   if (!prevent_default) {
@@ -767,14 +767,10 @@ void App::SelectClientCertificate(
         (*shared_identities)[0]->certificate();
     net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
         std::move((*shared_identities)[0]),
-        base::BindRepeating(&GotPrivateKey, shared_delegate, std::move(cert)));
+        base::Bind(&GotPrivateKey, shared_delegate, std::move(cert)));
   }
 }
 
-void App::OnGpuInfoUpdate() {
-  Emit("gpu-info-update");
-}
-
 void App::OnGpuProcessCrashed(base::TerminationStatus status) {
   Emit("gpu-process-crashed",
        status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
@@ -805,14 +801,6 @@ void App::BrowserChildProcessKilled(
 void App::RenderProcessReady(content::RenderProcessHost* host) {
   ChildProcessLaunched(content::PROCESS_TYPE_RENDERER,
                        host->GetProcess().Handle());
-
-  // TODO(jeremy): this isn't really the right place to be creating
-  // `WebContents` instances, but this was implicitly happening before in
-  // `RenderProcessPreferences`, so this is at least more explicit...
-  content::WebContents* web_contents =
-      AtomBrowserClient::Get()->GetWebContentsFromProcessID(host->GetID());
-  if (web_contents)
-    WebContents::FromOrCreate(v8::Isolate::GetCurrent(), web_contents);
 }
 
 void App::RenderProcessDisconnected(base::ProcessId host_pid) {
@@ -823,13 +811,15 @@ void App::ChildProcessLaunched(int process_type, base::ProcessHandle handle) {
   auto pid = base::GetProcId(handle);
 
 #if defined(OS_MACOSX)
-  auto metrics = base::ProcessMetrics::CreateProcessMetrics(
-      handle, content::BrowserChildProcessHost::GetPortProvider());
+  std::unique_ptr<base::ProcessMetrics> metrics(
+      base::ProcessMetrics::CreateProcessMetrics(
+          handle, content::BrowserChildProcessHost::GetPortProvider()));
 #else
-  auto metrics = base::ProcessMetrics::CreateProcessMetrics(handle);
+  std::unique_ptr<base::ProcessMetrics> metrics(
+      base::ProcessMetrics::CreateProcessMetrics(handle));
 #endif
-  app_metrics_[pid] = std::make_unique<electron::ProcessMetric>(
-      process_type, handle, std::move(metrics));
+  app_metrics_[pid] = std::make_unique<atom::ProcessMetric>(process_type, pid,
+                                                            std::move(metrics));
 }
 
 void App::ChildProcessDisconnected(base::ProcessId pid) {
@@ -870,8 +860,15 @@ base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
   int key = GetPathConstant(name);
   if (key >= 0)
     succeed = base::PathService::Get(key, &path);
-  if (!succeed)
-    args->ThrowError("Failed to get '" + name + "' path");
+  if (!succeed) {
+    if (name == "logs") {
+      args->ThrowError("Failed to get '" + name +
+                       "' path: setAppLogsPath() must be called first.");
+    } else {
+      args->ThrowError("Failed to get '" + name + "' path");
+    }
+  }
+
   return path;
 }
 
@@ -960,10 +957,10 @@ bool App::RequestSingleInstanceLock() {
   base::FilePath user_dir;
   base::PathService::Get(DIR_USER_DATA, &user_dir);
 
-  auto cb = base::BindRepeating(&App::OnSecondInstance, base::Unretained(this));
+  auto cb = base::Bind(&App::OnSecondInstance, base::Unretained(this));
 
   process_singleton_.reset(new ProcessSingleton(
-      user_dir, base::BindRepeating(NotificationCallbackWrapper, cb)));
+      user_dir, base::Bind(NotificationCallbackWrapper, cb)));
 
   switch (process_singleton_->NotifyOtherProcessOrCreate()) {
     case ProcessSingleton::NotifyResult::LOCK_ERROR:
@@ -998,7 +995,7 @@ bool App::Relaunch(mate::Arguments* js_args) {
   }
 
   if (!override_argv) {
-    const relauncher::StringVector& argv = electron::AtomCommandLine::argv();
+    const relauncher::StringVector& argv = atom::AtomCommandLine::argv();
     return relauncher::RelaunchApp(argv);
   }
 
@@ -1076,9 +1073,8 @@ void App::ImportCertificate(const base::DictionaryValue& options,
         base::Value::ToUniquePtrValue(options.Clone()));
     CertificateManagerModel::Create(
         browser_context.get(),
-        base::BindRepeating(&App::OnCertificateManagerModelCreated,
-                            base::Unretained(this), base::Passed(&copy),
-                            callback));
+        base::Bind(&App::OnCertificateManagerModelCreated,
+                   base::Unretained(this), base::Passed(&copy), callback));
     return;
   }
 
@@ -1211,21 +1207,9 @@ std::vector<mate::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
 #endif
 
     pid_dict.Set("cpu", cpu_dict);
-    pid_dict.Set("pid", process_metric.second->process.Pid());
+    pid_dict.Set("pid", process_metric.second->pid);
     pid_dict.Set("type", content::GetProcessTypeNameInEnglish(
                              process_metric.second->type));
-    pid_dict.Set("creationTime",
-                 process_metric.second->process.CreationTime().ToJsTime());
-
-#if defined(OS_MACOSX)
-    pid_dict.Set("sandboxed", process_metric.second->IsSandboxed());
-#elif defined(OS_WIN)
-    auto integrity_level = process_metric.second->GetIntegrityLevel();
-    auto sandboxed = ProcessMetric::IsSandboxed(integrity_level);
-    pid_dict.Set("integrityLevel", integrity_level);
-    pid_dict.Set("sandboxed", sandboxed);
-#endif
-
     result.push_back(pid_dict);
   }
 
@@ -1318,16 +1302,19 @@ bool App::IsInApplicationsFolder() {
   return ui::cocoa::AtomBundleMover::IsCurrentAppInApplicationsFolder();
 }
 
-int DockBounce(const std::string& type) {
+int DockBounce(mate::Arguments* args) {
   int request_id = -1;
+  std::string type = "informational";
+  args->GetNext(&type);
+
   if (type == "critical")
-    request_id = Browser::Get()->DockBounce(Browser::BounceType::CRITICAL);
+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_CRITICAL);
   else if (type == "informational")
-    request_id = Browser::Get()->DockBounce(Browser::BounceType::INFORMATIONAL);
+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_INFORMATIONAL);
   return request_id;
 }
 
-void DockSetMenu(electron::api::Menu* menu) {
+void DockSetMenu(atom::api::Menu* menu) {
   Browser::Get()->DockSetMenu(menu->model());
 }
 
@@ -1338,25 +1325,20 @@ v8::Local<v8::Value> App::GetDockAPI(v8::Isolate* isolate) {
     auto browser = base::Unretained(Browser::Get());
     mate::Dictionary dock_obj = mate::Dictionary::CreateEmpty(isolate);
     dock_obj.SetMethod("bounce", &DockBounce);
-    dock_obj.SetMethod(
-        "cancelBounce",
-        base::BindRepeating(&Browser::DockCancelBounce, browser));
-    dock_obj.SetMethod(
-        "downloadFinished",
-        base::BindRepeating(&Browser::DockDownloadFinished, browser));
-    dock_obj.SetMethod(
-        "setBadge", base::BindRepeating(&Browser::DockSetBadgeText, browser));
-    dock_obj.SetMethod(
-        "getBadge", base::BindRepeating(&Browser::DockGetBadgeText, browser));
-    dock_obj.SetMethod("hide",
-                       base::BindRepeating(&Browser::DockHide, browser));
-    dock_obj.SetMethod("show",
-                       base::BindRepeating(&Browser::DockShow, browser));
+    dock_obj.SetMethod("cancelBounce",
+                       base::Bind(&Browser::DockCancelBounce, browser));
+    dock_obj.SetMethod("downloadFinished",
+                       base::Bind(&Browser::DockDownloadFinished, browser));
+    dock_obj.SetMethod("setBadge",
+                       base::Bind(&Browser::DockSetBadgeText, browser));
+    dock_obj.SetMethod("getBadge",
+                       base::Bind(&Browser::DockGetBadgeText, browser));
+    dock_obj.SetMethod("hide", base::Bind(&Browser::DockHide, browser));
+    dock_obj.SetMethod("show", base::Bind(&Browser::DockShow, browser));
     dock_obj.SetMethod("isVisible",
-                       base::BindRepeating(&Browser::DockIsVisible, browser));
+                       base::Bind(&Browser::DockIsVisible, browser));
     dock_obj.SetMethod("setMenu", &DockSetMenu);
-    dock_obj.SetMethod("setIcon",
-                       base::BindRepeating(&Browser::DockSetIcon, browser));
+    dock_obj.SetMethod("setIcon", base::Bind(&Browser::DockSetIcon, browser));
 
     dock_.Reset(isolate, dock_obj.GetHandle());
   }
@@ -1375,86 +1357,70 @@ void App::BuildPrototype(v8::Isolate* isolate,
   prototype->SetClassName(mate::StringToV8(isolate, "App"));
   auto browser = base::Unretained(Browser::Get());
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("quit", base::BindRepeating(&Browser::Quit, browser))
-      .SetMethod("exit", base::BindRepeating(&Browser::Exit, browser))
-      .SetMethod("focus", base::BindRepeating(&Browser::Focus, browser))
-      .SetMethod("getVersion",
-                 base::BindRepeating(&Browser::GetVersion, browser))
-      .SetMethod("setVersion",
-                 base::BindRepeating(&Browser::SetVersion, browser))
-      .SetMethod("_getName", base::BindRepeating(&Browser::GetName, browser))
-      .SetMethod("_setName", base::BindRepeating(&Browser::SetName, browser))
-      .SetMethod("isReady", base::BindRepeating(&Browser::is_ready, browser))
-      .SetMethod("whenReady", base::BindRepeating(&Browser::WhenReady, browser))
+      .SetMethod("quit", base::Bind(&Browser::Quit, browser))
+      .SetMethod("exit", base::Bind(&Browser::Exit, browser))
+      .SetMethod("focus", base::Bind(&Browser::Focus, browser))
+      .SetMethod("getVersion", base::Bind(&Browser::GetVersion, browser))
+      .SetMethod("setVersion", base::Bind(&Browser::SetVersion, browser))
+      .SetMethod("getName", base::Bind(&Browser::GetName, browser))
+      .SetMethod("setName", base::Bind(&Browser::SetName, browser))
+      .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
+      .SetMethod("whenReady", base::Bind(&Browser::WhenReady, browser))
       .SetMethod("addRecentDocument",
-                 base::BindRepeating(&Browser::AddRecentDocument, browser))
+                 base::Bind(&Browser::AddRecentDocument, browser))
       .SetMethod("clearRecentDocuments",
-                 base::BindRepeating(&Browser::ClearRecentDocuments, browser))
+                 base::Bind(&Browser::ClearRecentDocuments, browser))
       .SetMethod("setAppUserModelId",
-                 base::BindRepeating(&Browser::SetAppUserModelID, browser))
-      .SetMethod(
-          "isDefaultProtocolClient",
-          base::BindRepeating(&Browser::IsDefaultProtocolClient, browser))
-      .SetMethod(
-          "setAsDefaultProtocolClient",
-          base::BindRepeating(&Browser::SetAsDefaultProtocolClient, browser))
-      .SetMethod(
-          "removeAsDefaultProtocolClient",
-          base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
-      .SetMethod("_setBadgeCount",
-                 base::BindRepeating(&Browser::SetBadgeCount, browser))
-      .SetMethod("_getBadgeCount",
-                 base::BindRepeating(&Browser::GetBadgeCount, browser))
+                 base::Bind(&Browser::SetAppUserModelID, browser))
+      .SetMethod("isDefaultProtocolClient",
+                 base::Bind(&Browser::IsDefaultProtocolClient, browser))
+      .SetMethod("setAsDefaultProtocolClient",
+                 base::Bind(&Browser::SetAsDefaultProtocolClient, browser))
+      .SetMethod("removeAsDefaultProtocolClient",
+                 base::Bind(&Browser::RemoveAsDefaultProtocolClient, browser))
+      .SetMethod("setBadgeCount", base::Bind(&Browser::SetBadgeCount, browser))
+      .SetMethod("getBadgeCount", base::Bind(&Browser::GetBadgeCount, browser))
       .SetMethod("getLoginItemSettings", &App::GetLoginItemSettings)
       .SetMethod("setLoginItemSettings",
-                 base::BindRepeating(&Browser::SetLoginItemSettings, browser))
+                 base::Bind(&Browser::SetLoginItemSettings, browser))
       .SetMethod("isEmojiPanelSupported",
-                 base::BindRepeating(&Browser::IsEmojiPanelSupported, browser))
-      .SetProperty("badgeCount",
-                   base::BindRepeating(&Browser::GetBadgeCount, browser),
-                   base::BindRepeating(&Browser::SetBadgeCount, browser))
-      .SetProperty("name", base::BindRepeating(&Browser::GetName, browser),
-                   base::BindRepeating(&Browser::SetName, browser))
+                 base::Bind(&Browser::IsEmojiPanelSupported, browser))
 #if defined(OS_MACOSX)
-      .SetMethod("hide", base::BindRepeating(&Browser::Hide, browser))
-      .SetMethod("show", base::BindRepeating(&Browser::Show, browser))
+      .SetMethod("hide", base::Bind(&Browser::Hide, browser))
+      .SetMethod("show", base::Bind(&Browser::Show, browser))
       .SetMethod("setUserActivity",
-                 base::BindRepeating(&Browser::SetUserActivity, browser))
+                 base::Bind(&Browser::SetUserActivity, browser))
       .SetMethod("getCurrentActivityType",
-                 base::BindRepeating(&Browser::GetCurrentActivityType, browser))
-      .SetMethod(
-          "invalidateCurrentActivity",
-          base::BindRepeating(&Browser::InvalidateCurrentActivity, browser))
-      .SetMethod("resignCurrentActivity",
-                 base::BindRepeating(&Browser::ResignCurrentActivity, browser))
+                 base::Bind(&Browser::GetCurrentActivityType, browser))
+      .SetMethod("invalidateCurrentActivity",
+                 base::Bind(&Browser::InvalidateCurrentActivity, browser))
       .SetMethod("updateCurrentActivity",
-                 base::BindRepeating(&Browser::UpdateCurrentActivity, browser))
+                 base::Bind(&Browser::UpdateCurrentActivity, browser))
       // TODO(juturu): Remove in 2.0, deprecate before then with warnings
       .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
       .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
 #endif
 #if defined(OS_MACOSX) || defined(OS_LINUX)
       .SetMethod("setAboutPanelOptions",
-                 base::BindRepeating(&Browser::SetAboutPanelOptions, browser))
+                 base::Bind(&Browser::SetAboutPanelOptions, browser))
       .SetMethod("showAboutPanel",
-                 base::BindRepeating(&Browser::ShowAboutPanel, browser))
+                 base::Bind(&Browser::ShowAboutPanel, browser))
 #endif
 #if defined(OS_MACOSX) || defined(OS_WIN)
       .SetMethod("showEmojiPanel",
-                 base::BindRepeating(&Browser::ShowEmojiPanel, browser))
+                 base::Bind(&Browser::ShowEmojiPanel, browser))
       .SetProperty("accessibilitySupportEnabled",
                    &App::IsAccessibilitySupportEnabled,
                    &App::SetAccessibilitySupportEnabled)
 #endif
 #if defined(OS_WIN)
-      .SetMethod("setUserTasks",
-                 base::BindRepeating(&Browser::SetUserTasks, browser))
+      .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))
       .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
       .SetMethod("setJumpList", &App::SetJumpList)
 #endif
 #if defined(OS_LINUX)
       .SetMethod("isUnityRunning",
-                 base::BindRepeating(&Browser::IsUnityRunning, browser))
+                 base::Bind(&Browser::IsUnityRunning, browser))
 #endif
       .SetMethod("setAppPath", &App::SetAppPath)
       .SetMethod("getAppPath", &App::GetAppPath)
@@ -1500,7 +1466,7 @@ void App::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
@@ -1510,10 +1476,10 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("App", electron::api::App::GetConstructor(isolate)
+  dict.Set("App", atom::api::App::GetConstructor(isolate)
                       ->GetFunction(context)
                       .ToLocalChecked());
-  dict.Set("app", electron::api::App::Create(isolate));
+  dict.Set("app", atom::api::App::Create(isolate));
 }
 
 }  // namespace

atom/browser/api/atom_api_app.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_APP_H_
-#define SHELL_BROWSER_API_ATOM_API_APP_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_APP_H_
+#define ATOM_BROWSER_API_ATOM_API_APP_H_
 
 #include <memory>
 #include <string>
@@ -11,6 +11,14 @@
 #include <utility>
 #include <vector>
 
+#include "atom/browser/api/event_emitter.h"
+#include "atom/browser/atom_browser_client.h"
+#include "atom/browser/browser.h"
+#include "atom/browser/browser_observer.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/promise_util.h"
+#include "base/process/process_iterator.h"
+#include "base/process/process_metrics.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/process_singleton.h"
@@ -22,13 +30,6 @@
 #include "net/base/completion_once_callback.h"
 #include "net/base/completion_repeating_callback.h"
 #include "net/ssl/client_cert_identity.h"
-#include "shell/browser/api/event_emitter.h"
-#include "shell/browser/api/process_metric.h"
-#include "shell/browser/atom_browser_client.h"
-#include "shell/browser/browser.h"
-#include "shell/browser/browser_observer.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/promise_util.h"
 
 #if defined(USE_NSS_CERTS)
 #include "chrome/browser/certificate_manager_model.h"
@@ -42,12 +43,23 @@ namespace mate {
 class Arguments;
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 #if defined(OS_WIN)
 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);
+  ~ProcessMetric();
+};
+
 namespace api {
 
 class App : public AtomBrowserClient::Delegate,
@@ -57,7 +69,7 @@ class App : public AtomBrowserClient::Delegate,
             public content::BrowserChildProcessObserver {
  public:
   using FileIconCallback =
-      base::RepeatingCallback<void(v8::Local<v8::Value>, const gfx::Image&)>;
+      base::Callback<void(v8::Local<v8::Value>, const gfx::Image&)>;
 
   static mate::Handle<App> Create(v8::Isolate* isolate);
 
@@ -121,8 +133,8 @@ class App : public AtomBrowserClient::Delegate,
       bool is_main_frame_request,
       bool strict_enforcement,
       bool expired_previous_decision,
-      const base::RepeatingCallback<
-          void(content::CertificateRequestResultType)>& callback) override;
+      const base::Callback<void(content::CertificateRequestResultType)>&
+          callback) override;
   void SelectClientCertificate(
       content::WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
@@ -145,7 +157,6 @@ class App : public AtomBrowserClient::Delegate,
                        bool* no_javascript_access) override;
 
   // content::GpuDataManagerObserver:
-  void OnGpuInfoUpdate() override;
   void OnGpuProcessCrashed(base::TerminationStatus status) override;
 
   // content::BrowserChildProcessObserver:
@@ -212,7 +223,7 @@ class App : public AtomBrowserClient::Delegate,
 #endif
 
 #if defined(MAS_BUILD)
-  base::RepeatingCallback<void()> StartAccessingSecurityScopedResource(
+  base::Callback<void()> StartAccessingSecurityScopedResource(
       mate::Arguments* args);
 #endif
 
@@ -236,8 +247,7 @@ class App : public AtomBrowserClient::Delegate,
   base::FilePath app_path_;
 
   using ProcessMetricMap =
-      std::unordered_map<base::ProcessId,
-                         std::unique_ptr<electron::ProcessMetric>>;
+      std::unordered_map<base::ProcessId, std::unique_ptr<atom::ProcessMetric>>;
   ProcessMetricMap app_metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(App);
@@ -245,6 +255,6 @@ class App : public AtomBrowserClient::Delegate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_APP_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_APP_H_

atom/browser/api/atom_api_app_mac.mm

@@ -2,14 +2,14 @@
 // 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"
+#include "atom/browser/atom_paths.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "base/path_service.h"
-#include "shell/browser/api/atom_api_app.h"
-#include "shell/browser/atom_paths.h"
-#include "shell/common/native_mate_converters/file_path_converter.h"
 
 #import <Cocoa/Cocoa.h>
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -33,6 +33,6 @@ void App::SetAppLogsPath(mate::Arguments* args) {
   }
 }
 
-}  // namespace api
+}  // namespace atom
 
-}  // namespace electron
+}  // namespace api

atom/browser/api/atom_api_app_mas.mm

@@ -2,15 +2,13 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_app.h"
-
-#include <string>
+#include "atom/browser/api/atom_api_app.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/strings/sys_string_conversions.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -21,13 +19,13 @@ void OnStopAccessingSecurityScopedResource(NSURL* bookmarkUrl) {
 }
 
 // Get base64 encoded NSData, create a bookmark for it and start accessing it.
-base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource(
+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];
+  NSData* bookmarkData =
+      [[NSData alloc] initWithBase64EncodedString:base64str options:0];
 
   // Create bookmarkUrl from NSData.
   BOOL isStale = false;
@@ -57,10 +55,9 @@ base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource(
   [bookmarkUrl retain];
 
   // Return a js callback which will close the bookmark.
-  return base::BindRepeating(&OnStopAccessingSecurityScopedResource,
-                             bookmarkUrl);
+  return base::Bind(&OnStopAccessingSecurityScopedResource, bookmarkUrl);
 }
 
-}  // namespace api
+}  // namespace atom
 
-}  // namespace electron
+}  // namespace api

atom/browser/api/atom_api_auto_updater.cc

@@ -2,17 +2,17 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_auto_updater.h"
+#include "atom/browser/api/atom_api_auto_updater.h"
 
+#include "atom/browser/browser.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/window_list.h"
+#include "atom/common/api/event_emitter_caller.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/node_includes.h"
 #include "base/time/time.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "shell/browser/browser.h"
-#include "shell/browser/native_window.h"
-#include "shell/browser/window_list.h"
-#include "shell/common/api/event_emitter_caller.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/node_includes.h"
 
 namespace mate {
 
@@ -31,7 +31,7 @@ struct Converter<base::Time> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -97,8 +97,7 @@ void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
                                      const std::string& url) {
   Emit("update-downloaded", release_notes, release_name, release_date, url,
        // Keep compatibility with old APIs.
-       base::BindRepeating(&AutoUpdater::QuitAndInstall,
-                           base::Unretained(this)));
+       base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this)));
 }
 
 void AutoUpdater::OnWindowAllClosed() {
@@ -141,11 +140,11 @@ void AutoUpdater::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::AutoUpdater;
+using atom::api::AutoUpdater;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

atom/browser/api/atom_api_auto_updater.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
-#define SHELL_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
+#define ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
 
 #include <string>
 
+#include "atom/browser/api/event_emitter.h"
+#include "atom/browser/auto_updater.h"
+#include "atom/browser/window_list_observer.h"
 #include "native_mate/arguments.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/event_emitter.h"
-#include "shell/browser/auto_updater.h"
-#include "shell/browser/window_list_observer.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -56,6 +56,6 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_

atom/browser/api/atom_api_browser_view.cc

@@ -2,27 +2,27 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_browser_view.h"
+#include "atom/browser/api/atom_api_browser_view.h"
 
+#include "atom/browser/api/atom_api_web_contents.h"
+#include "atom/browser/browser.h"
+#include "atom/browser/native_browser_view.h"
+#include "atom/common/color_util.h"
+#include "atom/common/native_mate_converters/gfx_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
+#include "atom/common/options_switches.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/api/atom_api_web_contents.h"
-#include "shell/browser/browser.h"
-#include "shell/browser/native_browser_view.h"
-#include "shell/common/color_util.h"
-#include "shell/common/native_mate_converters/gfx_converter.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/options_switches.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mate {
 
 template <>
-struct Converter<electron::AutoResizeFlags> {
+struct Converter<atom::AutoResizeFlags> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     electron::AutoResizeFlags* auto_resize_flags) {
+                     atom::AutoResizeFlags* auto_resize_flags) {
     mate::Dictionary params;
     if (!ConvertFromV8(isolate, val, &params)) {
       return false;
@@ -31,29 +31,29 @@ struct Converter<electron::AutoResizeFlags> {
     uint8_t flags = 0;
     bool width = false;
     if (params.Get("width", &width) && width) {
-      flags |= electron::kAutoResizeWidth;
+      flags |= atom::kAutoResizeWidth;
     }
     bool height = false;
     if (params.Get("height", &height) && height) {
-      flags |= electron::kAutoResizeHeight;
+      flags |= atom::kAutoResizeHeight;
     }
     bool horizontal = false;
     if (params.Get("horizontal", &horizontal) && horizontal) {
-      flags |= electron::kAutoResizeHorizontal;
+      flags |= atom::kAutoResizeHorizontal;
     }
     bool vertical = false;
     if (params.Get("vertical", &vertical) && vertical) {
-      flags |= electron::kAutoResizeVertical;
+      flags |= atom::kAutoResizeVertical;
     }
 
-    *auto_resize_flags = static_cast<electron::AutoResizeFlags>(flags);
+    *auto_resize_flags = static_cast<atom::AutoResizeFlags>(flags);
     return true;
   }
 };
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -68,7 +68,7 @@ void BrowserView::Init(v8::Isolate* isolate,
                        const mate::Dictionary& options) {
   mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
   options.Get(options::kWebPreferences, &web_preferences);
-  web_preferences.Set("type", "browserView");
+  web_preferences.Set("isBrowserView", true);
   mate::Handle<class WebContents> web_contents =
       WebContents::Create(isolate, web_preferences);
 
@@ -154,18 +154,18 @@ void BrowserView::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::BrowserView;
+using atom::api::BrowserView;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  BrowserView::SetConstructor(isolate, base::BindRepeating(&BrowserView::New));
+  BrowserView::SetConstructor(isolate, base::Bind(&BrowserView::New));
 
   mate::Dictionary browser_view(isolate, BrowserView::GetConstructor(isolate)
                                              ->GetFunction(context)

atom/browser/api/atom_api_browser_view.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
-#define SHELL_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
+#define ATOM_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
 
 #include <memory>
 #include <string>
 
+#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/native_browser_view.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/native_browser_view.h"
 
 namespace gfx {
 class Rect;
@@ -22,7 +22,7 @@ class Arguments;
 class Dictionary;
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 class NativeBrowserView;
 
@@ -73,6 +73,6 @@ class BrowserView : public mate::TrackableObject<BrowserView>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_BROWSER_VIEW_H_

atom/browser/api/atom_api_browser_window.cc

@@ -2,10 +2,21 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_browser_window.h"
+#include "atom/browser/api/atom_api_browser_window.h"
 
 #include <memory>
 
+#include "atom/browser/browser.h"
+#include "atom/browser/unresponsive_suppressor.h"
+#include "atom/browser/web_contents_preferences.h"
+#include "atom/browser/window_list.h"
+#include "atom/common/api/api_messages.h"
+#include "atom/common/api/constructor.h"
+#include "atom/common/color_util.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
+#include "atom/common/options_switches.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"  // nogncheck
 #include "content/browser/renderer_host/render_widget_host_owner_delegate.h"  // nogncheck
@@ -13,19 +24,9 @@
 #include "content/public/browser/render_view_host.h"
 #include "gin/converter.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/browser.h"
-#include "shell/browser/unresponsive_suppressor.h"
-#include "shell/browser/web_contents_preferences.h"
-#include "shell/browser/window_list.h"
-#include "shell/common/api/constructor.h"
-#include "shell/common/color_util.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/options_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -84,8 +85,7 @@ BrowserWindow::BrowserWindow(v8::Isolate* isolate,
   InitWith(isolate, wrapper);
 
 #if defined(OS_MACOSX)
-  if (!window()->has_frame())
-    OverrideNSWindowContentView(web_contents->managed_web_contents());
+  OverrideNSWindowContentView(web_contents->managed_web_contents());
 #endif
 
   // Init window after everything has been setup.
@@ -171,6 +171,17 @@ void BrowserWindow::OnRendererUnresponsive(content::RenderProcessHost*) {
   ScheduleUnresponsiveEvent(50);
 }
 
+bool BrowserWindow::OnMessageReceived(const IPC::Message& message,
+                                      content::RenderFrameHost* rfh) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(BrowserWindow, message, rfh)
+    IPC_MESSAGE_HANDLER(AtomFrameHostMsg_UpdateDraggableRegions,
+                        UpdateDraggableRegions)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
 void BrowserWindow::OnCloseContents() {
   // On some machines it may happen that the window gets destroyed for twice,
   // checking web_contents() can effectively guard against that.
@@ -206,11 +217,6 @@ void BrowserWindow::OnRendererResponsive() {
   Emit("responsive");
 }
 
-void BrowserWindow::OnDraggableRegionsUpdated(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
-  UpdateDraggableRegions(regions);
-}
-
 void BrowserWindow::RequestPreferredWidth(int* width) {
   *width = web_contents()->GetPreferredSize().width();
 }
@@ -271,7 +277,7 @@ void BrowserWindow::OnWindowFocus() {
 void BrowserWindow::OnWindowResize() {
 #if defined(OS_MACOSX)
   if (!draggable_regions_.empty())
-    UpdateDraggableRegions(draggable_regions_);
+    UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
   TopLevelWindow::OnWindowResize();
 }
@@ -309,28 +315,28 @@ void BrowserWindow::SetBrowserView(v8::Local<v8::Value> value) {
   TopLevelWindow::ResetBrowserViews();
   TopLevelWindow::AddBrowserView(value);
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
 void BrowserWindow::AddBrowserView(v8::Local<v8::Value> value) {
   TopLevelWindow::AddBrowserView(value);
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
 void BrowserWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
   TopLevelWindow::RemoveBrowserView(value);
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
 void BrowserWindow::ResetBrowserViews() {
   TopLevelWindow::ResetBrowserViews();
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
@@ -372,13 +378,13 @@ v8::Local<v8::Value> BrowserWindow::GetWebContents(v8::Isolate* isolate) {
 
 // Convert draggable regions in raw format to SkRegion format.
 std::unique_ptr<SkRegion> BrowserWindow::DraggableRegionsToSkRegion(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
+    const std::vector<DraggableRegion>& regions) {
   auto sk_region = std::make_unique<SkRegion>();
-  for (const auto& region : regions) {
+  for (const DraggableRegion& region : regions) {
     sk_region->op(
-        region->bounds.x(), region->bounds.y(), region->bounds.right(),
-        region->bounds.bottom(),
-        region->draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
+        region.bounds.x(), region.bounds.y(), region.bounds.right(),
+        region.bounds.bottom(),
+        region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
@@ -387,8 +393,8 @@ void BrowserWindow::ScheduleUnresponsiveEvent(int ms) {
   if (!window_unresponsive_closure_.IsCancelled())
     return;
 
-  window_unresponsive_closure_.Reset(base::BindRepeating(
-      &BrowserWindow::NotifyWindowUnresponsive, GetWeakPtr()));
+  window_unresponsive_closure_.Reset(
+      base::Bind(&BrowserWindow::NotifyWindowUnresponsive, GetWeakPtr()));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, window_unresponsive_closure_.callback(),
       base::TimeDelta::FromMilliseconds(ms));
@@ -456,12 +462,12 @@ v8::Local<v8::Value> BrowserWindow::From(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::BrowserWindow;
-using electron::api::TopLevelWindow;
+using atom::api::BrowserWindow;
+using atom::api::TopLevelWindow;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
@@ -469,9 +475,8 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("BrowserWindow",
-           mate::CreateConstructor<BrowserWindow>(
-               isolate, base::BindRepeating(&BrowserWindow::New)));
+  dict.Set("BrowserWindow", mate::CreateConstructor<BrowserWindow>(
+                                isolate, base::Bind(&BrowserWindow::New)));
 }
 
 }  // namespace

atom/browser/api/atom_api_browser_window.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
-#define SHELL_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
+#define ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/atom_api_top_level_window.h"
+#include "atom/browser/api/atom_api_web_contents.h"
 #include "base/cancelable_callback.h"
-#include "shell/browser/api/atom_api_top_level_window.h"
-#include "shell/browser/api/atom_api_web_contents.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -51,12 +51,12 @@ class BrowserWindow : public TopLevelWindow,
   void DidFirstVisuallyNonEmptyPaint() override;
   void BeforeUnloadDialogCancelled() override;
   void OnRendererUnresponsive(content::RenderProcessHost*) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         content::RenderFrameHost* rfh) override;
 
   // ExtendedWebContentsObserver:
   void OnCloseContents() override;
   void OnRendererResponsive() override;
-  void OnDraggableRegionsUpdated(
-      const std::vector<mojom::DraggableRegionPtr>& regions) override;
 
   // NativeWindowObserver:
   void RequestPreferredWidth(int* width) override;
@@ -91,12 +91,12 @@ class BrowserWindow : public TopLevelWindow,
   // Helpers.
 
   // Called when the window needs to update its draggable region.
-  void UpdateDraggableRegions(
-      const std::vector<mojom::DraggableRegionPtr>& regions);
+  void UpdateDraggableRegions(content::RenderFrameHost* rfh,
+                              const std::vector<DraggableRegion>& regions);
 
   // Convert draggable regions in raw format to SkRegion format.
   std::unique_ptr<SkRegion> DraggableRegionsToSkRegion(
-      const std::vector<mojom::DraggableRegionPtr>& regions);
+      const std::vector<DraggableRegion>& regions);
 
   // Schedule a notification unresponsive event.
   void ScheduleUnresponsiveEvent(int ms);
@@ -112,7 +112,7 @@ class BrowserWindow : public TopLevelWindow,
   base::CancelableClosure window_unresponsive_closure_;
 
 #if defined(OS_MACOSX)
-  std::vector<mojom::DraggableRegionPtr> draggable_regions_;
+  std::vector<DraggableRegion> draggable_regions_;
 #endif
 
   v8::Global<v8::Value> web_contents_;
@@ -125,6 +125,6 @@ class BrowserWindow : public TopLevelWindow,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_

atom/browser/api/atom_api_browser_window_mac.mm

@@ -2,17 +2,15 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_browser_window.h"
-
-#include <memory>
-#include <vector>
+#include "atom/browser/api/atom_api_browser_window.h"
 
 #import <Cocoa/Cocoa.h>
 
+#include "atom/browser/native_browser_view.h"
+#include "atom/browser/native_window_mac.h"
+#include "atom/browser/ui/inspectable_web_contents_view.h"
+#include "atom/common/draggable_region.h"
 #include "base/mac/scoped_nsobject.h"
-#include "shell/browser/native_browser_view.h"
-#include "shell/browser/native_window_mac.h"
-#include "shell/browser/ui/inspectable_web_contents_view.h"
 
 @interface NSView (WebContentsView)
 - (void)setMouseDownCanMoveWindow:(BOOL)can_move;
@@ -33,7 +31,7 @@
 
 @end
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -75,7 +73,8 @@ void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
 }
 
 void BrowserWindow::UpdateDraggableRegions(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
+    content::RenderFrameHost* rfh,
+    const std::vector<DraggableRegion>& regions) {
   if (window_->has_frame())
     return;
 
@@ -101,9 +100,7 @@ void BrowserWindow::UpdateDraggableRegions(
 
   // Draggable regions is implemented by having the whole web view draggable
   // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-  draggable_regions_.clear();
-  for (const auto& r : regions)
-    draggable_regions_.push_back(r.Clone());
+  draggable_regions_ = regions;
   std::vector<gfx::Rect> drag_exclude_rects;
   if (regions.empty()) {
     drag_exclude_rects.push_back(gfx::Rect(0, 0, webViewWidth, webViewHeight));
@@ -114,7 +111,7 @@ void BrowserWindow::UpdateDraggableRegions(
 
   auto browser_views = window_->browser_views();
   for (NativeBrowserView* view : browser_views) {
-    view->UpdateDraggableRegions(drag_exclude_rects);
+    (view)->UpdateDraggableRegions(drag_exclude_rects);
   }
 
   // Create and add a ControlRegionView for each region that needs to be
@@ -137,4 +134,4 @@ void BrowserWindow::UpdateDraggableRegions(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_browser_window_views.cc

@@ -2,16 +2,17 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_browser_window.h"
+#include "atom/browser/api/atom_api_browser_window.h"
 
-#include "shell/browser/native_window_views.h"
+#include "atom/browser/native_window_views.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
 void BrowserWindow::UpdateDraggableRegions(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
+    content::RenderFrameHost* rfh,
+    const std::vector<DraggableRegion>& regions) {
   if (window_->has_frame())
     return;
   static_cast<NativeWindowViews*>(window_.get())
@@ -20,4 +21,4 @@ void BrowserWindow::UpdateDraggableRegions(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_content_tracing.cc

@@ -4,19 +4,17 @@
 
 #include <set>
 #include <string>
-#include <utility>
 
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
+#include "atom/common/promise_util.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/optional.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/tracing_controller.h"
 #include "native_mate/dictionary.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/file_path_converter.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/promise_util.h"
 
 using content::TracingController;
 
@@ -55,55 +53,45 @@ struct Converter<base::trace_event::TraceConfig> {
 
 namespace {
 
-using CompletionCallback = base::OnceCallback<void(const base::FilePath&)>;
+using CompletionCallback = base::Callback<void(const base::FilePath&)>;
 
-base::Optional<base::FilePath> CreateTemporaryFileOnIO() {
-  base::FilePath temp_file_path;
-  if (!base::CreateTemporaryFile(&temp_file_path))
-    return base::nullopt;
-  return base::make_optional(std::move(temp_file_path));
+scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
+    const base::FilePath& path,
+    const CompletionCallback& callback) {
+  base::FilePath result_file_path = path;
+
+  // base::CreateTemporaryFile prevents blocking so we need to allow it
+  // for now since offloading this to a different sequence would require
+  // changing the api shape
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  if (result_file_path.empty() && !base::CreateTemporaryFile(&result_file_path))
+    LOG(ERROR) << "Creating temporary file failed";
+
+  return TracingController::CreateFileEndpoint(
+      result_file_path, base::Bind(callback, result_file_path));
 }
 
-void StopTracing(electron::util::Promise promise,
-                 base::Optional<base::FilePath> file_path) {
-  if (file_path) {
-    auto endpoint = TracingController::CreateFileEndpoint(
-        *file_path,
-        base::AdaptCallbackForRepeating(base::BindOnce(
-            &electron::util::Promise::ResolvePromise<base::FilePath>,
-            std::move(promise), *file_path)));
-    TracingController::GetInstance()->StopTracing(endpoint);
-  } else {
-    promise.RejectWithErrorMessage(
-        "Failed to create temporary file for trace data");
-  }
-}
-
-v8::Local<v8::Promise> StopRecording(mate::Arguments* args) {
-  electron::util::Promise promise(args->isolate());
+v8::Local<v8::Promise> StopRecording(v8::Isolate* isolate,
+                                     const base::FilePath& path) {
+  atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  base::FilePath path;
-  if (args->GetNext(&path) && !path.empty()) {
-    StopTracing(std::move(promise), base::make_optional(path));
-  } else {
-    // use a temporary file.
-    base::PostTaskWithTraitsAndReplyWithResult(
-        FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE},
-        base::BindOnce(CreateTemporaryFileOnIO),
-        base::BindOnce(StopTracing, std::move(promise)));
-  }
-
+  // TODO(zcbenz): Remove the use of CopyablePromise when the
+  // CreateFileEndpoint API accepts OnceCallback.
+  TracingController::GetInstance()->StopTracing(GetTraceDataEndpoint(
+      path, base::Bind(atom::util::CopyablePromise::ResolveCopyablePromise<
+                           const base::FilePath&>,
+                       atom::util::CopyablePromise(promise))));
   return handle;
 }
 
 v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
-  electron::util::Promise promise(isolate);
+  atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   // Note: This method always succeeds.
   TracingController::GetInstance()->GetCategories(base::BindOnce(
-      electron::util::Promise::ResolvePromise<const std::set<std::string>&>,
+      atom::util::Promise::ResolvePromise<const std::set<std::string>&>,
       std::move(promise)));
 
   return handle;
@@ -112,23 +100,17 @@ v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
 v8::Local<v8::Promise> StartTracing(
     v8::Isolate* isolate,
     const base::trace_event::TraceConfig& trace_config) {
-  electron::util::Promise promise(isolate);
+  atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  if (!TracingController::GetInstance()->StartTracing(
-          trace_config,
-          base::BindOnce(electron::util::Promise::ResolveEmptyPromise,
-                         std::move(promise)))) {
-    // If StartTracing returns false, that means it didn't invoke its callback.
-    // Return an already-resolved promise and abandon the previous promise (it
-    // was std::move()d into the StartTracing callback and has been deleted by
-    // this point).
-    return electron::util::Promise::ResolvedPromise(isolate);
-  }
+  // Note: This method always succeeds.
+  TracingController::GetInstance()->StartTracing(
+      trace_config, base::BindOnce(atom::util::Promise::ResolveEmptyPromise,
+                                   std::move(promise)));
   return handle;
 }
 
-void OnTraceBufferUsageAvailable(electron::util::Promise promise,
+void OnTraceBufferUsageAvailable(atom::util::Promise promise,
                                  float percent_full,
                                  size_t approximate_count) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(promise.isolate());
@@ -139,7 +121,7 @@ void OnTraceBufferUsageAvailable(electron::util::Promise promise,
 }
 
 v8::Local<v8::Promise> GetTraceBufferUsage(v8::Isolate* isolate) {
-  electron::util::Promise promise(isolate);
+  atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   // Note: This method always succeeds.

atom/browser/api/atom_api_cookies.cc

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

atom/browser/api/atom_api_cookies.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_COOKIES_H_
-#define SHELL_BROWSER_API_ATOM_API_COOKIES_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_COOKIES_H_
+#define ATOM_BROWSER_API_ATOM_API_COOKIES_H_
 
 #include <memory>
 #include <string>
 
+#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/net/cookie_details.h"
+#include "atom/common/promise_util.h"
 #include "base/callback_list.h"
-#include "gin/handle.h"
+#include "native_mate/handle.h"
 #include "net/cookies/canonical_cookie.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/net/cookie_details.h"
-#include "shell/common/promise_util.h"
 
 namespace base {
 class DictionaryValue;
@@ -23,7 +23,7 @@ namespace net {
 class URLRequestContextGetter;
 }
 
-namespace electron {
+namespace atom {
 
 class AtomBrowserContext;
 
@@ -31,8 +31,13 @@ namespace api {
 
 class Cookies : public mate::TrackableObject<Cookies> {
  public:
-  static gin::Handle<Cookies> Create(v8::Isolate* isolate,
-                                     AtomBrowserContext* browser_context);
+  enum Error {
+    SUCCESS,
+    FAILED,
+  };
+
+  static mate::Handle<Cookies> Create(v8::Isolate* isolate,
+                                      AtomBrowserContext* browser_context);
 
   // mate::TrackableObject:
   static void BuildPrototype(v8::Isolate* isolate,
@@ -60,6 +65,6 @@ class Cookies : public mate::TrackableObject<Cookies> {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_COOKIES_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_COOKIES_H_

atom/browser/api/atom_api_debugger.cc

@@ -2,24 +2,24 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_debugger.h"
+#include "atom/browser/api/atom_api_debugger.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/web_contents.h"
 #include "native_mate/dictionary.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
 
 using content::DevToolsAgentHost;
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -65,7 +65,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
     if (it == pending_requests_.end())
       return;
 
-    electron::util::Promise promise = std::move(it->second);
+    atom::util::Promise promise = std::move(it->second);
     pending_requests_.erase(it);
 
     base::DictionaryValue* error = nullptr;
@@ -129,7 +129,7 @@ void Debugger::Detach() {
 }
 
 v8::Local<v8::Promise> Debugger::SendCommand(mate::Arguments* args) {
-  electron::util::Promise promise(isolate());
+  atom::util::Promise promise(isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   if (!agent_host_) {
@@ -186,11 +186,11 @@ void Debugger::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::Debugger;
+using atom::api::Debugger;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

atom/browser/api/atom_api_debugger.h

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_DEBUGGER_H_
-#define SHELL_BROWSER_API_ATOM_API_DEBUGGER_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
+#define ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
 
 #include <map>
 #include <string>
 
+#include "atom/browser/api/trackable_object.h"
+#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/values.h"
 #include "content/public/browser/devtools_agent_host_client.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/common/promise_util.h"
 
 namespace content {
 class DevToolsAgentHost;
@@ -25,7 +25,7 @@ namespace mate {
 class Arguments;
 }
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -54,7 +54,7 @@ class Debugger : public mate::TrackableObject<Debugger>,
                               content::RenderFrameHost* new_rfh) override;
 
  private:
-  using PendingRequestMap = std::map<int, electron::util::Promise>;
+  using PendingRequestMap = std::map<int, atom::util::Promise>;
 
   void Attach(mate::Arguments* args);
   bool IsAttached();
@@ -73,6 +73,6 @@ class Debugger : public mate::TrackableObject<Debugger>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_DEBUGGER_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_

atom/browser/api/atom_api_desktop_capturer.cc

@@ -2,12 +2,15 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_desktop_capturer.h"
+#include "atom/browser/api/atom_api_desktop_capturer.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
+#include "atom/common/api/atom_api_native_image.h"
+#include "atom/common/native_mate_converters/gfx_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ -15,9 +18,6 @@
 #include "chrome/browser/media/webrtc/window_icon_util.h"
 #include "content/public/browser/desktop_capture.h"
 #include "native_mate/dictionary.h"
-#include "shell/common/api/atom_api_native_image.h"
-#include "shell/common/native_mate_converters/gfx_converter.h"
-#include "shell/common/node_includes.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
@@ -30,22 +30,22 @@
 namespace mate {
 
 template <>
-struct Converter<electron::api::DesktopCapturer::Source> {
+struct Converter<atom::api::DesktopCapturer::Source> {
   static v8::Local<v8::Value> ToV8(
       v8::Isolate* isolate,
-      const electron::api::DesktopCapturer::Source& source) {
+      const atom::api::DesktopCapturer::Source& source) {
     mate::Dictionary dict(isolate, v8::Object::New(isolate));
     content::DesktopMediaID id = source.media_list_source.id;
     dict.Set("name", base::UTF16ToUTF8(source.media_list_source.name));
     dict.Set("id", id.ToString());
     dict.Set("thumbnail",
-             electron::api::NativeImage::Create(
+             atom::api::NativeImage::Create(
                  isolate, gfx::Image(source.media_list_source.thumbnail)));
     dict.Set("display_id", source.display_id);
     if (source.fetch_icon) {
       dict.Set(
           "appIcon",
-          electron::api::NativeImage::Create(
+          atom::api::NativeImage::Create(
               isolate, gfx::Image(GetWindowIcon(source.media_list_source.id))));
     }
     return ConvertToV8(isolate, dict);
@@ -54,7 +54,7 @@ struct Converter<electron::api::DesktopCapturer::Source> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -216,7 +216,7 @@ void DesktopCapturer::BuildPrototype(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
@@ -226,8 +226,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.SetMethod("createDesktopCapturer",
-                 &electron::api::DesktopCapturer::Create);
+  dict.SetMethod("createDesktopCapturer", &atom::api::DesktopCapturer::Create);
 }
 
 }  // namespace

atom/browser/api/atom_api_desktop_capturer.h

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
-#define SHELL_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
+#define ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/trackable_object.h"
 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -73,6 +73,6 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_

atom/browser/api/atom_api_dialog.cc

@@ -0,0 +1,132 @@
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "atom/browser/api/atom_api_browser_window.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/ui/certificate_trust.h"
+#include "atom/browser/ui/file_dialog.h"
+#include "atom/browser/ui/message_box.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/file_dialog_converter.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/native_mate_converters/image_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
+#include "atom/common/node_includes.h"
+#include "atom/common/promise_util.h"
+#include "native_mate/dictionary.h"
+
+namespace {
+
+int ShowMessageBoxSync(int type,
+                       const std::vector<std::string>& buttons,
+                       int default_id,
+                       int cancel_id,
+                       int options,
+                       const std::string& title,
+                       const std::string& message,
+                       const std::string& detail,
+                       const std::string& checkbox_label,
+                       bool checkbox_checked,
+                       const gfx::ImageSkia& icon,
+                       atom::NativeWindow* window) {
+  return atom::ShowMessageBoxSync(
+      window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
+      cancel_id, options, title, message, detail, icon);
+}
+
+void ResolvePromiseObject(atom::util::Promise promise,
+                          int result,
+                          bool checkbox_checked) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(promise.isolate());
+
+  dict.Set("response", result);
+  dict.Set("checkboxChecked", checkbox_checked);
+
+  promise.Resolve(dict.GetHandle());
+}
+
+v8::Local<v8::Promise> ShowMessageBox(int type,
+                                      const std::vector<std::string>& buttons,
+                                      int default_id,
+                                      int cancel_id,
+                                      int options,
+                                      const std::string& title,
+                                      const std::string& message,
+                                      const std::string& detail,
+                                      const std::string& checkbox_label,
+                                      bool checkbox_checked,
+                                      const gfx::ImageSkia& icon,
+                                      atom::NativeWindow* window,
+                                      mate::Arguments* args) {
+  v8::Isolate* isolate = args->isolate();
+  atom::util::Promise promise(isolate);
+  v8::Local<v8::Promise> handle = promise.GetHandle();
+
+  atom::ShowMessageBox(
+      window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
+      cancel_id, options, title, message, detail, checkbox_label,
+      checkbox_checked, icon,
+      base::BindOnce(&ResolvePromiseObject, std::move(promise)));
+
+  return handle;
+}
+
+void ShowOpenDialogSync(const file_dialog::DialogSettings& settings,
+                        mate::Arguments* args) {
+  std::vector<base::FilePath> paths;
+  if (file_dialog::ShowOpenDialogSync(settings, &paths))
+    args->Return(paths);
+}
+
+v8::Local<v8::Promise> ShowOpenDialog(
+    const file_dialog::DialogSettings& settings,
+    mate::Arguments* args) {
+  atom::util::Promise promise(args->isolate());
+  v8::Local<v8::Promise> handle = promise.GetHandle();
+  file_dialog::ShowOpenDialog(settings, std::move(promise));
+  return handle;
+}
+
+void ShowSaveDialogSync(const file_dialog::DialogSettings& settings,
+                        mate::Arguments* args) {
+  base::FilePath path;
+  if (file_dialog::ShowSaveDialogSync(settings, &path))
+    args->Return(path);
+}
+
+v8::Local<v8::Promise> ShowSaveDialog(
+    const file_dialog::DialogSettings& settings,
+    mate::Arguments* args) {
+  atom::util::Promise promise(args->isolate());
+  v8::Local<v8::Promise> handle = promise.GetHandle();
+
+  file_dialog::ShowSaveDialog(settings, std::move(promise));
+  return handle;
+}
+
+void Initialize(v8::Local<v8::Object> exports,
+                v8::Local<v8::Value> unused,
+                v8::Local<v8::Context> context,
+                void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("showMessageBoxSync", &ShowMessageBoxSync);
+  dict.SetMethod("showMessageBox", &ShowMessageBox);
+  dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
+  dict.SetMethod("showOpenDialogSync", &ShowOpenDialogSync);
+  dict.SetMethod("showOpenDialog", &ShowOpenDialog);
+  dict.SetMethod("showSaveDialogSync", &ShowSaveDialogSync);
+  dict.SetMethod("showSaveDialog", &ShowSaveDialog);
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  dict.SetMethod("showCertificateTrustDialog",
+                 &certificate_trust::ShowCertificateTrust);
+#endif
+}
+
+}  // namespace
+
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_dialog, Initialize)

atom/browser/api/atom_api_download_item.cc

@@ -2,20 +2,20 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_download_item.h"
+#include "atom/browser/api/atom_api_download_item.h"
 
 #include <map>
 
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/file_dialog_converter.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/native_mate_converters/gurl_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "native_mate/dictionary.h"
 #include "net/base/filename_util.h"
-#include "shell/browser/atom_browser_main_parts.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/file_dialog_converter.h"
-#include "shell/common/native_mate_converters/file_path_converter.h"
-#include "shell/common/native_mate_converters/gurl_converter.h"
-#include "shell/common/node_includes.h"
 
 namespace mate {
 
@@ -47,7 +47,7 @@ struct Converter<download::DownloadItem::DownloadState> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -209,8 +209,6 @@ void DownloadItem::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("isDone", &DownloadItem::IsDone)
       .SetMethod("setSavePath", &DownloadItem::SetSavePath)
       .SetMethod("getSavePath", &DownloadItem::GetSavePath)
-      .SetProperty("savePath", &DownloadItem::GetSavePath,
-                   &DownloadItem::SetSavePath)
       .SetMethod("setSaveDialogOptions", &DownloadItem::SetSaveDialogOptions)
       .SetMethod("getSaveDialogOptions", &DownloadItem::GetSaveDialogOptions)
       .SetMethod("getLastModifiedTime", &DownloadItem::GetLastModifiedTime)
@@ -235,7 +233,7 @@ mate::Handle<DownloadItem> DownloadItem::Create(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
@@ -245,7 +243,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary(isolate, exports)
-      .Set("DownloadItem", electron::api::DownloadItem::GetConstructor(isolate)
+      .Set("DownloadItem", atom::api::DownloadItem::GetConstructor(isolate)
                                ->GetFunction(context)
                                .ToLocalChecked());
 }

atom/browser/api/atom_api_download_item.h

@@ -2,20 +2,20 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
-#define SHELL_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
+#define ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
 
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/ui/file_dialog.h"
 #include "base/files/file_path.h"
 #include "components/download/public/common/download_item.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/ui/file_dialog.h"
 #include "url/gurl.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -69,6 +69,6 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_

atom/browser/api/atom_api_event.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
+#include "atom/browser/api/event_emitter.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/api/event_emitter.h"
-#include "shell/common/node_includes.h"
 
 namespace {
 

atom/browser/api/atom_api_global_shortcut.cc

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_global_shortcut.h"
+#include "atom/browser/api/atom_api_global_shortcut.h"
 
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/atom_api_system_preferences.h"
+#include "atom/common/native_mate_converters/accelerator_converter.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/node_includes.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/api/atom_api_system_preferences.h"
-#include "shell/common/native_mate_converters/accelerator_converter.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/node_includes.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
@@ -33,7 +33,7 @@ bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
     if (std::find(std::begin(mediaKeys), std::end(mediaKeys),
                   accelerator.key_code()) != std::end(mediaKeys)) {
       bool trusted =
-          electron::api::SystemPreferences::IsTrustedAccessibilityClient(false);
+          atom::api::SystemPreferences::IsTrustedAccessibilityClient(false);
       if (!trusted)
         return true;
     }
@@ -44,7 +44,7 @@ bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
 
 }  // namespace
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -150,7 +150,7 @@ void GlobalShortcut::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
@@ -160,7 +160,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("globalShortcut", electron::api::GlobalShortcut::Create(isolate));
+  dict.Set("globalShortcut", atom::api::GlobalShortcut::Create(isolate));
 }
 
 }  // namespace

atom/browser/api/atom_api_global_shortcut.h

@@ -2,20 +2,20 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
-#define SHELL_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+#define ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/trackable_object.h"
 #include "base/callback.h"
 #include "chrome/browser/extensions/global_shortcut_listener.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
 #include "ui/base/accelerators/accelerator.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -53,6 +53,6 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_

atom/browser/api/atom_api_in_app_purchase.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_in_app_purchase.h"
+#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 "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/node_includes.h"
 
 namespace mate {
 
@@ -69,7 +69,7 @@ struct Converter<in_app_purchase::Product> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -104,7 +104,7 @@ v8::Local<v8::Promise> InAppPurchase::PurchaseProduct(
     const std::string& product_id,
     mate::Arguments* args) {
   v8::Isolate* isolate = args->isolate();
-  electron::util::Promise promise(isolate);
+  atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   int quantity = 1;
@@ -112,7 +112,7 @@ v8::Local<v8::Promise> InAppPurchase::PurchaseProduct(
 
   in_app_purchase::PurchaseProduct(
       product_id, quantity,
-      base::BindOnce(electron::util::Promise::ResolvePromise<bool>,
+      base::BindOnce(atom::util::Promise::ResolvePromise<bool>,
                      std::move(promise)));
 
   return handle;
@@ -122,11 +122,11 @@ v8::Local<v8::Promise> InAppPurchase::GetProducts(
     const std::vector<std::string>& productIDs,
     mate::Arguments* args) {
   v8::Isolate* isolate = args->isolate();
-  electron::util::Promise promise(isolate);
+  atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   in_app_purchase::GetProducts(
-      productIDs, base::BindOnce(electron::util::Promise::ResolvePromise<
+      productIDs, base::BindOnce(atom::util::Promise::ResolvePromise<
                                      std::vector<in_app_purchase::Product>>,
                                  std::move(promise)));
 
@@ -141,11 +141,11 @@ void InAppPurchase::OnTransactionsUpdated(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::InAppPurchase;
+using atom::api::InAppPurchase;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

atom/browser/api/atom_api_in_app_purchase.h

@@ -2,20 +2,20 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
-#define SHELL_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
+#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 "atom/browser/mac/in_app_purchase_product.h"
+#include "atom/common/promise_util.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/event_emitter.h"
-#include "shell/browser/mac/in_app_purchase.h"
-#include "shell/browser/mac/in_app_purchase_observer.h"
-#include "shell/browser/mac/in_app_purchase_product.h"
-#include "shell/common/promise_util.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -47,6 +47,6 @@ class InAppPurchase : public mate::EventEmitter<InAppPurchase>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_

atom/browser/api/atom_api_menu.cc

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_menu.h"
+#include "atom/browser/api/atom_api_menu.h"
 
+#include "atom/browser/native_window.h"
+#include "atom/common/native_mate_converters/accelerator_converter.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/image_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "shell/browser/native_window.h"
-#include "shell/common/native_mate_converters/accelerator_converter.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/image_converter.h"
-#include "shell/common/native_mate_converters/string16_converter.h"
-#include "shell/common/node_includes.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -230,18 +230,18 @@ void Menu::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::Menu;
+using atom::api::Menu;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  Menu::SetConstructor(isolate, base::BindRepeating(&Menu::New));
+  Menu::SetConstructor(isolate, base::Bind(&Menu::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set(

atom/browser/api/atom_api_menu.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_MENU_H_
-#define SHELL_BROWSER_API_ATOM_API_MENU_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_MENU_H_
+#define ATOM_BROWSER_API_ATOM_API_MENU_H_
 
 #include <memory>
 #include <string>
 
+#include "atom/browser/api/atom_api_top_level_window.h"
+#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/ui/atom_menu_model.h"
 #include "base/callback.h"
-#include "shell/browser/api/atom_api_top_level_window.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/ui/atom_menu_model.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -100,40 +100,39 @@ class Menu : public mate::TrackableObject<Menu>,
   bool WorksWhenHiddenAt(int index) const;
 
   // Stored delegate methods.
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)> is_checked_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)> is_enabled_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)> is_visible_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)> works_when_hidden_;
-  base::RepeatingCallback<v8::Local<v8::Value>(v8::Local<v8::Value>, int, bool)>
+  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<bool(v8::Local<v8::Value>, int)> works_when_hidden_;
+  base::Callback<v8::Local<v8::Value>(v8::Local<v8::Value>, int, bool)>
       get_accelerator_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)>
-      should_register_accelerator_;
-  base::RepeatingCallback<void(v8::Local<v8::Value>, v8::Local<v8::Value>, int)>
+  base::Callback<bool(v8::Local<v8::Value>, int)> should_register_accelerator_;
+  base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>, int)>
       execute_command_;
-  base::RepeatingCallback<void(v8::Local<v8::Value>)> menu_will_show_;
+  base::Callback<void(v8::Local<v8::Value>)> menu_will_show_;
 
   DISALLOW_COPY_AND_ASSIGN(Menu);
 };
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace mate {
 
 template <>
-struct Converter<electron::AtomMenuModel*> {
+struct Converter<atom::AtomMenuModel*> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     electron::AtomMenuModel** out) {
+                     atom::AtomMenuModel** out) {
     // null would be tranfered to NULL.
     if (val->IsNull()) {
       *out = nullptr;
       return true;
     }
 
-    electron::api::Menu* menu;
-    if (!Converter<electron::api::Menu*>::FromV8(isolate, val, &menu))
+    atom::api::Menu* menu;
+    if (!Converter<atom::api::Menu*>::FromV8(isolate, val, &menu))
       return false;
     *out = menu->model();
     return true;
@@ -142,4 +141,4 @@ struct Converter<electron::AtomMenuModel*> {
 
 }  // namespace mate
 
-#endif  // SHELL_BROWSER_API_ATOM_API_MENU_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_MENU_H_

atom/browser/api/atom_api_menu_mac.h

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_MENU_MAC_H_
-#define SHELL_BROWSER_API_ATOM_API_MENU_MAC_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
+#define ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
 
-#include "shell/browser/api/atom_api_menu.h"
+#include "atom/browser/api/atom_api_menu.h"
 
 #include <map>
 #include <string>
 
-#import "shell/browser/ui/cocoa/atom_menu_controller.h"
+#import "atom/browser/ui/cocoa/atom_menu_controller.h"
 
 using base::scoped_nsobject;
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -53,6 +53,6 @@ class MenuMac : public Menu {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_MENU_MAC_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_

atom/browser/api/atom_api_menu_mac.mm

@@ -2,11 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#import "shell/browser/api/atom_api_menu_mac.h"
-
-#include <string>
-#include <utility>
+#import "atom/browser/api/atom_api_menu_mac.h"
 
+#include "atom/browser/native_window.h"
+#include "atom/browser/unresponsive_suppressor.h"
+#include "atom/common/node_includes.h"
 #include "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
@@ -14,9 +14,6 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
-#include "shell/browser/native_window.h"
-#include "shell/browser/unresponsive_suppressor.h"
-#include "shell/common/node_includes.h"
 
 using content::BrowserThread;
 
@@ -26,7 +23,7 @@ static scoped_nsobject<NSMenu> applicationMenu_;
 
 }  // namespace
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -44,11 +41,10 @@ void MenuMac::PopupAt(TopLevelWindow* window,
   if (!native_window)
     return;
 
-  auto popup =
-      base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
-                     native_window->GetWeakPtr(), window->weak_map_id(), x, y,
-                     positioning_item, callback);
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, std::move(popup));
+  auto popup = base::Bind(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
+                          native_window->GetWeakPtr(), window->weak_map_id(), x,
+                          y, positioning_item, callback);
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, popup);
 }
 
 void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
@@ -61,11 +57,11 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
     return;
   NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();
 
-  auto close_callback = base::BindRepeating(
+  auto close_callback = base::Bind(
       &MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
-  popup_controllers_[window_id] = base::scoped_nsobject<AtomMenuController>(
-      [[AtomMenuController alloc] initWithModel:model()
-                          useDefaultAccelerator:NO]);
+  popup_controllers_[window_id] = base::scoped_nsobject<AtomMenuController>([
+      [AtomMenuController alloc] initWithModel:model()
+                         useDefaultAccelerator:NO]);
   NSMenu* menu = [popup_controllers_[window_id] menu];
   NSView* view = [nswindow contentView];
 
@@ -112,7 +108,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
   base::mac::ScopedSendingEvent sendingEventScoper;
 
   // Don't emit unresponsive event when showing menu.
-  electron::UnresponsiveSuppressor suppressor;
+  atom::UnresponsiveSuppressor suppressor;
   [menu popUpMenuPositioningItem:item atLocation:position inView:view];
 }
 
@@ -139,9 +135,9 @@ void MenuMac::OnClosed(int32_t window_id, base::Closure callback) {
 // static
 void Menu::SetApplicationMenu(Menu* base_menu) {
   MenuMac* menu = static_cast<MenuMac*>(base_menu);
-  base::scoped_nsobject<AtomMenuController> menu_controller(
-      [[AtomMenuController alloc] initWithModel:menu->model_.get()
-                          useDefaultAccelerator:YES]);
+  base::scoped_nsobject<AtomMenuController> menu_controller([
+      [AtomMenuController alloc] initWithModel:menu->model_.get()
+                         useDefaultAccelerator:YES]);
 
   NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
   [currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
@@ -172,4 +168,4 @@ mate::WrappableBase* Menu::New(mate::Arguments* args) {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_menu_views.cc

@@ -2,17 +2,17 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_menu_views.h"
+#include "atom/browser/api/atom_api_menu_views.h"
 
 #include <memory>
 
-#include "shell/browser/native_window_views.h"
-#include "shell/browser/unresponsive_suppressor.h"
+#include "atom/browser/native_window_views.h"
+#include "atom/browser/unresponsive_suppressor.h"
 #include "ui/display/screen.h"
 
 using views::MenuRunner;
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -42,11 +42,11 @@ void MenuViews::PopupAt(TopLevelWindow* window,
   int flags = MenuRunner::CONTEXT_MENU | MenuRunner::HAS_MNEMONICS;
 
   // Don't emit unresponsive event when showing menu.
-  electron::UnresponsiveSuppressor suppressor;
+  atom::UnresponsiveSuppressor suppressor;
 
   // Show the menu.
   int32_t window_id = window->weak_map_id();
-  auto close_callback = base::BindRepeating(
+  auto close_callback = base::Bind(
       &MenuViews::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
   menu_runners_[window_id] =
       std::make_unique<MenuRunner>(model(), flags, close_callback);
@@ -81,4 +81,4 @@ mate::WrappableBase* Menu::New(mate::Arguments* args) {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_menu_views.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_MENU_VIEWS_H_
-#define SHELL_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+#define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
 
 #include <map>
 #include <memory>
 
+#include "atom/browser/api/atom_api_menu.h"
 #include "base/memory/weak_ptr.h"
-#include "shell/browser/api/atom_api_menu.h"
 #include "ui/display/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -43,6 +43,6 @@ class MenuViews : public Menu {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_

atom/browser/api/atom_api_net.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_net.h"
+#include "atom/browser/api/atom_api_net.h"
+#include "atom/browser/api/atom_api_url_request.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/api/atom_api_url_request.h"
-#include "shell/common/node_includes.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -38,12 +38,12 @@ v8::Local<v8::Value> Net::URLRequest(v8::Isolate* isolate) {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::Net;
-using electron::api::URLRequest;
+using atom::api::Net;
+using atom::api::URLRequest;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
@@ -51,7 +51,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
 
-  URLRequest::SetConstructor(isolate, base::BindRepeating(URLRequest::New));
+  URLRequest::SetConstructor(isolate, base::Bind(URLRequest::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set("net", Net::Create(isolate));

atom/browser/api/atom_api_net.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_NET_H_
-#define SHELL_BROWSER_API_ATOM_API_NET_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_NET_H_
+#define ATOM_BROWSER_API_ATOM_API_NET_H_
 
-#include "shell/browser/api/event_emitter.h"
+#include "atom/browser/api/event_emitter.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -30,6 +30,6 @@ class Net : public mate::EventEmitter<Net> {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_NET_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_NET_H_

atom/browser/api/atom_api_net_log.cc

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

atom/browser/api/atom_api_net_log.h

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

atom/browser/api/atom_api_notification.cc

@@ -2,28 +2,28 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_notification.h"
+#include "atom/browser/api/atom_api_notification.h"
 
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/atom_browser_client.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 "atom/common/node_includes.h"
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "shell/browser/api/atom_api_menu.h"
-#include "shell/browser/atom_browser_client.h"
-#include "shell/browser/browser.h"
-#include "shell/common/native_mate_converters/gfx_converter.h"
-#include "shell/common/native_mate_converters/image_converter.h"
-#include "shell/common/native_mate_converters/string16_converter.h"
-#include "shell/common/node_includes.h"
 #include "url/gurl.h"
 
 namespace mate {
 template <>
-struct Converter<electron::NotificationAction> {
+struct Converter<atom::NotificationAction> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     electron::NotificationAction* out) {
+                     atom::NotificationAction* out) {
     mate::Dictionary dict;
     if (!ConvertFromV8(isolate, val, &dict))
       return false;
@@ -36,7 +36,7 @@ struct Converter<electron::NotificationAction> {
   }
 
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   electron::NotificationAction val) {
+                                   atom::NotificationAction val) {
     mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
     dict.Set("text", val.text);
     dict.Set("type", val.type);
@@ -45,7 +45,7 @@ struct Converter<electron::NotificationAction> {
 };
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -118,7 +118,7 @@ base::string16 Notification::GetSound() const {
   return sound_;
 }
 
-std::vector<electron::NotificationAction> Notification::GetActions() const {
+std::vector<atom::NotificationAction> Notification::GetActions() const {
   return actions_;
 }
 
@@ -156,7 +156,7 @@ void Notification::SetSound(const base::string16& new_sound) {
 }
 
 void Notification::SetActions(
-    const std::vector<electron::NotificationAction>& actions) {
+    const std::vector<atom::NotificationAction>& actions) {
   actions_ = actions;
 }
 
@@ -199,7 +199,7 @@ void Notification::Show() {
   if (presenter_) {
     notification_ = presenter_->CreateNotification(this, base::GenerateGUID());
     if (notification_) {
-      electron::NotificationOptions options;
+      atom::NotificationOptions options;
       options.title = title_;
       options.subtitle = subtitle_;
       options.msg = body_;
@@ -247,19 +247,18 @@ void Notification::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::Notification;
+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::BindRepeating(&Notification::New));
+  Notification::SetConstructor(isolate, base::Bind(&Notification::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set("Notification", Notification::GetConstructor(isolate)

atom/browser/api/atom_api_notification.h

@@ -2,22 +2,22 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_NOTIFICATION_H_
-#define SHELL_BROWSER_API_ATOM_API_NOTIFICATION_H_
+#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 "atom/browser/notifications/notification.h"
+#include "atom/browser/notifications/notification_delegate.h"
+#include "atom/browser/notifications/notification_presenter.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/notifications/notification.h"
-#include "shell/browser/notifications/notification_delegate.h"
-#include "shell/browser/notifications/notification_presenter.h"
 #include "ui/gfx/image/image.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -55,7 +55,7 @@ class Notification : public mate::TrackableObject<Notification>,
   bool GetHasReply() const;
   base::string16 GetReplyPlaceholder() const;
   base::string16 GetSound() const;
-  std::vector<electron::NotificationAction> GetActions() const;
+  std::vector<atom::NotificationAction> GetActions() const;
   base::string16 GetCloseButtonText() const;
 
   // Prop Setters
@@ -66,7 +66,7 @@ class Notification : public mate::TrackableObject<Notification>,
   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<electron::NotificationAction>& actions);
+  void SetActions(const std::vector<atom::NotificationAction>& actions);
   void SetCloseButtonText(const base::string16& text);
 
  private:
@@ -80,18 +80,18 @@ class Notification : public mate::TrackableObject<Notification>,
   bool has_reply_ = false;
   base::string16 reply_placeholder_;
   base::string16 sound_;
-  std::vector<electron::NotificationAction> actions_;
+  std::vector<atom::NotificationAction> actions_;
   base::string16 close_button_text_;
 
-  electron::NotificationPresenter* presenter_;
+  atom::NotificationPresenter* presenter_;
 
-  base::WeakPtr<electron::Notification> notification_;
+  base::WeakPtr<atom::Notification> notification_;
 
   DISALLOW_COPY_AND_ASSIGN(Notification);
 };
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_NOTIFICATION_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_NOTIFICATION_H_

atom/browser/api/atom_api_power_monitor.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_power_monitor.h"
+#include "atom/browser/api/atom_api_power_monitor.h"
 
+#include "atom/browser/browser.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/node_includes.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/browser.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/node_includes.h"
 
 namespace mate {
 template <>
@@ -31,17 +31,17 @@ struct Converter<ui::IdleState> {
 };
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
 PowerMonitor::PowerMonitor(v8::Isolate* isolate) {
 #if defined(OS_LINUX)
-  SetShutdownHandler(base::BindRepeating(&PowerMonitor::ShouldShutdown,
-                                         base::Unretained(this)));
+  SetShutdownHandler(
+      base::Bind(&PowerMonitor::ShouldShutdown, base::Unretained(this)));
 #elif defined(OS_MACOSX)
-  Browser::Get()->SetShutdownHandler(base::BindRepeating(
-      &PowerMonitor::ShouldShutdown, base::Unretained(this)));
+  Browser::Get()->SetShutdownHandler(
+      base::Bind(&PowerMonitor::ShouldShutdown, base::Unretained(this)));
 #endif
   base::PowerMonitor::Get()->AddObserver(this);
   Init(isolate);
@@ -101,10 +101,9 @@ int PowerMonitor::GetSystemIdleTime() {
 // static
 v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
   if (!Browser::Get()->is_ready()) {
-    isolate->ThrowException(v8::Exception::Error(
-        mate::StringToV8(isolate,
-                         "The 'powerMonitor' module can't be used before the "
-                         "app 'ready' event")));
+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
+        isolate,
+        "Cannot require \"powerMonitor\" module before app is ready")));
     return v8::Null(isolate);
   }
 
@@ -128,11 +127,11 @@ void PowerMonitor::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::PowerMonitor;
+using atom::api::PowerMonitor;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
@@ -140,8 +139,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("createPowerMonitor",
-           base::BindRepeating(&PowerMonitor::Create, isolate));
+  dict.Set("powerMonitor", PowerMonitor::Create(isolate));
   dict.Set("PowerMonitor", PowerMonitor::GetConstructor(isolate)
                                ->GetFunction(context)
                                .ToLocalChecked());

atom/browser/api/atom_api_power_monitor.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_POWER_MONITOR_H_
-#define SHELL_BROWSER_API_ATOM_API_POWER_MONITOR_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
+#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 "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/lib/power_observer.h"
 #include "ui/base/idle/idle.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -76,6 +76,6 @@ class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_POWER_MONITOR_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_

atom/browser/api/atom_api_power_monitor_mac.mm

@@ -2,19 +2,17 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_power_monitor.h"
+#include "atom/browser/api/atom_api_power_monitor.h"
 
-#include <vector>
-
-#import <ApplicationServices/ApplicationServices.h>
+#include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 @interface MacLockMonitor : NSObject {
  @private
-  std::vector<electron::api::PowerMonitor*> emitters;
+  std::vector<atom::api::PowerMonitor*> emitters;
 }
 
-- (void)addEmitter:(electron::api::PowerMonitor*)monitor_;
+- (void)addEmitter:(atom::api::PowerMonitor*)monitor_;
 
 @end
 
@@ -41,7 +39,7 @@
   [super dealloc];
 }
 
-- (void)addEmitter:(electron::api::PowerMonitor*)monitor_ {
+- (void)addEmitter:(atom::api::PowerMonitor*)monitor_ {
   self->emitters.push_back(monitor_);
 }
 
@@ -59,7 +57,7 @@
 
 @end
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -73,4 +71,4 @@ void PowerMonitor::InitPlatformSpecificMonitors() {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_power_monitor_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_power_monitor.h"
+#include "atom/browser/api/atom_api_power_monitor.h"
 
 #include <windows.h>
 #include <wtsapi32.h>
@@ -11,7 +11,7 @@
 #include "ui/base/win/shell.h"
 #include "ui/gfx/win/hwnd_util.h"
 
-namespace electron {
+namespace atom {
 
 namespace {
 
@@ -69,4 +69,4 @@ LRESULT CALLBACK PowerMonitor::WndProc(HWND hwnd,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_power_save_blocker.cc

@@ -2,22 +2,20 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_power_save_blocker.h"
+#include "atom/browser/api/atom_api_power_save_blocker.h"
 
 #include <string>
 
-#include "base/bind_helpers.h"
+#include "atom/common/node_includes.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/common/service_manager_connection.h"
-#include "gin/dictionary.h"
-#include "gin/function_template.h"
+#include "native_mate/dictionary.h"
 #include "services/device/public/mojom/constants.mojom.h"
 #include "services/device/public/mojom/wake_lock_provider.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "shell/common/node_includes.h"
 
-namespace gin {
+namespace mate {
 
 template <>
 struct Converter<device::mojom::WakeLockType> {
@@ -37,17 +35,17 @@ struct Converter<device::mojom::WakeLockType> {
   }
 };
 
-}  // namespace gin
+}  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
-gin::WrapperInfo PowerSaveBlocker::kWrapperInfo = {gin::kEmbedderNativeGin};
-
 PowerSaveBlocker::PowerSaveBlocker(v8::Isolate* isolate)
     : current_lock_type_(device::mojom::WakeLockType::kPreventAppSuspension),
-      is_wake_lock_active_(false) {}
+      is_wake_lock_active_(false) {
+  Init(isolate);
+}
 
 PowerSaveBlocker::~PowerSaveBlocker() {}
 
@@ -96,7 +94,7 @@ device::mojom::WakeLock* PowerSaveBlocker::GetWakeLock() {
 
     wake_lock_provider->GetWakeLockWithoutContext(
         device::mojom::WakeLockType::kPreventAppSuspension,
-        device::mojom::WakeLockReason::kOther, ELECTRON_PRODUCT_NAME,
+        device::mojom::WakeLockReason::kOther, ATOM_PRODUCT_NAME,
         mojo::MakeRequest(&wake_lock_));
   }
   return wake_lock_.get();
@@ -120,13 +118,16 @@ bool PowerSaveBlocker::IsStarted(int id) {
 }
 
 // static
-gin::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
-  return gin::CreateHandle(isolate, new PowerSaveBlocker(isolate));
+mate::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
+  return mate::CreateHandle(isolate, new PowerSaveBlocker(isolate));
 }
 
-gin::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder(
-    v8::Isolate* isolate) {
-  return gin::Wrappable<PowerSaveBlocker>::GetObjectTemplateBuilder(isolate)
+// static
+void PowerSaveBlocker::BuildPrototype(
+    v8::Isolate* isolate,
+    v8::Local<v8::FunctionTemplate> prototype) {
+  prototype->SetClassName(mate::StringToV8(isolate, "PowerSaveBlocker"));
+  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
       .SetMethod("start", &PowerSaveBlocker::Start)
       .SetMethod("stop", &PowerSaveBlocker::Stop)
       .SetMethod("isStarted", &PowerSaveBlocker::IsStarted);
@@ -134,7 +135,7 @@ gin::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
@@ -143,9 +144,8 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  gin::Dictionary dict(isolate, exports);
-  dict.Set("powerSaveBlocker",
-           electron::api::PowerSaveBlocker::Create(isolate));
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("powerSaveBlocker", atom::api::PowerSaveBlocker::Create(isolate));
 }
 
 }  // namespace

atom/browser/api/atom_api_power_save_blocker.h

@@ -2,30 +2,30 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
-#define SHELL_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
+#define ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
 
 #include <map>
 #include <memory>
 
-#include "gin/handle.h"
-#include "gin/object_template_builder.h"
-#include "gin/wrappable.h"
+#include "atom/browser/api/trackable_object.h"
+#include "native_mate/handle.h"
 #include "services/device/public/mojom/wake_lock.mojom.h"
 
-namespace electron {
+namespace mate {
+class Dictionary;
+}
+
+namespace atom {
 
 namespace api {
 
-class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
+class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
  public:
-  static gin::Handle<PowerSaveBlocker> Create(v8::Isolate* isolate);
+  static mate::Handle<PowerSaveBlocker> Create(v8::Isolate* isolate);
 
-  // gin::Wrappable
-  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) override;
-
-  static gin::WrapperInfo kWrapperInfo;
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Local<v8::FunctionTemplate> prototype);
 
  protected:
   explicit PowerSaveBlocker(v8::Isolate* isolate);
@@ -56,6 +56,6 @@ class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_

atom/browser/api/atom_api_protocol.cc

@@ -2,24 +2,24 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_protocol.h"
+#include "atom/browser/api/atom_api_protocol.h"
 
+#include "atom/browser/atom_browser_client.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/browser.h"
+#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"
+#include "atom/common/node_includes.h"
+#include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/atom_browser_client.h"
-#include "shell/browser/atom_browser_main_parts.h"
-#include "shell/browser/browser.h"
-#include "shell/browser/net/url_request_async_asar_job.h"
-#include "shell/browser/net/url_request_buffer_job.h"
-#include "shell/browser/net/url_request_fetch_job.h"
-#include "shell/browser/net/url_request_stream_job.h"
-#include "shell/browser/net/url_request_string_job.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/options_switches.h"
 #include "url/url_util.h"
 
 using content::BrowserThread;
@@ -74,7 +74,7 @@ struct Converter<CustomScheme> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -129,15 +129,14 @@ void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
         switch_name, base::JoinString(schemes, ","));
   };
 
-  AppendSchemesToCmdLine(electron::switches::kSecureSchemes, secure_schemes);
-  AppendSchemesToCmdLine(electron::switches::kBypassCSPSchemes,
+  AppendSchemesToCmdLine(atom::switches::kSecureSchemes, secure_schemes);
+  AppendSchemesToCmdLine(atom::switches::kBypassCSPSchemes,
                          cspbypassing_schemes);
-  AppendSchemesToCmdLine(electron::switches::kCORSSchemes, cors_schemes);
-  AppendSchemesToCmdLine(electron::switches::kFetchSchemes, fetch_schemes);
-  AppendSchemesToCmdLine(electron::switches::kServiceWorkerSchemes,
+  AppendSchemesToCmdLine(atom::switches::kCORSSchemes, cors_schemes);
+  AppendSchemesToCmdLine(atom::switches::kFetchSchemes, fetch_schemes);
+  AppendSchemesToCmdLine(atom::switches::kServiceWorkerSchemes,
                          service_worker_schemes);
-  AppendSchemesToCmdLine(electron::switches::kStandardSchemes,
-                         g_standard_schemes);
+  AppendSchemesToCmdLine(atom::switches::kStandardSchemes, g_standard_schemes);
 }
 
 Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
@@ -165,9 +164,9 @@ Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
     const std::string& scheme) {
   auto* job_factory = request_context_getter->job_factory();
   if (!job_factory->HasProtocolHandler(scheme))
-    return ProtocolError::NOT_REGISTERED;
+    return PROTOCOL_NOT_REGISTERED;
   job_factory->SetProtocolHandler(scheme, nullptr);
-  return ProtocolError::OK;
+  return PROTOCOL_OK;
 }
 
 bool IsProtocolHandledInIO(
@@ -210,8 +209,8 @@ Protocol::ProtocolError Protocol::UninterceptProtocolInIO(
     scoped_refptr<URLRequestContextGetter> request_context_getter,
     const std::string& scheme) {
   return request_context_getter->job_factory()->UninterceptProtocol(scheme)
-             ? ProtocolError::OK
-             : ProtocolError::NOT_INTERCEPTED;
+             ? PROTOCOL_OK
+             : PROTOCOL_NOT_INTERCEPTED;
 }
 
 void Protocol::OnIOCompleted(const CompletionCallback& callback,
@@ -223,7 +222,7 @@ void Protocol::OnIOCompleted(const CompletionCallback& callback,
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
 
-  if (error == ProtocolError::OK) {
+  if (error == PROTOCOL_OK) {
     callback.Run(v8::Null(isolate()));
   } else {
     std::string str = ErrorCodeToString(error);
@@ -233,15 +232,15 @@ void Protocol::OnIOCompleted(const CompletionCallback& callback,
 
 std::string Protocol::ErrorCodeToString(ProtocolError error) {
   switch (error) {
-    case ProtocolError::FAIL:
+    case PROTOCOL_FAIL:
       return "Failed to manipulate protocol factory";
-    case ProtocolError::REGISTERED:
+    case PROTOCOL_REGISTERED:
       return "The scheme has been registered";
-    case ProtocolError::NOT_REGISTERED:
+    case PROTOCOL_NOT_REGISTERED:
       return "The scheme has not been registered";
-    case ProtocolError::INTERCEPTED:
+    case PROTOCOL_INTERCEPTED:
       return "The scheme has been intercepted";
-    case ProtocolError::NOT_INTERCEPTED:
+    case PROTOCOL_NOT_INTERCEPTED:
       return "The scheme has not been intercepted";
     default:
       return "Unexpected error";
@@ -286,20 +285,20 @@ void Protocol::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
 void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
                                  mate::Arguments* args) {
-  if (electron::Browser::Get()->is_ready()) {
+  if (atom::Browser::Get()->is_ready()) {
     args->ThrowError(
         "protocol.registerSchemesAsPrivileged should be called before "
         "app is ready");
     return;
   }
 
-  electron::api::RegisterSchemesAsPrivileged(val, args);
+  atom::api::RegisterSchemesAsPrivileged(val, args);
 }
 
 void Initialize(v8::Local<v8::Object> exports,
@@ -309,7 +308,7 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.SetMethod("registerSchemesAsPrivileged", &RegisterSchemesAsPrivileged);
-  dict.SetMethod("getStandardSchemes", &electron::api::GetStandardSchemes);
+  dict.SetMethod("getStandardSchemes", &atom::api::GetStandardSchemes);
 }
 
 }  // namespace

atom/browser/api/atom_api_protocol.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_PROTOCOL_H_
-#define SHELL_BROWSER_API_ATOM_API_PROTOCOL_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
+#define ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
 
 #include <map>
 #include <memory>
@@ -11,6 +11,10 @@
 #include <utility>
 #include <vector>
 
+#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/net/atom_url_request_job_factory.h"
+#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/post_task.h"
@@ -20,16 +24,12 @@
 #include "native_mate/dictionary.h"
 #include "native_mate/handle.h"
 #include "net/url_request/url_request_context.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/atom_browser_context.h"
-#include "shell/browser/net/atom_url_request_job_factory.h"
-#include "shell/common/promise_util.h"
 
 namespace base {
 class DictionaryValue;
 }
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -40,10 +40,9 @@ void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
 
 class Protocol : public mate::TrackableObject<Protocol> {
  public:
-  using Handler = base::RepeatingCallback<void(const base::DictionaryValue&,
-                                               v8::Local<v8::Value>)>;
-  using CompletionCallback =
-      base::RepeatingCallback<void(v8::Local<v8::Value>)>;
+  using Handler =
+      base::Callback<void(const base::DictionaryValue&, v8::Local<v8::Value>)>;
+  using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
 
   static mate::Handle<Protocol> Create(v8::Isolate* isolate,
                                        AtomBrowserContext* browser_context);
@@ -57,13 +56,13 @@ class Protocol : public mate::TrackableObject<Protocol> {
 
  private:
   // Possible errors.
-  enum class ProtocolError {
-    OK,    // no error
-    FAIL,  // operation failed, should never occur
-    REGISTERED,
-    NOT_REGISTERED,
-    INTERCEPTED,
-    NOT_INTERCEPTED,
+  enum ProtocolError {
+    PROTOCOL_OK,    // no error
+    PROTOCOL_FAIL,  // operation failed, should never occur
+    PROTOCOL_REGISTERED,
+    PROTOCOL_NOT_REGISTERED,
+    PROTOCOL_INTERCEPTED,
+    PROTOCOL_NOT_INTERCEPTED,
   };
 
   // The protocol handler that will create a protocol handler for certain
@@ -119,13 +118,13 @@ class Protocol : public mate::TrackableObject<Protocol> {
       const Handler& handler) {
     auto* job_factory = request_context_getter->job_factory();
     if (job_factory->IsHandledProtocol(scheme))
-      return ProtocolError::REGISTERED;
+      return PROTOCOL_REGISTERED;
     auto protocol_handler = std::make_unique<CustomProtocolHandler<RequestJob>>(
         isolate, request_context_getter.get(), handler);
     if (job_factory->SetProtocolHandler(scheme, std::move(protocol_handler)))
-      return ProtocolError::OK;
+      return PROTOCOL_OK;
     else
-      return ProtocolError::FAIL;
+      return PROTOCOL_FAIL;
   }
 
   // Unregister the protocol handler that handles |scheme|.
@@ -160,15 +159,15 @@ class Protocol : public mate::TrackableObject<Protocol> {
       const Handler& handler) {
     auto* job_factory = request_context_getter->job_factory();
     if (!job_factory->IsHandledProtocol(scheme))
-      return ProtocolError::NOT_REGISTERED;
+      return PROTOCOL_NOT_REGISTERED;
     // It is possible a protocol is handled but can not be intercepted.
     if (!job_factory->HasProtocolHandler(scheme))
-      return ProtocolError::FAIL;
+      return PROTOCOL_FAIL;
     auto protocol_handler = std::make_unique<CustomProtocolHandler<RequestJob>>(
         isolate, request_context_getter.get(), handler);
     if (!job_factory->InterceptProtocol(scheme, std::move(protocol_handler)))
-      return ProtocolError::INTERCEPTED;
-    return ProtocolError::OK;
+      return PROTOCOL_INTERCEPTED;
+    return PROTOCOL_OK;
   }
 
   // Restore the |scheme| to its original protocol handler.
@@ -193,6 +192,6 @@ class Protocol : public mate::TrackableObject<Protocol> {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_PROTOCOL_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_

atom/browser/api/atom_api_render_process_preferences.cc

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

atom/browser/api/atom_api_render_process_preferences.h

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

atom/browser/api/atom_api_screen.cc

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_screen.h"
+#include "atom/browser/api/atom_api_screen.h"
 
 #include <algorithm>
 #include <string>
 
+#include "atom/browser/api/atom_api_browser_window.h"
+#include "atom/browser/browser.h"
+#include "atom/common/native_mate_converters/gfx_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/bind.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "shell/browser/api/atom_api_browser_window.h"
-#include "shell/browser/browser.h"
-#include "shell/common/native_mate_converters/gfx_converter.h"
-#include "shell/common/node_includes.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
@@ -22,7 +22,7 @@
 #include "ui/display/win/screen_win.h"
 #endif
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -98,13 +98,13 @@ display::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
 
 #if defined(OS_WIN)
 
-static gfx::Rect ScreenToDIPRect(electron::NativeWindow* window,
+static gfx::Rect ScreenToDIPRect(atom::NativeWindow* window,
                                  const gfx::Rect& rect) {
   HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
   return display::win::ScreenWin::ScreenToDIPRect(hwnd, rect);
 }
 
-static gfx::Rect DIPToScreenRect(electron::NativeWindow* window,
+static gfx::Rect DIPToScreenRect(atom::NativeWindow* window,
                                  const gfx::Rect& rect) {
   HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
   return display::win::ScreenWin::DIPToScreenRect(hwnd, rect);
@@ -136,8 +136,7 @@ void Screen::OnDisplayMetricsChanged(const display::Display& display,
 v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
   if (!Browser::Get()->is_ready()) {
     isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-        isolate,
-        "The 'screen' module can't be used before the app 'ready' event")));
+        isolate, "Cannot require \"screen\" module before app is ready")));
     return v8::Null(isolate);
   }
 
@@ -171,11 +170,11 @@ void Screen::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::Screen;
+using atom::api::Screen;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
@@ -183,7 +182,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("createScreen", base::BindRepeating(&Screen::Create, isolate));
+  dict.Set("screen", Screen::Create(isolate));
   dict.Set(
       "Screen",
       Screen::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());

atom/browser/api/atom_api_screen.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_SCREEN_H_
-#define SHELL_BROWSER_API_ATOM_API_SCREEN_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_SCREEN_H_
+#define ATOM_BROWSER_API_ATOM_API_SCREEN_H_
 
 #include <vector>
 
+#include "atom/browser/api/event_emitter.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/event_emitter.h"
 #include "ui/display/display_observer.h"
 #include "ui/display/screen.h"
 
@@ -18,7 +18,7 @@ class Rect;
 class Screen;
 }  // namespace gfx
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -54,6 +54,6 @@ class Screen : public mate::EventEmitter<Screen>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_SCREEN_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_SCREEN_H_

atom/browser/api/atom_api_session.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_session.h"
+#include "atom/browser/api/atom_api_session.h"
 
 #include <map>
 #include <memory>
@@ -10,6 +10,25 @@
 #include <utility>
 #include <vector>
 
+#include "atom/browser/api/atom_api_cookies.h"
+#include "atom/browser/api/atom_api_download_item.h"
+#include "atom/browser/api/atom_api_net_log.h"
+#include "atom/browser/api/atom_api_protocol.h"
+#include "atom/browser/api/atom_api_web_request.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/atom_permission_manager.h"
+#include "atom/browser/browser.h"
+#include "atom/browser/media/media_device_id_salt.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"
+#include "atom/common/native_mate_converters/gurl_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
@@ -26,9 +45,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item_utils.h"
 #include "content/public/browser/download_manager_delegate.h"
-#include "content/public/browser/network_service_instance.h"
 #include "content/public/browser/storage_partition.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "net/base/completion_repeating_callback.h"
@@ -40,30 +57,6 @@
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "services/network/network_service.h"
-#include "services/network/public/cpp/features.h"
-#include "shell/browser/api/atom_api_cookies.h"
-#include "shell/browser/api/atom_api_download_item.h"
-#include "shell/browser/api/atom_api_net_log.h"
-#include "shell/browser/api/atom_api_protocol.h"
-#include "shell/browser/api/atom_api_protocol_ns.h"
-#include "shell/browser/api/atom_api_web_request.h"
-#include "shell/browser/atom_browser_context.h"
-#include "shell/browser/atom_browser_main_parts.h"
-#include "shell/browser/atom_permission_manager.h"
-#include "shell/browser/browser.h"
-#include "shell/browser/media/media_device_id_salt.h"
-#include "shell/browser/net/atom_cert_verifier.h"
-#include "shell/browser/net/system_network_context_manager.h"
-#include "shell/browser/session_preferences.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/content_converter.h"
-#include "shell/common/native_mate_converters/file_path_converter.h"
-#include "shell/common/native_mate_converters/gurl_converter.h"
-#include "shell/common/native_mate_converters/net_converter.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/options_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
@@ -77,6 +70,15 @@ struct ClearStorageDataOptions {
   uint32_t quota_types = StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
 };
 
+struct ClearAuthCacheOptions {
+  std::string type;
+  GURL origin;
+  std::string realm;
+  base::string16 username;
+  base::string16 password;
+  net::HttpAuth::Scheme auth_scheme;
+};
+
 uint32_t GetStorageMask(const std::vector<std::string>& storage_types) {
   uint32_t storage_mask = 0;
   for (const auto& it : storage_types) {
@@ -117,6 +119,18 @@ uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
   return quota_mask;
 }
 
+net::HttpAuth::Scheme GetAuthSchemeFromString(const std::string& scheme) {
+  if (scheme == "basic")
+    return net::HttpAuth::AUTH_SCHEME_BASIC;
+  if (scheme == "digest")
+    return net::HttpAuth::AUTH_SCHEME_DIGEST;
+  if (scheme == "ntlm")
+    return net::HttpAuth::AUTH_SCHEME_NTLM;
+  if (scheme == "negotiate")
+    return net::HttpAuth::AUTH_SCHEME_NEGOTIATE;
+  return net::HttpAuth::AUTH_SCHEME_MAX;
+}
+
 void SetUserAgentInIO(scoped_refptr<net::URLRequestContextGetter> getter,
                       const std::string& accept_lang,
                       const std::string& user_agent) {
@@ -149,9 +163,29 @@ struct Converter<ClearStorageDataOptions> {
 };
 
 template <>
-struct Converter<electron::VerifyRequestParams> {
+struct Converter<ClearAuthCacheOptions> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     ClearAuthCacheOptions* out) {
+    mate::Dictionary options;
+    if (!ConvertFromV8(isolate, val, &options))
+      return false;
+    options.Get("type", &out->type);
+    options.Get("origin", &out->origin);
+    options.Get("realm", &out->realm);
+    options.Get("username", &out->username);
+    options.Get("password", &out->password);
+    std::string scheme;
+    if (options.Get("scheme", &scheme))
+      out->auth_scheme = GetAuthSchemeFromString(scheme);
+    return true;
+  }
+};
+
+template <>
+struct Converter<atom::VerifyRequestParams> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   electron::VerifyRequestParams val) {
+                                   atom::VerifyRequestParams val) {
     mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
     dict.Set("hostname", val.hostname);
     dict.Set("certificate", val.certificate);
@@ -163,7 +197,7 @@ struct Converter<electron::VerifyRequestParams> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -182,6 +216,61 @@ void SetCertVerifyProcInIO(
       ->SetVerifyProc(proc);
 }
 
+void ClearHostResolverCacheInIO(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    util::Promise promise) {
+  auto* request_context = context_getter->GetURLRequestContext();
+  auto* cache = request_context->host_resolver()->GetHostCache();
+  if (cache) {
+    cache->clear();
+    DCHECK_EQ(0u, cache->size());
+    base::PostTaskWithTraits(
+        FROM_HERE, {BrowserThread::UI},
+        base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+  }
+}
+
+void ClearAuthCacheInIO(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    const ClearAuthCacheOptions& options,
+    util::Promise promise) {
+  auto* request_context = context_getter->GetURLRequestContext();
+  auto* network_session =
+      request_context->http_transaction_factory()->GetSession();
+  if (network_session) {
+    if (options.type == "password") {
+      auto* auth_cache = network_session->http_auth_cache();
+      if (!options.origin.is_empty()) {
+        auth_cache->Remove(
+            options.origin, options.realm, options.auth_scheme,
+            net::AuthCredentials(options.username, options.password));
+      } else {
+        auth_cache->ClearAllEntries();
+      }
+    } else if (options.type == "clientCertificate") {
+      auto* client_auth_cache = network_session->ssl_client_auth_cache();
+      client_auth_cache->Remove(net::HostPortPair::FromURL(options.origin));
+    }
+    network_session->CloseAllConnections();
+  }
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::UI},
+      base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+}
+
+void AllowNTLMCredentialsForDomainsInIO(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    const std::string& domains) {
+  auto* request_context = context_getter->GetURLRequestContext();
+  auto* auth_handler = request_context->http_auth_handler_factory();
+  if (auth_handler) {
+    auto* auth_preferences = const_cast<net::HttpAuthPreferences*>(
+        auth_handler->http_auth_preferences());
+    if (auth_preferences)
+      auth_preferences->SetServerWhitelist(domains);
+  }
+}
+
 void DownloadIdCallback(content::DownloadManager* download_manager,
                         const base::FilePath& path,
                         const std::vector<GURL>& url_chain,
@@ -273,8 +362,9 @@ v8::Local<v8::Promise> Session::ResolveProxy(mate::Arguments* args) {
   args->GetNext(&url);
 
   browser_context_->GetResolveProxyHelper()->ResolveProxy(
-      url, base::BindOnce(util::Promise::ResolvePromise<std::string>,
-                          std::move(promise)));
+      url,
+      base::Bind(util::CopyablePromise::ResolveCopyablePromise<std::string>,
+                 util::CopyablePromise(promise)));
 
   return handle;
 }
@@ -335,7 +425,8 @@ v8::Local<v8::Promise> Session::ClearStorageData(mate::Arguments* args) {
   storage_partition->ClearData(
       options.storage_types, options.quota_types, options.origin, base::Time(),
       base::Time::Max(),
-      base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+      base::Bind(util::CopyablePromise::ResolveEmptyCopyablePromise,
+                 util::CopyablePromise(promise)));
   return handle;
 }
 
@@ -417,76 +508,28 @@ void Session::DisableNetworkEmulation() {
       network_emulation_token_, network::mojom::NetworkConditions::New());
 }
 
-class ElectronCertVerifierClient : public network::mojom::CertVerifierClient {
- public:
-  using CertVerifyProc =
-      base::RepeatingCallback<void(const VerifyRequestParams& request,
-                                   base::RepeatingCallback<void(int)>)>;
-  explicit ElectronCertVerifierClient(CertVerifyProc proc)
-      : cert_verify_proc_(proc) {}
-  ~ElectronCertVerifierClient() override = default;
-
-  // network::mojom::CertVerifierClient
-  void Verify(int default_error,
-              const net::CertVerifyResult& default_result,
-              const scoped_refptr<net::X509Certificate>& certificate,
-              const std::string& hostname,
-              int flags,
-              const base::Optional<std::string>& ocsp_response,
-              VerifyCallback callback) override {
-    VerifyRequestParams params;
-    params.hostname = hostname;
-    params.default_result = net::ErrorToString(default_error);
-    params.error_code = default_error;
-    params.certificate = certificate;
-    cert_verify_proc_.Run(
-        params,
-        base::AdaptCallbackForRepeating(base::BindOnce(
-            [](VerifyCallback callback, const net::CertVerifyResult& result,
-               int err) { std::move(callback).Run(err, result); },
-            std::move(callback), default_result)));
-  }
-
- private:
-  CertVerifyProc cert_verify_proc_;
-};
-
-void WrapVerifyProc(
-    base::RepeatingCallback<void(const VerifyRequestParams& request,
-                                 base::RepeatingCallback<void(int)>)> proc,
-    const VerifyRequestParams& request,
-    base::OnceCallback<void(int)> cb) {
+void WrapVerifyProc(base::Callback<void(const VerifyRequestParams& request,
+                                        base::Callback<void(int)>)> proc,
+                    const VerifyRequestParams& request,
+                    base::OnceCallback<void(int)> cb) {
   proc.Run(request, base::AdaptCallbackForRepeating(std::move(cb)));
 }
 
 void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
                                 mate::Arguments* args) {
-  ElectronCertVerifierClient::CertVerifyProc proc;
+  base::Callback<void(const VerifyRequestParams& request,
+                      base::Callback<void(int)>)>
+      proc;
   if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &proc))) {
     args->ThrowError("Must pass null or function");
     return;
   }
 
-  if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    network::mojom::CertVerifierClientPtr cert_verifier_client;
-    if (proc) {
-      mojo::MakeStrongBinding(
-          std::make_unique<ElectronCertVerifierClient>(proc),
-          mojo::MakeRequest(&cert_verifier_client));
-    }
-    content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())
-        ->GetNetworkContext()
-        ->SetCertVerifierClient(std::move(cert_verifier_client));
-
-    // This causes the cert verifier cache to be cleared.
-    content::GetNetworkService()->OnCertDBChanged();
-  } else {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::BindOnce(&SetCertVerifyProcInIO,
-                       WrapRefCounted(browser_context_->GetRequestContext()),
-                       base::BindRepeating(&WrapVerifyProc, proc)));
-  }
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&SetCertVerifyProcInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     base::Bind(&WrapVerifyProc, proc)));
 }
 
 void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
@@ -498,14 +541,18 @@ void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
         AtomPermissionManager::RequestHandler());
     return;
   }
-  auto handler = std::make_unique<AtomPermissionManager::RequestHandler>();
+  using StatusCallback =
+      base::RepeatingCallback<void(blink::mojom::PermissionStatus)>;
+  using RequestHandler =
+      base::Callback<void(content::WebContents*, content::PermissionType,
+                          StatusCallback, const base::Value&)>;
+  auto handler = std::make_unique<RequestHandler>();
   if (!mate::ConvertFromV8(args->isolate(), val, handler.get())) {
     args->ThrowError("Must pass null or function");
     return;
   }
   permission_manager->SetPermissionRequestHandler(base::BindRepeating(
-      [](AtomPermissionManager::RequestHandler* handler,
-         content::WebContents* web_contents,
+      [](RequestHandler* handler, content::WebContents* web_contents,
          content::PermissionType permission_type,
          AtomPermissionManager::StatusCallback callback,
          const base::Value& details) {
@@ -533,33 +580,39 @@ v8::Local<v8::Promise> Session::ClearHostResolverCache(mate::Arguments* args) {
   util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())
-      ->GetNetworkContext()
-      ->ClearHostCache(nullptr,
-                       base::BindOnce(util::Promise::ResolveEmptyPromise,
-                                      std::move(promise)));
-
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&ClearHostResolverCacheInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     std::move(promise)));
   return handle;
 }
 
-v8::Local<v8::Promise> Session::ClearAuthCache() {
-  auto* isolate = v8::Isolate::GetCurrent();
+v8::Local<v8::Promise> Session::ClearAuthCache(mate::Arguments* args) {
+  v8::Isolate* isolate = args->isolate();
   util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())
-      ->GetNetworkContext()
-      ->ClearHttpAuthCache(base::Time(),
-                           base::BindOnce(util::Promise::ResolveEmptyPromise,
-                                          std::move(promise)));
+  ClearAuthCacheOptions options;
+  if (!args->GetNext(&options)) {
+    promise.RejectWithErrorMessage("Must specify options object");
+    return handle;
+  }
 
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&ClearAuthCacheInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     options, std::move(promise)));
   return handle;
 }
 
 void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
-  auto auth_params = CreateHttpAuthDynamicParams();
-  auth_params->server_whitelist = domains;
-  content::GetNetworkService()->ConfigureHttpAuthPrefs(std::move(auth_params));
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&AllowNTLMCredentialsForDomainsInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     domains));
 }
 
 void Session::SetUserAgent(const std::string& user_agent,
@@ -619,7 +672,7 @@ void Session::CreateInterruptedDownload(const mate::Dictionary& options) {
   }
   auto* download_manager =
       content::BrowserContext::GetDownloadManager(browser_context());
-  download_manager->GetDelegate()->GetNextId(base::BindRepeating(
+  download_manager->GetDelegate()->GetNextId(base::Bind(
       &DownloadIdCallback, download_manager, path, url_chain, mime_type, offset,
       length, last_modified, etag, base::Time::FromDoubleT(start_time)));
 }
@@ -647,19 +700,15 @@ v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
 
 v8::Local<v8::Value> Session::Protocol(v8::Isolate* isolate) {
   if (protocol_.IsEmpty()) {
-    v8::Local<v8::Value> handle;
-    if (base::FeatureList::IsEnabled(network::features::kNetworkService))
-      handle = ProtocolNS::Create(isolate, browser_context()).ToV8();
-    else
-      handle = Protocol::Create(isolate, browser_context()).ToV8();
-    protocol_.Reset(isolate, handle);
+    auto handle = atom::api::Protocol::Create(isolate, browser_context());
+    protocol_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, protocol_);
 }
 
 v8::Local<v8::Value> Session::WebRequest(v8::Isolate* isolate) {
   if (web_request_.IsEmpty()) {
-    auto handle = electron::api::WebRequest::Create(isolate, browser_context());
+    auto handle = atom::api::WebRequest::Create(isolate, browser_context());
     web_request_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, web_request_);
@@ -667,7 +716,7 @@ v8::Local<v8::Value> Session::WebRequest(v8::Isolate* isolate) {
 
 v8::Local<v8::Value> Session::NetLog(v8::Isolate* isolate) {
   if (net_log_.IsEmpty()) {
-    auto handle = electron::api::NetLog::Create(isolate, browser_context());
+    auto handle = atom::api::NetLog::Create(isolate, browser_context());
     net_log_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, net_log_);
@@ -748,18 +797,18 @@ void Session::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::Cookies;
-using electron::api::NetLog;
-using electron::api::Protocol;
-using electron::api::Session;
+using atom::api::Cookies;
+using atom::api::NetLog;
+using atom::api::Protocol;
+using atom::api::Session;
 
 v8::Local<v8::Value> FromPartition(const std::string& partition,
                                    mate::Arguments* args) {
-  if (!electron::Browser::Get()->is_ready()) {
+  if (!atom::Browser::Get()->is_ready()) {
     args->ThrowError("Session can only be received when app is ready");
     return v8::Null(args->isolate());
   }

atom/browser/api/atom_api_session.h

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_SESSION_H_
-#define SHELL_BROWSER_API_ATOM_API_SESSION_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_SESSION_H_
+#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"
+#include "atom/browser/net/resolve_proxy_helper.h"
+#include "atom/common/promise_util.h"
 #include "base/values.h"
 #include "content/public/browser/download_manager.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/atom_blob_reader.h"
-#include "shell/browser/net/resolve_proxy_helper.h"
-#include "shell/common/promise_util.h"
 
 class GURL;
 
@@ -31,7 +31,7 @@ namespace net {
 class ProxyConfig;
 }
 
-namespace electron {
+namespace atom {
 
 class AtomBrowserContext;
 
@@ -40,6 +40,11 @@ namespace api {
 class Session : public mate::TrackableObject<Session>,
                 public content::DownloadManager::Observer {
  public:
+  enum class CacheAction {
+    CLEAR,
+    STATS,
+  };
+
   // Gets or creates Session from the |browser_context|.
   static mate::Handle<Session> CreateFrom(v8::Isolate* isolate,
                                           AtomBrowserContext* browser_context);
@@ -72,7 +77,7 @@ class Session : public mate::TrackableObject<Session>,
   void SetPermissionCheckHandler(v8::Local<v8::Value> val,
                                  mate::Arguments* args);
   v8::Local<v8::Promise> ClearHostResolverCache(mate::Arguments* args);
-  v8::Local<v8::Promise> ClearAuthCache();
+  v8::Local<v8::Promise> ClearAuthCache(mate::Arguments* args);
   void AllowNTLMCredentialsForDomains(const std::string& domains);
   void SetUserAgent(const std::string& user_agent, mate::Arguments* args);
   std::string GetUserAgent();
@@ -111,6 +116,6 @@ class Session : public mate::TrackableObject<Session>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_SESSION_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_SESSION_H_

atom/browser/api/atom_api_system_preferences.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_system_preferences.h"
+#include "atom/browser/api/atom_api_system_preferences.h"
 
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/color_utils.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -102,13 +102,10 @@ void SystemPreferences::BuildPrototype(
                  &SystemPreferences::IsSwipeTrackingFromScrollEventsEnabled)
       .SetMethod("getEffectiveAppearance",
                  &SystemPreferences::GetEffectiveAppearance)
-      .SetMethod("_getAppLevelAppearance",
+      .SetMethod("getAppLevelAppearance",
                  &SystemPreferences::GetAppLevelAppearance)
-      .SetMethod("_setAppLevelAppearance",
+      .SetMethod("setAppLevelAppearance",
                  &SystemPreferences::SetAppLevelAppearance)
-      .SetProperty("appLevelAppearance",
-                   &SystemPreferences::GetAppLevelAppearance,
-                   &SystemPreferences::SetAppLevelAppearance)
       .SetMethod("getSystemColor", &SystemPreferences::GetSystemColor)
       .SetMethod("canPromptTouchID", &SystemPreferences::CanPromptTouchID)
       .SetMethod("promptTouchID", &SystemPreferences::PromptTouchID)
@@ -129,11 +126,11 @@ void SystemPreferences::BuildPrototype(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::SystemPreferences;
+using atom::api::SystemPreferences;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

atom/browser/api/atom_api_system_preferences.h

@@ -2,21 +2,21 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
-#define SHELL_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
+#define ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
 
 #include <memory>
 #include <string>
 
+#include "atom/browser/api/event_emitter.h"
+#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/values.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/event_emitter.h"
-#include "shell/common/promise_util.h"
 
 #if defined(OS_WIN)
-#include "shell/browser/browser.h"
-#include "shell/browser/browser_observer.h"
+#include "atom/browser/browser.h"
+#include "atom/browser/browser_observer.h"
 #include "ui/gfx/sys_color_change_listener.h"
 #endif
 
@@ -24,7 +24,7 @@ namespace base {
 class DictionaryValue;
 }
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -66,8 +66,7 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 
 #elif defined(OS_MACOSX)
   using NotificationCallback =
-      base::RepeatingCallback<void(const std::string&,
-                                   const base::DictionaryValue&)>;
+      base::Callback<void(const std::string&, const base::DictionaryValue&)>;
 
   void PostNotification(const std::string& name,
                         const base::DictionaryValue& user_info,
@@ -166,6 +165,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_

atom/browser/api/atom_api_system_preferences_mac.mm

@@ -2,18 +2,20 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_system_preferences.h"
+#include "atom/browser/api/atom_api_system_preferences.h"
 
 #include <map>
-#include <memory>
-#include <string>
-#include <utility>
 
 #import <AVFoundation/AVFoundation.h>
 #import <Cocoa/Cocoa.h>
 #import <LocalAuthentication/LocalAuthentication.h>
 #import <Security/Security.h>
 
+#include "atom/browser/mac/atom_application.h"
+#include "atom/browser/mac/dict_util.h"
+#include "atom/browser/ui/cocoa/NSColor+Hex.h"
+#include "atom/common/native_mate_converters/gurl_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/sequenced_task_runner.h"
@@ -23,11 +25,7 @@
 #include "base/values.h"
 #include "native_mate/object_template_builder.h"
 #include "net/base/mac/url_conversions.h"
-#include "shell/browser/mac/atom_application.h"
-#include "shell/browser/mac/dict_util.h"
-#include "shell/browser/ui/cocoa/NSColor+Hex.h"
-#include "shell/common/native_mate_converters/gurl_converter.h"
-#include "shell/common/native_mate_converters/value_converter.h"
+#include "ui/native_theme/native_theme.h"
 
 namespace mate {
 template <>
@@ -79,7 +77,7 @@ struct Converter<NSAppearance*> {
 };
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -628,9 +626,8 @@ void SystemPreferences::RemoveUserDefault(const std::string& name) {
 }
 
 bool SystemPreferences::IsDarkMode() {
-  if (@available(macOS 10.14, *)) {
-    return [[NSApplication sharedApplication].effectiveAppearance.name
-        isEqualToString:NSAppearanceNameDarkAqua];
+  if (@available(macOS 10.15, *)) {
+    return ui::NativeTheme::GetInstanceForNativeUi()->SystemDarkModeEnabled();
   }
   NSString* mode = [[NSUserDefaults standardUserDefaults]
       stringForKey:@"AppleInterfaceStyle"];
@@ -672,4 +669,4 @@ void SystemPreferences::SetAppLevelAppearance(mate::Arguments* args) {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_system_preferences_win.cc

@@ -5,15 +5,15 @@
 #include <dwmapi.h>
 #include <iomanip>
 
-#include "shell/browser/api/atom_api_system_preferences.h"
+#include "atom/browser/api/atom_api_system_preferences.h"
 
+#include "atom/common/color_util.h"
 #include "base/win/wrapped_window_proc.h"
-#include "shell/common/color_util.h"
 #include "ui/base/win/shell.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/win/hwnd_util.h"
 
-namespace electron {
+namespace atom {
 
 namespace {
 
@@ -218,4 +218,4 @@ void SystemPreferences::OnFinishLaunching(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_top_level_window.cc

@@ -2,35 +2,35 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_top_level_window.h"
+#include "atom/browser/api/atom_api_top_level_window.h"
 
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/atom_api_browser_view.h"
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/api/atom_api_view.h"
+#include "atom/browser/api/atom_api_web_contents.h"
+#include "atom/common/color_util.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/image_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
+#include "atom/common/options_switches.h"
 #include "electron/buildflags/buildflags.h"
 #include "gin/converter.h"
 #include "native_mate/handle.h"
 #include "native_mate/persistent_dictionary.h"
-#include "shell/browser/api/atom_api_browser_view.h"
-#include "shell/browser/api/atom_api_menu.h"
-#include "shell/browser/api/atom_api_view.h"
-#include "shell/browser/api/atom_api_web_contents.h"
-#include "shell/common/color_util.h"
-#include "shell/common/native_mate_converters/callback.h"
-#include "shell/common/native_mate_converters/file_path_converter.h"
-#include "shell/common/native_mate_converters/gfx_converter.h"
-#include "shell/common/native_mate_converters/image_converter.h"
-#include "shell/common/native_mate_converters/string16_converter.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/options_switches.h"
 
 #if defined(TOOLKIT_VIEWS)
-#include "shell/browser/native_window_views.h"
+#include "atom/browser/native_window_views.h"
 #endif
 
 #if defined(OS_WIN)
-#include "shell/browser/ui/win/taskbar_host.h"
+#include "atom/browser/ui/win/taskbar_host.h"
 #include "ui/base/win/shell.h"
 #endif
 
@@ -38,10 +38,10 @@
 namespace mate {
 
 template <>
-struct Converter<electron::TaskbarHost::ThumbarButton> {
+struct Converter<atom::TaskbarHost::ThumbarButton> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Handle<v8::Value> val,
-                     electron::TaskbarHost::ThumbarButton* out) {
+                     atom::TaskbarHost::ThumbarButton* out) {
     mate::Dictionary dict;
     if (!ConvertFromV8(isolate, val, &dict))
       return false;
@@ -55,7 +55,7 @@ struct Converter<electron::TaskbarHost::ThumbarButton> {
 }  // namespace mate
 #endif
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -737,15 +737,15 @@ void TopLevelWindow::SetProgressBar(double progress, mate::Arguments* args) {
   std::string mode;
   args->GetNext(&options) && options.Get("mode", &mode);
 
-  NativeWindow::ProgressState state = NativeWindow::ProgressState::kNormal;
+  NativeWindow::ProgressState state = NativeWindow::PROGRESS_NORMAL;
   if (mode == "error")
-    state = NativeWindow::ProgressState::kError;
+    state = NativeWindow::PROGRESS_ERROR;
   else if (mode == "paused")
-    state = NativeWindow::ProgressState::kPaused;
+    state = NativeWindow::PROGRESS_PAUSED;
   else if (mode == "indeterminate")
-    state = NativeWindow::ProgressState::kIndeterminate;
+    state = NativeWindow::PROGRESS_INDETERMINATE;
   else if (mode == "none")
-    state = NativeWindow::ProgressState::kNone;
+    state = NativeWindow::PROGRESS_NONE;
 
   window_->SetProgressBar(progress, state);
 }
@@ -1070,31 +1070,19 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setMaximumSize", &TopLevelWindow::SetMaximumSize)
       .SetMethod("getMaximumSize", &TopLevelWindow::GetMaximumSize)
       .SetMethod("setSheetOffset", &TopLevelWindow::SetSheetOffset)
+      .SetMethod("setResizable", &TopLevelWindow::SetResizable)
+      .SetMethod("isResizable", &TopLevelWindow::IsResizable)
+      .SetMethod("setMovable", &TopLevelWindow::SetMovable)
       .SetMethod("moveTop", &TopLevelWindow::MoveTop)
-      .SetMethod("_setResizable", &TopLevelWindow::SetResizable)
-      .SetMethod("_isResizable", &TopLevelWindow::IsResizable)
-      .SetProperty("resizable", &TopLevelWindow::IsResizable,
-                   &TopLevelWindow::SetResizable)
-      .SetMethod("_setMovable", &TopLevelWindow::SetMovable)
-      .SetMethod("_isMovable", &TopLevelWindow::IsMovable)
-      .SetProperty("movable", &TopLevelWindow::IsMovable,
-                   &TopLevelWindow::SetMovable)
-      .SetMethod("_setMinimizable", &TopLevelWindow::SetMinimizable)
-      .SetMethod("_isMinimizable", &TopLevelWindow::IsMinimizable)
-      .SetProperty("minimizable", &TopLevelWindow::IsMinimizable,
-                   &TopLevelWindow::SetMinimizable)
-      .SetMethod("_setMaximizable", &TopLevelWindow::SetMaximizable)
-      .SetMethod("_isMaximizable", &TopLevelWindow::IsMaximizable)
-      .SetProperty("maximizable", &TopLevelWindow::IsMaximizable,
-                   &TopLevelWindow::SetMaximizable)
-      .SetMethod("_setFullScreenable", &TopLevelWindow::SetFullScreenable)
-      .SetMethod("_isFullScreenable", &TopLevelWindow::IsFullScreenable)
-      .SetProperty("fullScreenable", &TopLevelWindow::IsFullScreenable,
-                   &TopLevelWindow::SetFullScreenable)
-      .SetMethod("_setClosable", &TopLevelWindow::SetClosable)
-      .SetMethod("_isClosable", &TopLevelWindow::IsClosable)
-      .SetProperty("closable", &TopLevelWindow::IsClosable,
-                   &TopLevelWindow::SetClosable)
+      .SetMethod("isMovable", &TopLevelWindow::IsMovable)
+      .SetMethod("setMinimizable", &TopLevelWindow::SetMinimizable)
+      .SetMethod("isMinimizable", &TopLevelWindow::IsMinimizable)
+      .SetMethod("setMaximizable", &TopLevelWindow::SetMaximizable)
+      .SetMethod("isMaximizable", &TopLevelWindow::IsMaximizable)
+      .SetMethod("setFullScreenable", &TopLevelWindow::SetFullScreenable)
+      .SetMethod("isFullScreenable", &TopLevelWindow::IsFullScreenable)
+      .SetMethod("setClosable", &TopLevelWindow::SetClosable)
+      .SetMethod("isClosable", &TopLevelWindow::IsClosable)
       .SetMethod("setAlwaysOnTop", &TopLevelWindow::SetAlwaysOnTop)
       .SetMethod("isAlwaysOnTop", &TopLevelWindow::IsAlwaysOnTop)
       .SetMethod("center", &TopLevelWindow::Center)
@@ -1158,10 +1146,9 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
                    &TopLevelWindow::IsExcludedFromShownWindowsMenu,
                    &TopLevelWindow::SetExcludedFromShownWindowsMenu)
 #endif
-      .SetMethod("_setAutoHideMenuBar", &TopLevelWindow::SetAutoHideMenuBar)
-      .SetMethod("_isMenuBarAutoHide", &TopLevelWindow::IsMenuBarAutoHide)
-      .SetProperty("autoHideMenuBar", &TopLevelWindow::IsMenuBarAutoHide,
-                   &TopLevelWindow::SetAutoHideMenuBar)
+      .SetMethod("setAutoHideMenuBar", &TopLevelWindow::SetAutoHideMenuBar)
+      .SetMethod("isMenuBarAutoHide", &TopLevelWindow::IsMenuBarAutoHide)
+      .SetMethod("setMenuBarVisibility", &TopLevelWindow::SetMenuBarVisibility)
       .SetMethod("isMenuBarVisible", &TopLevelWindow::IsMenuBarVisible)
       .SetMethod("setAspectRatio", &TopLevelWindow::SetAspectRatio)
       .SetMethod("previewFile", &TopLevelWindow::PreviewFile)
@@ -1192,19 +1179,18 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::TopLevelWindow;
+using atom::api::TopLevelWindow;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  TopLevelWindow::SetConstructor(isolate,
-                                 base::BindRepeating(&TopLevelWindow::New));
+  TopLevelWindow::SetConstructor(isolate, base::Bind(&TopLevelWindow::New));
 
   mate::Dictionary constructor(isolate, TopLevelWindow::GetConstructor(isolate)
                                             ->GetFunction(context)

atom/browser/api/atom_api_top_level_window.h

@@ -2,24 +2,24 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
-#define SHELL_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
+#define ATOM_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/native_window_observer.h"
+#include "atom/common/api/atom_api_native_image.h"
 #include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/native_window.h"
-#include "shell/browser/native_window_observer.h"
-#include "shell/common/api/atom_api_native_image.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -211,8 +211,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
   void SetIcon(mate::Handle<NativeImage> icon);
 #endif
 #if defined(OS_WIN)
-  typedef base::RepeatingCallback<void(v8::Local<v8::Value>,
-                                       v8::Local<v8::Value>)>
+  typedef base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>
       MessageCallback;
   bool HookWindowMessage(UINT message, const MessageCallback& callback);
   bool IsWindowMessageHooked(UINT message);
@@ -258,24 +257,23 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace mate {
 
 template <>
-struct Converter<electron::NativeWindow*> {
+struct Converter<atom::NativeWindow*> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     electron::NativeWindow** out) {
+                     atom::NativeWindow** out) {
     // null would be tranfered to NULL.
     if (val->IsNull()) {
       *out = NULL;
       return true;
     }
 
-    electron::api::TopLevelWindow* window;
-    if (!Converter<electron::api::TopLevelWindow*>::FromV8(isolate, val,
-                                                           &window))
+    atom::api::TopLevelWindow* window;
+    if (!Converter<atom::api::TopLevelWindow*>::FromV8(isolate, val, &window))
       return false;
     *out = window->window();
     return true;
@@ -284,4 +282,4 @@ struct Converter<electron::NativeWindow*> {
 
 }  // namespace mate
 
-#endif  // SHELL_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_

atom/browser/api/atom_api_tray.cc

@@ -2,42 +2,41 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_tray.h"
+#include "atom/browser/api/atom_api_tray.h"
 
 #include <string>
 
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/browser.h"
+#include "atom/common/api/atom_api_native_image.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 "atom/common/node_includes.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/api/atom_api_menu.h"
-#include "shell/browser/browser.h"
-#include "shell/common/api/atom_api_native_image.h"
-#include "shell/common/native_mate_converters/gfx_converter.h"
-#include "shell/common/native_mate_converters/image_converter.h"
-#include "shell/common/native_mate_converters/string16_converter.h"
-#include "shell/common/node_includes.h"
 #include "ui/gfx/image/image.h"
 
 namespace mate {
 
 template <>
-struct Converter<electron::TrayIcon::HighlightMode> {
+struct Converter<atom::TrayIcon::HighlightMode> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     electron::TrayIcon::HighlightMode* out) {
-    using HighlightMode = electron::TrayIcon::HighlightMode;
+                     atom::TrayIcon::HighlightMode* out) {
     std::string mode;
     if (ConvertFromV8(isolate, val, &mode)) {
       if (mode == "always") {
-        *out = HighlightMode::ALWAYS;
+        *out = atom::TrayIcon::HighlightMode::ALWAYS;
         return true;
       }
       if (mode == "selection") {
-        *out = HighlightMode::SELECTION;
+        *out = atom::TrayIcon::HighlightMode::SELECTION;
         return true;
       }
       if (mode == "never") {
-        *out = HighlightMode::NEVER;
+        *out = atom::TrayIcon::HighlightMode::NEVER;
         return true;
       }
     }
@@ -46,7 +45,7 @@ struct Converter<electron::TrayIcon::HighlightMode> {
 };
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -199,7 +198,7 @@ void Tray::DisplayBalloon(mate::Arguments* args,
 
 #if defined(OS_WIN)
   tray_icon_->DisplayBalloon(
-      icon.IsEmpty() ? NULL : icon->GetHICON(GetSystemMetrics(SM_CXSMICON)),
+      icon.IsEmpty() ? NULL : icon->GetHICON(GetSystemMetrics(SM_CXICON)),
       title, content);
 #else
   tray_icon_->DisplayBalloon(icon.IsEmpty() ? gfx::Image() : icon->image(),
@@ -248,18 +247,18 @@ void Tray::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::Tray;
+using atom::api::Tray;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  Tray::SetConstructor(isolate, base::BindRepeating(&Tray::New));
+  Tray::SetConstructor(isolate, base::Bind(&Tray::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set(

atom/browser/api/atom_api_tray.h

@@ -2,17 +2,17 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_TRAY_H_
-#define SHELL_BROWSER_API_ATOM_API_TRAY_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_TRAY_H_
+#define ATOM_BROWSER_API_ATOM_API_TRAY_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/ui/tray_icon.h"
+#include "atom/browser/ui/tray_icon_observer.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/ui/tray_icon.h"
-#include "shell/browser/ui/tray_icon_observer.h"
 
 namespace gfx {
 class Image;
@@ -23,7 +23,7 @@ class Arguments;
 class Dictionary;
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 class TrayIcon;
 
@@ -87,6 +87,6 @@ class Tray : public mate::TrackableObject<Tray>, public TrayIconObserver {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_TRAY_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_TRAY_H_

atom/browser/api/atom_api_url_request.cc

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_url_request.h"
+#include "atom/browser/api/atom_api_url_request.h"
 
 #include <string>
 
+#include "atom/browser/api/atom_api_session.h"
+#include "atom/browser/net/atom_url_request.h"
+#include "atom/common/api/event_emitter_caller.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/gurl_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
-#include "shell/browser/api/atom_api_session.h"
-#include "shell/browser/net/atom_url_request.h"
-#include "shell/common/api/event_emitter_caller.h"
-#include "shell/common/native_mate_converters/gurl_converter.h"
-#include "shell/common/native_mate_converters/net_converter.h"
-#include "shell/common/native_mate_converters/once_callback.h"
-#include "shell/common/native_mate_converters/string16_converter.h"
-#include "shell/common/node_includes.h"
 
 namespace mate {
 
@@ -56,7 +56,7 @@ struct Converter<scoped_refptr<const net::IOBufferWithSize>> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 namespace api {
 
 template <typename Flags>
@@ -365,7 +365,7 @@ void URLRequest::OnAuthenticationRequired(
   }
 
   Emit("login", auth_info,
-       base::BindOnce(&AtomURLRequest::PassLoginInformation, atom_request_));
+       base::Bind(&AtomURLRequest::PassLoginInformation, atom_request_));
 }
 
 void URLRequest::OnResponseStarted(
@@ -493,4 +493,4 @@ void URLRequest::EmitResponseEvent(Args... args) {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom

atom/browser/api/atom_api_url_request.h

@@ -2,12 +2,14 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_URL_REQUEST_H_
-#define SHELL_BROWSER_API_ATOM_API_URL_REQUEST_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
+#define ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
 
 #include <array>
 #include <string>
 
+#include "atom/browser/api/event_emitter.h"
+#include "atom/browser/api/trackable_object.h"
 #include "base/memory/weak_ptr.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/handle.h"
@@ -16,10 +18,8 @@
 #include "net/base/io_buffer.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context.h"
-#include "shell/browser/api/event_emitter.h"
-#include "shell/browser/api/trackable_object.h"
 
-namespace electron {
+namespace atom {
 
 class AtomURLRequest;
 
@@ -209,6 +209,6 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_URL_REQUEST_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_

atom/browser/api/atom_api_view.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_view.h"
+#include "atom/browser/api/atom_api_view.h"
 
+#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
-#include "shell/common/node_includes.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -62,18 +62,18 @@ void View::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::View;
+using atom::api::View;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  View::SetConstructor(isolate, base::BindRepeating(&View::New));
+  View::SetConstructor(isolate, base::Bind(&View::New));
 
   mate::Dictionary constructor(
       isolate,

atom/browser/api/atom_api_view.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_VIEW_H_
-#define SHELL_BROWSER_API_ATOM_API_VIEW_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_VIEW_H_
+#define ATOM_BROWSER_API_ATOM_API_VIEW_H_
 
 #include <memory>
 #include <vector>
 
+#include "atom/browser/api/views/atom_api_layout_manager.h"
 #include "electron/buildflags/buildflags.h"
 #include "native_mate/handle.h"
-#include "shell/browser/api/views/atom_api_layout_manager.h"
 #include "ui/views/view.h"
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -52,7 +52,7 @@ class View : public mate::TrackableObject<View> {
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace mate {
 
@@ -61,8 +61,8 @@ struct Converter<views::View*> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
                      views::View** out) {
-    electron::api::View* view;
-    if (!Converter<electron::api::View*>::FromV8(isolate, val, &view))
+    atom::api::View* view;
+    if (!Converter<atom::api::View*>::FromV8(isolate, val, &view))
       return false;
     *out = view->view();
     return true;
@@ -71,4 +71,4 @@ struct Converter<views::View*> {
 
 }  // namespace mate
 
-#endif  // SHELL_BROWSER_API_ATOM_API_VIEW_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_VIEW_H_

atom/browser/api/atom_api_web_contents.cc

@@ -2,13 +2,51 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "shell/browser/api/atom_api_web_contents.h"
+#include "atom/browser/api/atom_api_web_contents.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 
+#include "atom/browser/api/atom_api_browser_window.h"
+#include "atom/browser/api/atom_api_debugger.h"
+#include "atom/browser/api/atom_api_session.h"
+#include "atom/browser/atom_browser_client.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/atom_javascript_dialog_manager.h"
+#include "atom/browser/atom_navigation_throttle.h"
+#include "atom/browser/browser.h"
+#include "atom/browser/child_web_contents_tracker.h"
+#include "atom/browser/lib/bluetooth_chooser.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/net/atom_network_delegate.h"
+#include "atom/browser/ui/drag_util.h"
+#include "atom/browser/ui/inspectable_web_contents.h"
+#include "atom/browser/ui/inspectable_web_contents_view.h"
+#include "atom/browser/web_contents_permission_helper.h"
+#include "atom/browser/web_contents_preferences.h"
+#include "atom/browser/web_contents_zoom_controller.h"
+#include "atom/browser/web_view_guest_delegate.h"
+#include "atom/common/api/api_messages.h"
+#include "atom/common/api/atom_api_native_image.h"
+#include "atom/common/api/event_emitter_caller.h"
+#include "atom/common/color_util.h"
+#include "atom/common/mouse_util.h"
+#include "atom/common/native_mate_converters/blink_converter.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"
+#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/net_converter.h"
+#include "atom/common/native_mate_converters/network_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
+#include "atom/common/options_switches.h"
 #include "base/message_loop/message_loop.h"
 #include "base/no_destructor.h"
 #include "base/optional.h"
@@ -41,50 +79,12 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
-#include "electron/shell/common/api/api.mojom.h"
+#include "electron/atom/common/api/api.mojom.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "native_mate/converter.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "net/url_request/url_request_context.h"
-#include "shell/browser/api/atom_api_browser_window.h"
-#include "shell/browser/api/atom_api_debugger.h"
-#include "shell/browser/api/atom_api_session.h"
-#include "shell/browser/atom_browser_client.h"
-#include "shell/browser/atom_browser_context.h"
-#include "shell/browser/atom_browser_main_parts.h"
-#include "shell/browser/atom_javascript_dialog_manager.h"
-#include "shell/browser/atom_navigation_throttle.h"
-#include "shell/browser/browser.h"
-#include "shell/browser/child_web_contents_tracker.h"
-#include "shell/browser/lib/bluetooth_chooser.h"
-#include "shell/browser/native_window.h"
-#include "shell/browser/net/atom_network_delegate.h"
-#include "shell/browser/ui/drag_util.h"
-#include "shell/browser/ui/inspectable_web_contents.h"
-#include "shell/browser/ui/inspectable_web_contents_view.h"
-#include "shell/browser/web_contents_permission_helper.h"
-#include "shell/browser/web_contents_preferences.h"
-#include "shell/browser/web_contents_zoom_controller.h"
-#include "shell/browser/web_view_guest_delegate.h"
-#include "shell/common/api/atom_api_native_image.h"
-#include "shell/common/api/event_emitter_caller.h"
-#include "shell/common/color_util.h"
-#include "shell/common/mouse_util.h"
-#include "shell/common/native_mate_converters/blink_converter.h"
-#include "shell/common/native_mate_converters/content_converter.h"
-#include "shell/common/native_mate_converters/file_path_converter.h"
-#include "shell/common/native_mate_converters/gfx_converter.h"
-#include "shell/common/native_mate_converters/gurl_converter.h"
-#include "shell/common/native_mate_converters/image_converter.h"
-#include "shell/common/native_mate_converters/map_converter.h"
-#include "shell/common/native_mate_converters/net_converter.h"
-#include "shell/common/native_mate_converters/network_converter.h"
-#include "shell/common/native_mate_converters/once_callback.h"
-#include "shell/common/native_mate_converters/string16_converter.h"
-#include "shell/common/native_mate_converters/value_converter.h"
-#include "shell/common/node_includes.h"
-#include "shell/common/options_switches.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
 #include "third_party/blink/public/platform/web_cursor_info.h"
@@ -93,8 +93,8 @@
 #include "ui/events/base_event_utils.h"
 
 #if BUILDFLAG(ENABLE_OSR)
-#include "shell/browser/osr/osr_render_widget_host_view.h"
-#include "shell/browser/osr/osr_web_contents_view.h"
+#include "atom/browser/osr/osr_render_widget_host_view.h"
+#include "atom/browser/osr/osr_web_contents_view.h"
 #endif
 
 #if !defined(OS_MACOSX)
@@ -127,59 +127,6 @@ struct Converter<printing::PrinterBasicInfo> {
     return dict.GetHandle();
   }
 };
-
-template <>
-struct Converter<printing::MarginType> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     printing::MarginType* out) {
-    std::string type;
-    if (ConvertFromV8(isolate, val, &type)) {
-      if (type == "default") {
-        *out = printing::DEFAULT_MARGINS;
-        return true;
-      }
-      if (type == "none") {
-        *out = printing::NO_MARGINS;
-        return true;
-      }
-      if (type == "printableArea") {
-        *out = printing::PRINTABLE_AREA_MARGINS;
-        return true;
-      }
-      if (type == "custom") {
-        *out = printing::CUSTOM_MARGINS;
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-template <>
-struct Converter<printing::DuplexMode> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     printing::DuplexMode* out) {
-    std::string mode;
-    if (ConvertFromV8(isolate, val, &mode)) {
-      if (mode == "simplex") {
-        *out = printing::SIMPLEX;
-        return true;
-      }
-      if (mode == "longEdge") {
-        *out = printing::LONG_EDGE;
-        return true;
-      }
-      if (mode == "shortEdge") {
-        *out = printing::SHORT_EDGE;
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
 #endif
 
 template <>
@@ -234,10 +181,10 @@ struct Converter<content::SavePageType> {
 };
 
 template <>
-struct Converter<electron::api::WebContents::Type> {
+struct Converter<atom::api::WebContents::Type> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   electron::api::WebContents::Type val) {
-    using Type = electron::api::WebContents::Type;
+                                   atom::api::WebContents::Type val) {
+    using Type = atom::api::WebContents::Type;
     std::string type = "";
     switch (val) {
       case Type::BACKGROUND_PAGE:
@@ -266,8 +213,8 @@ struct Converter<electron::api::WebContents::Type> {
 
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     electron::api::WebContents::Type* out) {
-    using Type = electron::api::WebContents::Type;
+                     atom::api::WebContents::Type* out) {
+    using Type = atom::api::WebContents::Type;
     std::string type;
     if (!ConvertFromV8(isolate, val, &type))
       return false;
@@ -290,7 +237,7 @@ struct Converter<electron::api::WebContents::Type> {
 
 }  // namespace mate
 
-namespace electron {
+namespace atom {
 
 namespace api {
 
@@ -304,10 +251,25 @@ void OnCapturePageDone(util::Promise promise, const SkBitmap& bitmap) {
 
 }  // namespace
 
+struct WebContents::FrameDispatchHelper {
+  WebContents* api_web_contents;
+  content::RenderFrameHost* rfh;
+
+  bool Send(IPC::Message* msg) { return rfh->Send(msg); }
+
+  void OnSetTemporaryZoomLevel(double level, IPC::Message* reply_msg) {
+    api_web_contents->OnSetTemporaryZoomLevel(rfh, level, reply_msg);
+  }
+
+  void OnGetZoomLevel(IPC::Message* reply_msg) {
+    api_web_contents->OnGetZoomLevel(rfh, reply_msg);
+  }
+};
+
 WebContents::WebContents(v8::Isolate* isolate,
                          content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      type_(Type::REMOTE),
+      type_(REMOTE),
       weak_factory_(this) {
   web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
                                      false);
@@ -326,8 +288,7 @@ WebContents::WebContents(v8::Isolate* isolate,
     : content::WebContentsObserver(web_contents.get()),
       type_(type),
       weak_factory_(this) {
-  DCHECK(type != Type::REMOTE)
-      << "Can't take ownership of a remote WebContents";
+  DCHECK(type != REMOTE) << "Can't take ownership of a remote WebContents";
   auto session = Session::CreateFrom(isolate, GetBrowserContext());
   session_.Reset(isolate, session.ToV8());
   InitWithSessionAndOptions(isolate, std::move(web_contents), session,
@@ -339,13 +300,21 @@ WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
   // Read options.
   options.Get("backgroundThrottling", &background_throttling_);
 
-  // Get type
-  options.Get("type", &type_);
-
+  // FIXME(zcbenz): We should read "type" parameter for better design, but
+  // on Windows we have encountered a compiler bug that if we read "type"
+  // from |options| and then set |type_|, a memory corruption will happen
+  // and Electron will soon crash.
+  // Remvoe this after we upgraded to use VS 2015 Update 3.
   bool b = false;
+  if (options.Get("isGuest", &b) && b)
+    type_ = WEB_VIEW;
+  else if (options.Get("isBackgroundPage", &b) && b)
+    type_ = BACKGROUND_PAGE;
+  else if (options.Get("isBrowserView", &b) && b)
+    type_ = BROWSER_VIEW;
 #if BUILDFLAG(ENABLE_OSR)
-  if (options.Get(options::kOffscreen, &b) && b)
-    type_ = Type::OFF_SCREEN;
+  else if (options.Get(options::kOffscreen, &b) && b)
+    type_ = OFF_SCREEN;
 #endif
 
   // Init embedder earlier
@@ -380,8 +349,7 @@ WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
 #if BUILDFLAG(ENABLE_OSR)
     if (embedder_ && embedder_->IsOffScreen()) {
       auto* view = new OffScreenWebContentsView(
-          false,
-          base::BindRepeating(&WebContents::OnPaint, base::Unretained(this)));
+          false, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
       params.view = view;
       params.delegate_view = view;
 
@@ -398,8 +366,7 @@ WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
 
     content::WebContents::CreateParams params(session->browser_context());
     auto* view = new OffScreenWebContentsView(
-        transparent,
-        base::BindRepeating(&WebContents::OnPaint, base::Unretained(this)));
+        transparent, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
     params.view = view;
     params.delegate_view = view;
 
@@ -494,12 +461,12 @@ WebContents::~WebContents() {
 
     RenderViewDeleted(web_contents()->GetRenderViewHost());
 
-    if (type_ == Type::WEB_VIEW) {
+    if (type_ == WEB_VIEW) {
       DCHECK(!web_contents()->GetOuterWebContents())
           << "Should never manually destroy an attached webview";
       // For webview simply destroy the WebContents immediately.
       DestroyWebContents(false /* async */);
-    } else if (type_ == Type::BROWSER_WINDOW && owner_window()) {
+    } else if (type_ == BROWSER_WINDOW && owner_window()) {
       // For BrowserWindow we should close the window and clean up everything
       // before WebContents is destroyed.
       for (ExtendedWebContentsObserver& observer : observers_)
@@ -546,7 +513,7 @@ void WebContents::OnCreateWindow(
     WindowOpenDisposition disposition,
     const std::vector<std::string>& features,
     const scoped_refptr<network::ResourceRequestBody>& body) {
-  if (type_ == Type::BROWSER_WINDOW || type_ == Type::OFF_SCREEN)
+  if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
     Emit("-new-window", target_url, frame_name, disposition, features, body,
          referrer);
   else
@@ -578,7 +545,7 @@ void WebContents::AddNewContents(
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   auto api_web_contents =
-      CreateAndTake(isolate(), std::move(new_contents), Type::BROWSER_WINDOW);
+      CreateAndTake(isolate(), std::move(new_contents), BROWSER_WINDOW);
   if (Emit("-add-new-contents", api_web_contents, disposition, user_gesture,
            initial_rect.x(), initial_rect.y(), initial_rect.width(),
            initial_rect.height(), tracker->url, tracker->frame_name)) {
@@ -591,7 +558,7 @@ content::WebContents* WebContents::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
   if (params.disposition != WindowOpenDisposition::CURRENT_TAB) {
-    if (type_ == Type::BROWSER_WINDOW || type_ == Type::OFF_SCREEN)
+    if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
       Emit("-new-window", params.url, "", params.disposition);
     else
       Emit("new-window", params.url, "", params.disposition);
@@ -613,7 +580,7 @@ content::WebContents* WebContents::OpenURLFromTab(
 void WebContents::BeforeUnloadFired(content::WebContents* tab,
                                     bool proceed,
                                     bool* proceed_to_fire_unload) {
-  if (type_ == Type::BROWSER_WINDOW || type_ == Type::OFF_SCREEN)
+  if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
     *proceed_to_fire_unload = proceed;
   else
     *proceed_to_fire_unload = true;
@@ -626,7 +593,9 @@ void WebContents::SetContentsBounds(content::WebContents* source,
 
 void WebContents::CloseContents(content::WebContents* source) {
   Emit("close");
+#if defined(TOOLKIT_VIEWS)
   HideAutofillPopup();
+#endif
   if (managed_web_contents())
     managed_web_contents()->GetView()->SetDelegate(nullptr);
   for (ExtendedWebContentsObserver& observer : observers_)
@@ -645,7 +614,7 @@ void WebContents::UpdateTargetURL(content::WebContents* source,
 bool WebContents::HandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
-  if (type_ == Type::WEB_VIEW && embedder_) {
+  if (type_ == WEB_VIEW && embedder_) {
     // Send the unhandled keyboard events back to the embedder.
     return embedder_->HandleKeyboardEvent(source, event);
   } else {
@@ -668,19 +637,14 @@ content::KeyboardEventProcessingResult WebContents::PreHandleKeyboardEvent(
   return content::KeyboardEventProcessingResult::NOT_HANDLED;
 }
 
-void WebContents::ContentsZoomChange(bool zoom_in) {
-  Emit("zoom-changed", zoom_in ? "in" : "out");
-}
-
 void WebContents::EnterFullscreenModeForTab(
     content::WebContents* source,
     const GURL& origin,
     const blink::WebFullscreenOptions& options) {
   auto* permission_helper =
       WebContentsPermissionHelper::FromWebContents(source);
-  auto callback =
-      base::BindRepeating(&WebContents::OnEnterFullscreenModeForTab,
-                          base::Unretained(this), source, origin, options);
+  auto callback = base::Bind(&WebContents::OnEnterFullscreenModeForTab,
+                             base::Unretained(this), source, origin, options);
   permission_helper->RequestFullscreenPermission(callback);
 }
 
@@ -719,9 +683,8 @@ bool WebContents::HandleContextMenu(content::RenderFrameHost* render_frame_host,
                                     const content::ContextMenuParams& params) {
   if (params.custom_context.is_pepper_menu) {
     Emit("pepper-context-menu", std::make_pair(params, web_contents()),
-         base::BindOnce(&content::WebContents::NotifyContextMenuClosed,
-                        base::Unretained(web_contents()),
-                        params.custom_context));
+         base::Bind(&content::WebContents::NotifyContextMenuClosed,
+                    base::Unretained(web_contents()), params.custom_context));
   } else {
     Emit("context-menu", std::make_pair(params, web_contents()));
   }
@@ -865,7 +828,7 @@ void WebContents::MediaStoppedPlaying(
 
 void WebContents::DidChangeThemeColor(base::Optional<SkColor> theme_color) {
   if (theme_color) {
-    Emit("did-change-theme-color", electron::ToRGBHex(theme_color.value()));
+    Emit("did-change-theme-color", atom::ToRGBHex(theme_color.value()));
   } else {
     Emit("did-change-theme-color", nullptr);
   }
@@ -967,14 +930,6 @@ void WebContents::Message(bool internal,
                  internal, channel, std::move(arguments));
 }
 
-void WebContents::Invoke(const std::string& channel,
-                         base::Value arguments,
-                         InvokeCallback callback) {
-  // webContents.emit('-ipc-invoke', new Event(), channel, arguments);
-  EmitWithSender("-ipc-invoke", bindings_.dispatch_context(),
-                 std::move(callback), channel, std::move(arguments));
-}
-
 void WebContents::MessageSync(bool internal,
                               const std::string& channel,
                               base::Value arguments,
@@ -1007,12 +962,6 @@ void WebContents::MessageHost(const std::string& channel,
                  base::nullopt, channel, std::move(arguments));
 }
 
-void WebContents::UpdateDraggableRegions(
-    std::vector<mojom::DraggableRegionPtr> regions) {
-  for (ExtendedWebContentsObserver& observer : observers_)
-    observer.OnDraggableRegionsUpdated(regions);
-}
-
 void WebContents::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
   // A RenderFrameHost can be destroyed before the related Mojo binding is
@@ -1153,6 +1102,7 @@ void WebContents::DevToolsClosed() {
   Emit("devtools-closed");
 }
 
+#if defined(TOOLKIT_VIEWS)
 void WebContents::ShowAutofillPopup(content::RenderFrameHost* frame_host,
                                     const gfx::RectF& bounds,
                                     const std::vector<base::string16>& values,
@@ -1172,6 +1122,7 @@ void WebContents::ShowAutofillPopup(content::RenderFrameHost* frame_host,
   CommonWebContentsDelegate::ShowAutofillPopup(
       frame_host, embedder_frame_host, offscreen, popup_bounds, values, labels);
 }
+#endif
 
 bool WebContents::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ -1184,6 +1135,26 @@ bool WebContents::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
+bool WebContents::OnMessageReceived(const IPC::Message& message,
+                                    content::RenderFrameHost* frame_host) {
+  bool handled = true;
+  FrameDispatchHelper helper = {this, frame_host};
+  IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
+    IPC_MESSAGE_FORWARD_DELAY_REPLY(
+        AtomFrameHostMsg_SetTemporaryZoomLevel, &helper,
+        FrameDispatchHelper::OnSetTemporaryZoomLevel)
+    IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
+                                    FrameDispatchHelper::OnGetZoomLevel)
+#if defined(TOOLKIT_VIEWS)
+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
+#endif
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+
+  return handled;
+}
+
 // There are three ways of destroying a webContents:
 // 1. call webContents.destroy();
 // 2. garbage collection;
@@ -1266,18 +1237,6 @@ base::ProcessId WebContents::GetOSProcessID() const {
   return base::GetProcId(process_handle);
 }
 
-base::ProcessId WebContents::GetOSProcessIdForFrame(
-    const std::string& name,
-    const std::string& document_url) const {
-  for (auto* frame : web_contents()->GetAllFrames()) {
-    if (frame->GetFrameName() == name &&
-        frame->GetLastCommittedURL().spec() == document_url) {
-      return base::GetProcId(frame->GetProcess()->GetProcess().Handle());
-    }
-  }
-  return base::kNullProcessId;
-}
-
 WebContents::Type WebContents::GetType() const {
   return type_;
 }
@@ -1383,17 +1342,17 @@ void WebContents::Stop() {
 }
 
 void WebContents::GoBack() {
-  electron::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
+  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
   web_contents()->GetController().GoBack();
 }
 
 void WebContents::GoForward() {
-  electron::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
+  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
   web_contents()->GetController().GoForward();
 }
 
 void WebContents::GoToOffset(int offset) {
-  electron::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
+  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
   web_contents()->GetController().GoToOffset(offset);
 }
 
@@ -1439,14 +1398,14 @@ v8::Local<v8::Promise> WebContents::SavePage(
 }
 
 void WebContents::OpenDevTools(mate::Arguments* args) {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   if (!enable_devtools_)
     return;
 
   std::string state;
-  if (type_ == Type::WEB_VIEW || !owner_window()) {
+  if (type_ == WEB_VIEW || !owner_window()) {
     state = "detach";
   }
   bool activate = true;
@@ -1462,21 +1421,21 @@ void WebContents::OpenDevTools(mate::Arguments* args) {
 }
 
 void WebContents::CloseDevTools() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   managed_web_contents()->CloseDevTools();
 }
 
 bool WebContents::IsDevToolsOpened() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return false;
 
   return managed_web_contents()->IsDevToolsViewShowing();
 }
 
 bool WebContents::IsDevToolsFocused() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return false;
 
   return managed_web_contents()->GetView()->IsDevToolsViewFocused();
@@ -1484,7 +1443,7 @@ bool WebContents::IsDevToolsFocused() {
 
 void WebContents::EnableDeviceEmulation(
     const blink::WebDeviceEmulationParams& params) {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   auto* frame_host = web_contents()->GetMainFrame();
@@ -1499,7 +1458,7 @@ void WebContents::EnableDeviceEmulation(
 }
 
 void WebContents::DisableDeviceEmulation() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   auto* frame_host = web_contents()->GetMainFrame();
@@ -1521,7 +1480,7 @@ void WebContents::ToggleDevTools() {
 }
 
 void WebContents::InspectElement(int x, int y) {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   if (!enable_devtools_)
@@ -1533,7 +1492,7 @@ void WebContents::InspectElement(int x, int y) {
 }
 
 void WebContents::InspectSharedWorker() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   if (!enable_devtools_)
@@ -1550,7 +1509,7 @@ void WebContents::InspectSharedWorker() {
 }
 
 void WebContents::InspectServiceWorker() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   if (!enable_devtools_)
@@ -1587,6 +1546,8 @@ bool WebContents::IsCurrentlyAudible() {
 
 #if BUILDFLAG(ENABLE_PRINTING)
 void WebContents::Print(mate::Arguments* args) {
+  bool silent = false, print_background = false;
+  base::string16 device_name;
   mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate());
   base::DictionaryValue settings;
   if (args->Length() >= 1 && !args->GetNext(&options)) {
@@ -1598,123 +1559,11 @@ void WebContents::Print(mate::Arguments* args) {
     args->ThrowError("Invalid optional callback provided");
     return;
   }
-
-  // Set optional silent printing
-  bool silent = false;
   options.Get("silent", &silent);
-
-  // Set custom margin settings
-  mate::Dictionary margins;
-  if (options.Get("margins", &margins)) {
-    printing::MarginType margin_type = printing::DEFAULT_MARGINS;
-    margins.Get("marginType", &margin_type);
-    settings.SetInteger(printing::kSettingMarginsType, margin_type);
-
-    if (margin_type == printing::CUSTOM_MARGINS) {
-      int top = 0;
-      margins.Get("top", &top);
-      settings.SetInteger(printing::kSettingMarginTop, top);
-      int bottom = 0;
-      margins.Get("bottom", &bottom);
-      settings.SetInteger(printing::kSettingMarginBottom, bottom);
-      int left = 0;
-      margins.Get("left", &left);
-      settings.SetInteger(printing::kSettingMarginLeft, left);
-      int right = 0;
-      margins.Get("right", &right);
-      settings.SetInteger(printing::kSettingMarginRight, right);
-    }
-  } else {
-    settings.SetInteger(printing::kSettingMarginsType,
-                        printing::DEFAULT_MARGINS);
-  }
-
-  settings.SetBoolean(printing::kSettingHeaderFooterEnabled, false);
-
-  // Set whether to print color or greyscale
-  bool print_color = true;
-  options.Get("color", &print_color);
-  int color_setting = print_color ? printing::COLOR : printing::GRAY;
-  settings.SetInteger(printing::kSettingColor, color_setting);
-
-  bool landscape = false;
-  options.Get("landscape", &landscape);
-  settings.SetBoolean(printing::kSettingLandscape, landscape);
-
-  base::string16 device_name;
-  options.Get("deviceName", &device_name);
-  settings.SetString(printing::kSettingDeviceName, device_name);
-
-  int scale_factor = 100;
-  options.Get("scaleFactor", &scale_factor);
-  settings.SetInteger(printing::kSettingScaleFactor, scale_factor);
-
-  int pages_per_sheet = 1;
-  options.Get("pagesPerSheet", &pages_per_sheet);
-  settings.SetInteger(printing::kSettingPagesPerSheet, pages_per_sheet);
-
-  bool collate = true;
-  options.Get("collate", &collate);
-  settings.SetBoolean(printing::kSettingCollate, collate);
-
-  int copies = 1;
-  options.Get("copies", &copies);
-  settings.SetInteger(printing::kSettingCopies, copies);
-
-  bool print_background = false;
   options.Get("printBackground", &print_background);
-  settings.SetBoolean(printing::kSettingShouldPrintBackgrounds,
-                      print_background);
-
-  // For now we don't want to allow the user to enable these settings
-  // but we need to set them or a CHECK is hit.
-  settings.SetBoolean(printing::kSettingPrintToPDF, false);
-  settings.SetBoolean(printing::kSettingCloudPrintDialog, false);
-  settings.SetBoolean(printing::kSettingPrintWithPrivet, false);
-  settings.SetBoolean(printing::kSettingShouldPrintSelectionOnly, false);
-  settings.SetBoolean(printing::kSettingPrintWithExtension, false);
-  settings.SetBoolean(printing::kSettingRasterizePdf, false);
-
-  // Set custom page ranges to print
-  std::vector<mate::Dictionary> page_ranges;
-  if (options.Get("pageRanges", &page_ranges)) {
-    std::unique_ptr<base::ListValue> page_range_list(new base::ListValue());
-    for (size_t i = 0; i < page_ranges.size(); ++i) {
-      int from, to;
-      if (page_ranges[i].Get("from", &from) && page_ranges[i].Get("to", &to)) {
-        std::unique_ptr<base::DictionaryValue> range(
-            new base::DictionaryValue());
-        range->SetInteger(printing::kSettingPageRangeFrom, from);
-        range->SetInteger(printing::kSettingPageRangeTo, to);
-        page_range_list->Append(std::move(range));
-      } else {
-        continue;
-      }
-    }
-    if (page_range_list->GetSize() > 0)
-      settings.SetList(printing::kSettingPageRange, std::move(page_range_list));
+  if (options.Get("deviceName", &device_name) && !device_name.empty()) {
+    settings.SetString(printing::kSettingDeviceName, device_name);
   }
-
-  // Set custom duplex mode
-  printing::DuplexMode duplex_mode;
-  options.Get("duplexMode", &duplex_mode);
-  settings.SetInteger(printing::kSettingDuplexMode, duplex_mode);
-
-  // Set custom dots per inch (dpi)
-  mate::Dictionary dpi_settings;
-  int dpi = 72;
-  if (options.Get("dpi", &dpi_settings)) {
-    int horizontal = 72;
-    dpi_settings.Get("horizontal", &horizontal);
-    settings.SetInteger(printing::kSettingDpiHorizontal, horizontal);
-    int vertical = 72;
-    dpi_settings.Get("vertical", &vertical);
-    settings.SetInteger(printing::kSettingDpiVertical, vertical);
-  } else {
-    settings.SetInteger(printing::kSettingDpiHorizontal, dpi);
-    settings.SetInteger(printing::kSettingDpiVertical, dpi);
-  }
-
   auto* print_view_manager =
       printing::PrintViewManagerBasic::FromWebContents(web_contents());
   auto* focused_frame = web_contents()->GetFocusedFrame();
@@ -1860,7 +1709,7 @@ bool WebContents::IsFocused() const {
   if (!view)
     return false;
 
-  if (GetType() != Type::BACKGROUND_PAGE) {
+  if (GetType() != BACKGROUND_PAGE) {
     auto* window = web_contents()->GetNativeView()->GetToplevelWindow();
     if (window && !window->IsVisible())
       return false;
@@ -2092,7 +1941,7 @@ void WebContents::OnCursorChange(const content::WebCursor& cursor) {
 }
 
 bool WebContents::IsGuest() const {
-  return type_ == Type::WEB_VIEW;
+  return type_ == WEB_VIEW;
 }
 
 void WebContents::AttachToIframe(content::WebContents* embedder_web_contents,
@@ -2103,7 +1952,7 @@ void WebContents::AttachToIframe(content::WebContents* embedder_web_contents,
 
 bool WebContents::IsOffScreen() const {
 #if BUILDFLAG(ENABLE_OSR)
-  return type_ == Type::OFF_SCREEN;
+  return type_ == OFF_SCREEN;
 #else
   return false;
 #endif
@@ -2187,23 +2036,20 @@ double WebContents::GetZoomFactor() const {
   return content::ZoomLevelToZoomFactor(level);
 }
 
-void WebContents::SetTemporaryZoomLevel(double level) {
+void WebContents::OnSetTemporaryZoomLevel(content::RenderFrameHost* rfh,
+                                          double level,
+                                          IPC::Message* reply_msg) {
   zoom_controller_->SetTemporaryZoomLevel(level);
+  double new_level = zoom_controller_->GetZoomLevel();
+  AtomFrameHostMsg_SetTemporaryZoomLevel::WriteReplyParams(reply_msg,
+                                                           new_level);
+  rfh->Send(reply_msg);
 }
 
-void WebContents::DoGetZoomLevel(DoGetZoomLevelCallback callback) {
-  std::move(callback).Run(GetZoomLevel());
-}
-
-void WebContents::ShowAutofillPopup(const gfx::RectF& bounds,
-                                    const std::vector<base::string16>& values,
-                                    const std::vector<base::string16>& labels) {
-  content::RenderFrameHost* frame_host = bindings_.dispatch_context();
-  ShowAutofillPopup(frame_host, bounds, values, labels);
-}
-
-void WebContents::HideAutofillPopup() {
-  CommonWebContentsDelegate::HideAutofillPopup();
+void WebContents::OnGetZoomLevel(content::RenderFrameHost* rfh,
+                                 IPC::Message* reply_msg) {
+  AtomFrameHostMsg_GetZoomLevel::WriteReplyParams(reply_msg, GetZoomLevel());
+  rfh->Send(reply_msg);
 }
 
 v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
@@ -2306,7 +2152,7 @@ v8::Local<v8::Value> WebContents::DevToolsWebContents(v8::Isolate* isolate) {
 
 v8::Local<v8::Value> WebContents::Debugger(v8::Isolate* isolate) {
   if (debugger_.IsEmpty()) {
-    auto handle = electron::api::Debugger::Create(isolate, web_contents());
+    auto handle = atom::api::Debugger::Create(isolate, web_contents());
     debugger_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, debugger_);
@@ -2318,23 +2164,21 @@ void WebContents::GrantOriginAccess(const GURL& url) {
       url::Origin::Create(url));
 }
 
-v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
-    const base::FilePath& file_path) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void WebContents::TakeHeapSnapshot(const base::FilePath& file_path,
+                                   base::Callback<void(bool)> callback) {
   base::ThreadRestrictions::ScopedAllowIO allow_io;
+
   base::File file(file_path,
                   base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
   if (!file.IsValid()) {
-    promise.RejectWithErrorMessage("takeHeapSnapshot failed");
-    return handle;
+    std::move(callback).Run(false);
+    return;
   }
 
   auto* frame_host = web_contents()->GetMainFrame();
   if (!frame_host) {
-    promise.RejectWithErrorMessage("takeHeapSnapshot failed");
-    return handle;
+    std::move(callback).Run(false);
+    return;
   }
 
   // This dance with `base::Owned` is to ensure that the interface stays alive
@@ -2346,17 +2190,10 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
   auto* raw_ptr = electron_ptr.get();
   (*raw_ptr)->TakeHeapSnapshot(
       mojo::WrapPlatformFile(file.TakePlatformFile()),
-      base::BindOnce(
-          [](mojom::ElectronRendererAssociatedPtr* ep, util::Promise promise,
-             bool success) {
-            if (success) {
-              promise.Resolve();
-            } else {
-              promise.RejectWithErrorMessage("takeHeapSnapshot failed");
-            }
-          },
-          base::Owned(std::move(electron_ptr)), std::move(promise)));
-  return handle;
+      base::BindOnce([](mojom::ElectronRendererAssociatedPtr* ep,
+                        base::Callback<void(bool)> callback,
+                        bool success) { callback.Run(success); },
+                     base::Owned(std::move(electron_ptr)), callback));
 }
 
 // static
@@ -2369,8 +2206,6 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
                  &WebContents::SetBackgroundThrottling)
       .SetMethod("getProcessId", &WebContents::GetProcessID)
       .SetMethod("getOSProcessId", &WebContents::GetOSProcessID)
-      .SetMethod("_getOSProcessIdForFrame",
-                 &WebContents::GetOSProcessIdForFrame)
       .SetMethod("equal", &WebContents::Equal)
       .SetMethod("_loadURL", &WebContents::LoadURL)
       .SetMethod("downloadURL", &WebContents::DownloadURL)
@@ -2421,6 +2256,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription)
       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
       .SetMethod("startDrag", &WebContents::StartDrag)
+      .SetMethod("isGuest", &WebContents::IsGuest)
       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
       .SetMethod("detachFromOuterFrame", &WebContents::DetachFromOuterFrame)
       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
@@ -2463,7 +2299,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getWebRTCIPHandlingPolicy",
                  &WebContents::GetWebRTCIPHandlingPolicy)
       .SetMethod("_grantOriginAccess", &WebContents::GrantOriginAccess)
-      .SetMethod("takeHeapSnapshot", &WebContents::TakeHeapSnapshot)
+      .SetMethod("_takeHeapSnapshot", &WebContents::TakeHeapSnapshot)
       .SetProperty("id", &WebContents::ID)
       .SetProperty("session", &WebContents::Session)
       .SetProperty("hostWebContents", &WebContents::HostWebContents)
@@ -2514,11 +2350,11 @@ mate::Handle<WebContents> WebContents::FromOrCreate(
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
 namespace {
 
-using electron::api::WebContents;
+using atom::api::WebContents;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

atom/browser/api/atom_api_web_contents.h

@@ -2,14 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
-#define SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+#define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "atom/browser/api/frame_subscriber.h"
+#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 "base/observer_list.h"
 #include "base/observer_list_types.h"
 #include "content/common/cursors/webcursor.h"
@@ -18,21 +23,16 @@
 #include "content/public/browser/web_contents_binding_set.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/favicon_url.h"
+#include "electron/atom/common/api/api.mojom.h"
 #include "electron/buildflags/buildflags.h"
-#include "electron/shell/common/api/api.mojom.h"
 #include "native_mate/handle.h"
 #include "printing/buildflags/buildflags.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
-#include "shell/browser/api/frame_subscriber.h"
-#include "shell/browser/api/save_page_handler.h"
-#include "shell/browser/api/trackable_object.h"
-#include "shell/browser/common_web_contents_delegate.h"
-#include "shell/browser/ui/autofill_popup.h"
 #include "ui/gfx/image/image.h"
 
 #if BUILDFLAG(ENABLE_PRINTING)
+#include "atom/browser/printing/print_preview_message_handler.h"
 #include "printing/backend/print_backend.h"
-#include "shell/browser/printing/print_preview_message_handler.h"
 #endif
 
 namespace blink {
@@ -48,7 +48,7 @@ namespace network {
 class ResourceRequestBody;
 }
 
-namespace electron {
+namespace atom {
 
 class AtomBrowserContext;
 class AtomJavaScriptDialogManager;
@@ -69,8 +69,6 @@ class ExtendedWebContentsObserver : public base::CheckedObserver {
  public:
   virtual void OnCloseContents() {}
   virtual void OnRendererResponsive() {}
-  virtual void OnDraggableRegionsUpdated(
-      const std::vector<mojom::DraggableRegionPtr>& regions) {}
 
  protected:
   ~ExtendedWebContentsObserver() override {}
@@ -82,7 +80,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
                     public content::WebContentsObserver,
                     public mojom::ElectronBrowser {
  public:
-  enum class Type {
+  enum Type {
     BACKGROUND_PAGE,  // A DevTools extension background page.
     BROWSER_WINDOW,   // Used by BrowserWindow.
     BROWSER_VIEW,     // Used by BrowserView.
@@ -138,8 +136,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void SetBackgroundThrottling(bool allowed);
   int GetProcessID() const;
   base::ProcessId GetOSProcessID() const;
-  base::ProcessId GetOSProcessIdForFrame(const std::string& name,
-                                         const std::string& document_url) const;
   Type GetType() const;
   bool Equal(const WebContents* web_contents) const;
   void LoadURL(const GURL& url, const mate::Dictionary& options);
@@ -300,7 +296,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // the specified URL.
   void GrantOriginAccess(const GURL& url);
 
-  v8::Local<v8::Promise> TakeHeapSnapshot(const base::FilePath& file_path);
+  void TakeHeapSnapshot(const base::FilePath& file_path,
+                        base::Callback<void(bool)>);
 
   // Properties.
   int32_t ID() const;
@@ -375,7 +372,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;
-  void ContentsZoomChange(bool zoom_in) override;
   void EnterFullscreenModeForTab(
       content::WebContents* source,
       const GURL& origin,
@@ -440,6 +436,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   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;
@@ -477,6 +475,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
 #endif
 
  private:
+  struct FrameDispatchHelper;
   AtomBrowserContext* GetBrowserContext() const;
 
   // Binds the given request for the ElectronBrowser API. When the
@@ -496,9 +495,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void Message(bool internal,
                const std::string& channel,
                base::Value arguments) override;
-  void Invoke(const std::string& channel,
-              base::Value arguments,
-              InvokeCallback callback) override;
   void MessageSync(bool internal,
                    const std::string& channel,
                    base::Value arguments,
@@ -509,19 +505,16 @@ class WebContents : public mate::TrackableObject<WebContents>,
                  const std::string& channel,
                  base::Value arguments) override;
   void MessageHost(const std::string& channel, base::Value arguments) override;
-  void UpdateDraggableRegions(
-      std::vector<mojom::DraggableRegionPtr> regions) override;
-  void SetTemporaryZoomLevel(double level) override;
-  void DoGetZoomLevel(DoGetZoomLevelCallback callback) override;
-
-  void ShowAutofillPopup(const gfx::RectF& bounds,
-                         const std::vector<base::string16>& values,
-                         const std::vector<base::string16>& labels) override;
-  void HideAutofillPopup() override;
 
   // Called when we receive a CursorChange message from chromium.
   void OnCursorChange(const content::WebCursor& cursor);
 
+  // Called when received a synchronous message from renderer to
+  // set temporary zoom level.
+  void OnSetTemporaryZoomLevel(content::RenderFrameHost* frame_host,
+                               double level,
+                               IPC::Message* reply_msg);
+
   // Called when received a synchronous message from renderer to
   // get the zoom level.
   void OnGetZoomLevel(content::RenderFrameHost* frame_host,
@@ -545,7 +538,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   WebContentsZoomController* zoom_controller_ = nullptr;
 
   // The type of current WebContents.
-  Type type_ = Type::BROWSER_WINDOW;
+  Type type_ = BROWSER_WINDOW;
 
   // Request id used for findInPage request.
   uint32_t request_id_ = 0;
@@ -575,6 +568,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
 }  // namespace api
 
-}  // namespace electron
+}  // namespace atom
 
-#endif  // SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_