refactor: replace includes for atom with shell

.circleci/config.yml

@@ -261,7 +261,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/atom/common/api:mojo
+      gn check out/Default //electron/shell/common/api:mojo
 
 step-electron-build: &step-electron-build
   run:

BUILD.gn

@@ -40,7 +40,7 @@ if (is_linux) {
   }
 }
 
-branding = read_file("atom/app/BRANDING.json", "json")
+branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
 electron_mac_bundle_id = branding.mac_bundle_id
@@ -286,14 +286,14 @@ if (is_linux) {
 
 source_set("manifests") {
   sources = [
-    "//electron/atom/app/manifests.cc",
-    "//electron/atom/app/manifests.h",
+    "//electron/shell/app/manifests.cc",
+    "//electron/shell/app/manifests.h",
   ]
 
   include_dirs = [ "//electron" ]
 
   deps = [
-    "//electron/atom/common/api:mojo",
+    "//electron/shell/common/api:mojo",
     "//printing/buildflags",
     "//services/proxy_resolver/public/cpp:manifest",
     "//services/service_manager/public/cpp",
@@ -345,10 +345,10 @@ static_library("electron_lib") {
     ":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",
@@ -465,8 +465,8 @@ static_library("electron_lib") {
 
   if (enable_fake_location_provider) {
     sources += [
-      "atom/browser/fake_location_provider.cc",
-      "atom/browser/fake_location_provider.h",
+      "shell/browser/fake_location_provider.cc",
+      "shell/browser/fake_location_provider.h",
     ]
   }
 
@@ -476,15 +476,15 @@ static_library("electron_lib") {
       "//ui/accelerated_widget_mac",
     ]
     sources += [
-      "atom/browser/ui/views/autofill_popup_view.cc",
-      "atom/browser/ui/views/autofill_popup_view.h",
+      "shell/browser/ui/views/autofill_popup_view.cc",
+      "shell/browser/ui/views/autofill_popup_view.h",
     ]
     if (is_mas_build) {
-      sources += [ "atom/browser/api/atom_api_app_mas.mm" ]
+      sources += [ "shell/browser/api/atom_api_app_mas.mm" ]
       sources -= [
-        "atom/browser/auto_updater_mac.mm",
-        "atom/common/crash_reporter/crash_reporter_mac.h",
-        "atom/common/crash_reporter/crash_reporter_mac.mm",
+        "shell/browser/auto_updater_mac.mm",
+        "shell/common/crash_reporter/crash_reporter_mac.h",
+        "shell/common/crash_reporter/crash_reporter_mac.mm",
       ]
       defines += [ "MAS_BUILD" ]
     } else {
@@ -540,8 +540,8 @@ static_library("electron_lib") {
 
   if ((is_mac && !is_mas_build) || is_win) {
     sources += [
-      "atom/common/crash_reporter/crash_reporter_crashpad.cc",
-      "atom/common/crash_reporter/crash_reporter_crashpad.h",
+      "shell/common/crash_reporter/crash_reporter_crashpad.cc",
+      "shell/common/crash_reporter/crash_reporter_crashpad.h",
     ]
     deps += [ "//third_party/crashpad/crashpad/client" ]
   }
@@ -552,25 +552,25 @@ static_library("electron_lib") {
 
   if (enable_run_as_node) {
     sources += [
-      "atom/app/node_main.cc",
-      "atom/app/node_main.h",
+      "shell/app/node_main.cc",
+      "shell/app/node_main.h",
     ]
   }
 
   if (enable_osr) {
     sources += [
-      "atom/browser/osr/osr_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",
+      "shell/browser/osr/osr_host_display_client.cc",
+      "shell/browser/osr/osr_host_display_client.h",
+      "shell/browser/osr/osr_host_display_client_mac.mm",
+      "shell/browser/osr/osr_render_widget_host_view.cc",
+      "shell/browser/osr/osr_render_widget_host_view.h",
+      "shell/browser/osr/osr_video_consumer.cc",
+      "shell/browser/osr/osr_video_consumer.h",
+      "shell/browser/osr/osr_view_proxy.cc",
+      "shell/browser/osr/osr_view_proxy.h",
+      "shell/browser/osr/osr_web_contents_view.cc",
+      "shell/browser/osr/osr_web_contents_view.h",
+      "shell/browser/osr/osr_web_contents_view_mac.mm",
     ]
     deps += [
       "//components/viz/service",
@@ -586,36 +586,36 @@ static_library("electron_lib") {
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
     sources += [
-      "atom/browser/api/atom_api_desktop_capturer.cc",
-      "atom/browser/api/atom_api_desktop_capturer.h",
+      "shell/browser/api/atom_api_desktop_capturer.cc",
+      "shell/browser/api/atom_api_desktop_capturer.h",
     ]
   }
 
   if (enable_view_api) {
     sources += [
-      "atom/browser/api/views/atom_api_box_layout.cc",
-      "atom/browser/api/views/atom_api_box_layout.h",
-      "atom/browser/api/views/atom_api_button.cc",
-      "atom/browser/api/views/atom_api_button.h",
-      "atom/browser/api/views/atom_api_label_button.cc",
-      "atom/browser/api/views/atom_api_label_button.h",
-      "atom/browser/api/views/atom_api_layout_manager.cc",
-      "atom/browser/api/views/atom_api_layout_manager.h",
-      "atom/browser/api/views/atom_api_md_text_button.cc",
-      "atom/browser/api/views/atom_api_md_text_button.h",
-      "atom/browser/api/views/atom_api_resize_area.cc",
-      "atom/browser/api/views/atom_api_resize_area.h",
-      "atom/browser/api/views/atom_api_text_field.cc",
-      "atom/browser/api/views/atom_api_text_field.h",
+      "shell/browser/api/views/atom_api_box_layout.cc",
+      "shell/browser/api/views/atom_api_box_layout.h",
+      "shell/browser/api/views/atom_api_button.cc",
+      "shell/browser/api/views/atom_api_button.h",
+      "shell/browser/api/views/atom_api_label_button.cc",
+      "shell/browser/api/views/atom_api_label_button.h",
+      "shell/browser/api/views/atom_api_layout_manager.cc",
+      "shell/browser/api/views/atom_api_layout_manager.h",
+      "shell/browser/api/views/atom_api_md_text_button.cc",
+      "shell/browser/api/views/atom_api_md_text_button.h",
+      "shell/browser/api/views/atom_api_resize_area.cc",
+      "shell/browser/api/views/atom_api_resize_area.h",
+      "shell/browser/api/views/atom_api_text_field.cc",
+      "shell/browser/api/views/atom_api_text_field.h",
     ]
   }
 
   if (enable_basic_printing) {
     sources += [
-      "atom/browser/printing/print_preview_message_handler.cc",
-      "atom/browser/printing/print_preview_message_handler.h",
-      "atom/renderer/printing/print_render_frame_helper_delegate.cc",
-      "atom/renderer/printing/print_render_frame_helper_delegate.h",
+      "shell/browser/printing/print_preview_message_handler.cc",
+      "shell/browser/printing/print_preview_message_handler.h",
+      "shell/renderer/printing/print_render_frame_helper_delegate.cc",
+      "shell/renderer/printing/print_render_frame_helper_delegate.h",
     ]
   }
 
@@ -711,7 +711,7 @@ if (is_mac) {
     if (!is_mas_build) {
       deps += [ ":electron_crashpad_helper" ]
     }
-    info_plist = "atom/common/resources/mac/Info.plist"
+    info_plist = "shell/common/resources/mac/Info.plist"
 
     electron_version = read_file("ELECTRON_VERSION", "trim string")
     extra_substitutions = [
@@ -763,9 +763,9 @@ if (is_mac) {
     }
     defines = [ "HELPER_EXECUTABLE" ]
     sources = filenames.app_sources
-    sources += [ "atom/common/atom_constants.cc" ]
+    sources += [ "shell/common/atom_constants.cc" ]
     include_dirs = [ "." ]
-    info_plist = "atom/renderer/resources/mac/Info.plist"
+    info_plist = "shell/renderer/resources/mac/Info.plist"
     extra_substitutions =
         [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
     ldflags = [
@@ -806,7 +806,7 @@ if (is_mac) {
     sources = filenames.login_helper_sources
     include_dirs = [ "." ]
     libs = [ "AppKit.framework" ]
-    info_plist = "atom/app/resources/mac/loginhelper-Info.plist"
+    info_plist = "shell/app/resources/mac/loginhelper-Info.plist"
     extra_substitutions =
         [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
   }
@@ -860,7 +860,7 @@ if (is_mac) {
     ]
     sources = [
       "$root_out_dir/resources/default_app.asar",
-      "atom/browser/resources/mac/electron.icns",
+      "shell/browser/resources/mac/electron.icns",
     ]
     outputs = [
       "{{bundle_resources_dir}}/{{source_file_part}}",
@@ -870,7 +870,7 @@ if (is_mac) {
   mac_app_bundle("electron_app") {
     output_name = electron_product_name
     sources = filenames.app_sources
-    sources += [ "atom/common/atom_constants.cc" ]
+    sources += [ "shell/common/atom_constants.cc" ]
     include_dirs = [ "." ]
     deps = [
       ":electron_app_framework_bundle_data",
@@ -879,7 +879,7 @@ if (is_mac) {
     if (is_mas_build) {
       deps += [ ":electron_login_helper_app" ]
     }
-    info_plist = "atom/browser/resources/mac/Info.plist"
+    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",
@@ -893,8 +893,8 @@ if (is_mac) {
 } else {
   windows_manifest("electron_app_manifest") {
     sources = [
-      "atom/browser/resources/win/disable_window_filtering.manifest",
-      "atom/browser/resources/win/dpi_aware.manifest",
+      "shell/browser/resources/win/disable_window_filtering.manifest",
+      "shell/browser/resources/win/dpi_aware.manifest",
       as_invoker_manifest,
       common_controls_manifest,
       default_compatibility_manifest,
@@ -937,9 +937,9 @@ if (is_mac) {
     if (is_win) {
       sources += [
         # TODO: we should be generating our .rc files more like how chrome does
-        "atom/browser/resources/win/atom.ico",
-        "atom/browser/resources/win/atom.rc",
-        "atom/browser/resources/win/resource.h",
+        "shell/browser/resources/win/atom.ico",
+        "shell/browser/resources/win/atom.rc",
+        "shell/browser/resources/win/resource.h",
       ]
 
       libs = [

appveyor.yml

@@ -75,7 +75,7 @@ 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/atom/common/api:mojo
+  - gn check out/Default //electron/shell/common/api:mojo
   - ninja -C out/Default electron:electron_app
   - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default )  
   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -55,8 +55,8 @@
 
 #include <stddef.h>
 
-#include "atom/browser/browser.h"
-#include "atom/common/atom_command_line.h"
+#include "shell/browser/browser.h"
+#include "shell/common/atom_command_line.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"

chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc

@@ -4,11 +4,11 @@
 
 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
 
-#include "atom/browser/ui/views/global_menu_bar_x11.h"
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
+#include "shell/browser/ui/views/global_menu_bar_x11.h"
 
 using content::BrowserThread;
 

shell/app/atom_content_client.cc

@@ -2,12 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/app/atom_content_client.h"
+#include "shell/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"
@@ -17,6 +16,7 @@
 #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,8 +30,8 @@
 #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 atom {

shell/app/atom_library_main.mm

@@ -2,17 +2,17 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/app/atom_library_main.h"
+#include "shell/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[]) {
   atom::AtomMainDelegate delegate;

shell/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 "atom/app/atom_main.h"
+#include "shell/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"
-#else  // defined(OS_LINUX)
+#include "shell/app/atom_main_delegate.h"  // NOLINT
+#else                                      // defined(OS_LINUX)
 #include <mach-o/dyld.h>
 #include <unistd.h>
 #include <cstdio>
-#include "atom/app/atom_library_main.h"
+#include "shell/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

shell/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 "atom/app/atom_main_delegate.h"
+#include "shell/app/atom_main_delegate.h"
 
 #include <iostream>
 #include <memory>
@@ -12,15 +12,6 @@
 #include <glib.h>  // for g_setenv()
 #endif
 
-#include "atom/app/atom_content_client.h"
-#include "atom/browser/atom_browser_client.h"
-#include "atom/browser/atom_gpu_client.h"
-#include "atom/browser/feature_list.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"
@@ -33,18 +24,27 @@
 #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 defined(OS_MACOSX)
-#include "atom/app/atom_main_delegate_mac.h"
+#include "shell/app/atom_main_delegate_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #if defined(_WIN64)
-#include "atom/common/crash_reporter/crash_reporter_win.h"
+#include "shell/common/crash_reporter/crash_reporter_win.h"
 #endif
 #endif
 

shell/app/atom_main_delegate_mac.mm

@@ -2,13 +2,10 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/app/atom_main_delegate.h"
+#include "shell/app/atom_main_delegate.h"
 
 #include <string>
 
-#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"
@@ -17,6 +14,9 @@
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.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 atom {
 

shell/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 "atom/app/command_line_args.h"
+#include "shell/app/command_line_args.h"
 
 namespace {
 

shell/app/manifests.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 "atom/app/manifests.h"
+#include "shell/app/manifests.h"
 
 #include "base/no_destructor.h"
 #include "electron/atom/common/api/api.mojom.h"

shell/app/node_main.cc

@@ -2,19 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/app/node_main.h"
+#include "shell/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/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"
@@ -24,9 +16,17 @@
 #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 "atom/common/crash_reporter/crash_reporter_win.h"
+#include "shell/common/crash_reporter/crash_reporter_win.h"
 #endif
 
 namespace atom {

shell/app/uv_task_runner.cc

@@ -4,7 +4,7 @@
 
 #include <utility>
 
-#include "atom/app/uv_task_runner.h"
+#include "shell/app/uv_task_runner.h"
 
 #include "base/stl_util.h"
 

shell/browser/api/atom_api_app.cc

@@ -2,32 +2,11 @@
 // 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 "shell/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/once_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/environment.h"
 #include "base/files/file_path.h"
@@ -51,17 +30,38 @@
 #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 "atom/browser/ui/cocoa/atom_bundle_mover.h"
+#include "shell/browser/ui/cocoa/atom_bundle_mover.h"
 #endif
 
 using atom::Browser;

shell/browser/api/atom_api_app.h

@@ -11,13 +11,6 @@
 #include <utility>
 #include <vector>
 
-#include "atom/browser/api/event_emitter.h"
-#include "atom/browser/api/process_metric.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/task/cancelable_task_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/process_singleton.h"
@@ -29,6 +22,13 @@
 #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"

shell/browser/api/atom_api_app_mac.mm

@@ -2,10 +2,10 @@
 // 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>
 

shell/browser/api/atom_api_app_mas.mm

@@ -2,7 +2,7 @@
 // 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 "shell/browser/api/atom_api_app.h"
 
 #include <string>
 

shell/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 "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 "shell/browser/api/atom_api_auto_updater.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 {
 

shell/browser/api/atom_api_auto_updater.h

@@ -7,11 +7,11 @@
 
 #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 atom {
 

shell/browser/api/atom_api_browser_view.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 "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 "shell/browser/api/atom_api_browser_view.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 {

shell/browser/api/atom_api_browser_view.h

@@ -8,10 +8,10 @@
 #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;

shell/browser/api/atom_api_browser_window.cc

@@ -2,20 +2,10 @@
 // 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_browser_window.h"
+#include "shell/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/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
@@ -23,6 +13,16 @@
 #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 atom {

shell/browser/api/atom_api_browser_window.h

@@ -9,9 +9,9 @@
 #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 atom {
 

shell/browser/api/atom_api_browser_window_mac.mm

@@ -2,17 +2,17 @@
 // 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_browser_window.h"
+#include "shell/browser/api/atom_api_browser_window.h"
 
 #include <memory>
 #include <vector>
 
 #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 "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;

shell/browser/api/atom_api_browser_window_views.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/atom_api_browser_window.h"
+#include "shell/browser/api/atom_api_browser_window.h"
 
-#include "atom/browser/native_window_views.h"
+#include "shell/browser/native_window_views.h"
 
 namespace atom {
 

shell/browser/api/atom_api_content_tracing.cc

@@ -6,17 +6,17 @@
 #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;
 

shell/browser/api/atom_api_cookies.cc

@@ -2,16 +2,11 @@
 // 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 "shell/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/time/time.h"
 #include "base/values.h"
 #include "content/public/browser/browser_context.h"
@@ -25,6 +20,11 @@
 #include "net/cookies/cookie_util.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "shell/browser/atom_browser_context.h"
+#include "shell/browser/cookie_change_notifier.h"
+#include "shell/common/native_mate_converters/callback.h"
+#include "shell/common/native_mate_converters/gurl_converter.h"
+#include "shell/common/native_mate_converters/value_converter.h"
 
 using content::BrowserThread;
 

shell/browser/api/atom_api_cookies.h

@@ -8,12 +8,12 @@
 #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 "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;

shell/browser/api/atom_api_debugger.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 "atom/browser/api/atom_api_debugger.h"
+#include "shell/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;
 

shell/browser/api/atom_api_debugger.h

@@ -8,13 +8,13 @@
 #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;

shell/browser/api/atom_api_desktop_capturer.cc

@@ -2,15 +2,12 @@
 // 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_desktop_capturer.h"
+#include "shell/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"
@@ -18,6 +15,9 @@
 #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"
 

shell/browser/api/atom_api_desktop_capturer.h

@@ -9,10 +9,10 @@
 #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 atom {
 

shell/browser/api/atom_api_dialog.cc

@@ -6,20 +6,20 @@
 #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/message_box_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"
+#include "shell/browser/api/atom_api_browser_window.h"
+#include "shell/browser/native_window.h"
+#include "shell/browser/ui/certificate_trust.h"
+#include "shell/browser/ui/file_dialog.h"
+#include "shell/browser/ui/message_box.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/image_converter.h"
+#include "shell/common/native_mate_converters/message_box_converter.h"
+#include "shell/common/native_mate_converters/net_converter.h"
+#include "shell/common/node_includes.h"
+#include "shell/common/promise_util.h"
 
 namespace {
 

shell/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 "atom/browser/api/atom_api_download_item.h"
+#include "shell/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 {
 

shell/browser/api/atom_api_download_item.h

@@ -8,11 +8,11 @@
 #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 atom {

shell/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 {
 

shell/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 "atom/browser/api/atom_api_global_shortcut.h"
+#include "shell/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"

shell/browser/api/atom_api_global_shortcut.h

@@ -9,10 +9,10 @@
 #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 atom {

shell/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 "atom/browser/api/atom_api_in_app_purchase.h"
+#include "shell/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 {
 

shell/browser/api/atom_api_in_app_purchase.h

@@ -8,12 +8,12 @@
 #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 atom {
 

shell/browser/api/atom_api_menu.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 "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 "shell/browser/api/atom_api_menu.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 atom {
 

shell/browser/api/atom_api_menu.h

@@ -8,10 +8,10 @@
 #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 atom {
 

shell/browser/api/atom_api_menu_mac.h

@@ -5,12 +5,12 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
 #define ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
 
-#include "atom/browser/api/atom_api_menu.h"
+#include "shell/browser/api/atom_api_menu.h"
 
 #include <map>
 #include <string>
 
-#import "atom/browser/ui/cocoa/atom_menu_controller.h"
+#import "shell/browser/ui/cocoa/atom_menu_controller.h"
 
 using base::scoped_nsobject;
 

shell/browser/api/atom_api_menu_mac.mm

@@ -2,14 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#import "atom/browser/api/atom_api_menu_mac.h"
+#import "shell/browser/api/atom_api_menu_mac.h"
 
 #include <string>
 #include <utility>
 
-#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"
@@ -17,6 +14,9 @@
 #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;
 

shell/browser/api/atom_api_menu_views.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 "atom/browser/api/atom_api_menu_views.h"
+#include "shell/browser/api/atom_api_menu_views.h"
 
 #include <memory>
 
-#include "atom/browser/native_window_views.h"
-#include "atom/browser/unresponsive_suppressor.h"
+#include "shell/browser/native_window_views.h"
+#include "shell/browser/unresponsive_suppressor.h"
 #include "ui/display/screen.h"
 
 using views::MenuRunner;

shell/browser/api/atom_api_menu_views.h

@@ -8,8 +8,8 @@
 #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"
 

shell/browser/api/atom_api_net.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 "atom/browser/api/atom_api_net.h"
-#include "atom/browser/api/atom_api_url_request.h"
-#include "atom/common/node_includes.h"
+#include "shell/browser/api/atom_api_net.h"
 #include "native_mate/dictionary.h"
+#include "shell/browser/api/atom_api_url_request.h"
+#include "shell/common/node_includes.h"
 
 namespace atom {
 

shell/browser/api/atom_api_net.h

@@ -5,7 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_NET_H_
 #define ATOM_BROWSER_API_ATOM_API_NET_H_
 
-#include "atom/browser/api/event_emitter.h"
+#include "shell/browser/api/event_emitter.h"
 
 namespace atom {
 

shell/browser/api/atom_api_net_log.cc

@@ -2,15 +2,10 @@
 // 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 "shell/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"
@@ -19,6 +14,11 @@
 #include "native_mate/dictionary.h"
 #include "native_mate/handle.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "shell/browser/atom_browser_context.h"
+#include "shell/browser/net/system_network_context_manager.h"
+#include "shell/common/native_mate_converters/callback.h"
+#include "shell/common/native_mate_converters/file_path_converter.h"
+#include "shell/common/node_includes.h"
 
 namespace atom {
 

shell/browser/api/atom_api_net_log.h

@@ -9,13 +9,13 @@
 #include <memory>
 #include <string>
 
-#include "atom/browser/api/trackable_object.h"
-#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/optional.h"
 #include "base/values.h"
 #include "native_mate/handle.h"
 #include "services/network/public/mojom/net_log.mojom.h"
+#include "shell/browser/api/trackable_object.h"
+#include "shell/common/promise_util.h"
 
 namespace atom {
 

shell/browser/api/atom_api_notification.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 "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 "shell/browser/api/atom_api_notification.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 {

shell/browser/api/atom_api_notification.h

@@ -9,12 +9,12 @@
 #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 atom {

shell/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 "atom/browser/api/atom_api_power_monitor.h"
+#include "shell/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 <>

shell/browser/api/atom_api_power_monitor.h

@@ -5,10 +5,10 @@
 #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 atom {

shell/browser/api/atom_api_power_monitor_mac.mm

@@ -2,7 +2,7 @@
 // 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_power_monitor.h"
+#include "shell/browser/api/atom_api_power_monitor.h"
 
 #include <vector>
 

shell/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 "atom/browser/api/atom_api_power_monitor.h"
+#include "shell/browser/api/atom_api_power_monitor.h"
 
 #include <windows.h>
 #include <wtsapi32.h>

shell/browser/api/atom_api_power_save_blocker.cc

@@ -2,11 +2,10 @@
 // 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_power_save_blocker.h"
+#include "shell/browser/api/atom_api_power_save_blocker.h"
 
 #include <string>
 
-#include "atom/common/node_includes.h"
 #include "base/bind_helpers.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -16,6 +15,7 @@
 #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 {
 

shell/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 "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 "shell/browser/api/atom_api_protocol.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;

shell/browser/api/atom_api_protocol.h

@@ -11,10 +11,6 @@
 #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"
@@ -24,6 +20,10 @@
 #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;

shell/browser/api/atom_api_protocol_ns.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 "atom/browser/api/atom_api_protocol_ns.h"
+#include "shell/browser/api/atom_api_protocol_ns.h"
 
 #include <memory>
 #include <utility>
 
-#include "atom/browser/atom_browser_context.h"
-#include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/once_callback.h"
-#include "atom/common/promise_util.h"
 #include "base/stl_util.h"
+#include "shell/browser/atom_browser_context.h"
+#include "shell/common/native_mate_converters/net_converter.h"
+#include "shell/common/native_mate_converters/once_callback.h"
+#include "shell/common/promise_util.h"
 
 namespace atom {
 namespace api {

shell/browser/api/atom_api_protocol_ns.h

@@ -7,11 +7,11 @@
 
 #include <string>
 
-#include "atom/browser/api/trackable_object.h"
-#include "atom/browser/net/atom_url_loader_factory.h"
 #include "content/public/browser/content_browser_client.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/handle.h"
+#include "shell/browser/api/trackable_object.h"
+#include "shell/browser/net/atom_url_loader_factory.h"
 
 namespace atom {
 

shell/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 "atom/browser/api/atom_api_screen.h"
+#include "shell/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"

shell/browser/api/atom_api_screen.h

@@ -7,8 +7,8 @@
 
 #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"
 

shell/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 "atom/browser/api/atom_api_session.h"
+#include "shell/browser/api/atom_api_session.h"
 
 #include <map>
 #include <memory>
@@ -10,28 +10,6 @@
 #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_protocol_ns.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/net/system_network_context_manager.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 "atom/common/options_switches.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
@@ -62,6 +40,28 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.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;

shell/browser/api/atom_api_session.h

@@ -8,13 +8,13 @@
 #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;
 

shell/browser/api/atom_api_system_preferences.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 "atom/browser/api/atom_api_system_preferences.h"
+#include "shell/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"
 

shell/browser/api/atom_api_system_preferences.h

@@ -8,15 +8,15 @@
 #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 "atom/browser/browser.h"
-#include "atom/browser/browser_observer.h"
+#include "shell/browser/browser.h"
+#include "shell/browser/browser_observer.h"
 #include "ui/gfx/sys_color_change_listener.h"
 #endif
 

shell/browser/api/atom_api_system_preferences_mac.mm

@@ -2,7 +2,7 @@
 // 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_system_preferences.h"
+#include "shell/browser/api/atom_api_system_preferences.h"
 
 #include <map>
 #include <memory>
@@ -14,11 +14,6 @@
 #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"
@@ -28,6 +23,11 @@
 #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"
 
 namespace mate {
 template <>

shell/browser/api/atom_api_system_preferences_win.cc

@@ -5,10 +5,10 @@
 #include <dwmapi.h>
 #include <iomanip>
 
-#include "atom/browser/api/atom_api_system_preferences.h"
+#include "shell/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"

shell/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 "atom/browser/api/atom_api_top_level_window.h"
+#include "shell/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 "atom/browser/native_window_views.h"
+#include "shell/browser/native_window_views.h"
 #endif
 
 #if defined(OS_WIN)
-#include "atom/browser/ui/win/taskbar_host.h"
+#include "shell/browser/ui/win/taskbar_host.h"
 #include "ui/base/win/shell.h"
 #endif
 

shell/browser/api/atom_api_top_level_window.h

@@ -10,14 +10,14 @@
 #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 atom {
 

shell/browser/api/atom_api_tray.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 "atom/browser/api/atom_api_tray.h"
+#include "shell/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 {

shell/browser/api/atom_api_tray.h

@@ -9,10 +9,10 @@
 #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;

shell/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 "atom/browser/api/atom_api_url_request.h"
+#include "shell/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/gurl_converter.h"
-#include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/once_callback.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 {
 

shell/browser/api/atom_api_url_request.h

@@ -8,8 +8,6 @@
 #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"
@@ -18,6 +16,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 atom {
 

shell/browser/api/atom_api_view.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 "atom/browser/api/atom_api_view.h"
+#include "shell/browser/api/atom_api_view.h"
 
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
+#include "shell/common/node_includes.h"
 
 namespace atom {
 

shell/browser/api/atom_api_view.h

@@ -8,9 +8,9 @@
 #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 atom {

shell/browser/api/atom_api_web_contents.cc

@@ -2,51 +2,13 @@
 // 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_web_contents.h"
+#include "shell/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/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/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/map_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/once_callback.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"
@@ -79,12 +41,50 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
-#include "electron/atom/common/api/api.mojom.h"
+#include "electron/shell/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 "atom/browser/osr/osr_render_widget_host_view.h"
-#include "atom/browser/osr/osr_web_contents_view.h"
+#include "shell/browser/osr/osr_render_widget_host_view.h"
+#include "shell/browser/osr/osr_web_contents_view.h"
 #endif
 
 #if !defined(OS_MACOSX)

shell/browser/api/atom_api_web_contents.h

@@ -10,11 +10,6 @@
 #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"
@@ -23,16 +18,21 @@
 #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 {

shell/browser/api/atom_api_web_contents_impl.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 "atom/browser/api/atom_api_web_contents.h"
+#include "shell/browser/api/atom_api_web_contents.h"
 
 #include "content/browser/frame_host/frame_tree.h"           // nogncheck
 #include "content/browser/frame_host/frame_tree_node.h"      // nogncheck
@@ -10,8 +10,8 @@
 #include "content/public/browser/guest_mode.h"
 
 #if BUILDFLAG(ENABLE_OSR)
-#include "atom/browser/osr/osr_render_widget_host_view.h"
-#include "atom/browser/osr/osr_web_contents_view.h"
+#include "shell/browser/osr/osr_render_widget_host_view.h"
+#include "shell/browser/osr/osr_web_contents_view.h"
 #endif
 
 // Including both web_contents_impl.h and node.h would introduce a error, we

shell/browser/api/atom_api_web_contents_mac.mm

@@ -2,8 +2,8 @@
 // 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_web_contents.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "shell/browser/api/atom_api_web_contents.h"
 
 #import <Cocoa/Cocoa.h>
 

shell/browser/api/atom_api_web_contents_view.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 "atom/browser/api/atom_api_web_contents_view.h"
+#include "shell/browser/api/atom_api_web_contents_view.h"
 
-#include "atom/browser/api/atom_api_web_contents.h"
-#include "atom/browser/browser.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
-#include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "native_mate/dictionary.h"
+#include "shell/browser/api/atom_api_web_contents.h"
+#include "shell/browser/browser.h"
+#include "shell/browser/ui/inspectable_web_contents_view.h"
+#include "shell/common/api/constructor.h"
+#include "shell/common/node_includes.h"
 
 #if defined(OS_MACOSX)
-#include "atom/browser/ui/cocoa/delayed_native_view_host.h"
+#include "shell/browser/ui/cocoa/delayed_native_view_host.h"
 #endif
 
 namespace {

shell/browser/api/atom_api_web_contents_view.h

@@ -5,9 +5,9 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
 #define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
 
-#include "atom/browser/api/atom_api_view.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "native_mate/handle.h"
+#include "shell/browser/api/atom_api_view.h"
 
 namespace atom {
 

shell/browser/api/atom_api_web_request.cc

@@ -2,21 +2,21 @@
 // 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_web_request.h"
+#include "shell/browser/api/atom_api_web_request.h"
 
 #include <string>
 #include <utility>
 
-#include "atom/browser/atom_browser_context.h"
-#include "atom/browser/net/atom_network_delegate.h"
-#include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/once_callback.h"
-#include "atom/common/native_mate_converters/value_converter.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/dictionary.h"
 #include "native_mate/object_template_builder.h"
+#include "shell/browser/atom_browser_context.h"
+#include "shell/browser/net/atom_network_delegate.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/value_converter.h"
 
 using content::BrowserThread;
 

shell/browser/api/atom_api_web_request.h

@@ -5,10 +5,10 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
 #define ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
 
-#include "atom/browser/api/trackable_object.h"
-#include "atom/browser/net/atom_network_delegate.h"
 #include "native_mate/arguments.h"
 #include "native_mate/handle.h"
+#include "shell/browser/api/trackable_object.h"
+#include "shell/browser/net/atom_network_delegate.h"
 
 namespace atom {
 

shell/browser/api/atom_api_web_view_manager.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 "atom/browser/web_contents_preferences.h"
-#include "atom/browser/web_contents_zoom_controller.h"
-#include "atom/browser/web_view_manager.h"
-#include "atom/common/native_mate_converters/content_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
-#include "atom/common/options_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "native_mate/dictionary.h"
+#include "shell/browser/web_contents_preferences.h"
+#include "shell/browser/web_contents_zoom_controller.h"
+#include "shell/browser/web_view_manager.h"
+#include "shell/common/native_mate_converters/content_converter.h"
+#include "shell/common/native_mate_converters/value_converter.h"
+#include "shell/common/node_includes.h"
+#include "shell/common/options_switches.h"
 
 using atom::WebContentsPreferences;
 

shell/browser/api/event.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 "atom/browser/api/event.h"
+#include "shell/browser/api/event.h"
 
 #include <utility>
 
-#include "atom/common/native_mate_converters/string16_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "native_mate/object_template_builder.h"
+#include "shell/common/native_mate_converters/string16_converter.h"
+#include "shell/common/native_mate_converters/value_converter.h"
 
 namespace mate {
 

shell/browser/api/event.h

@@ -7,7 +7,7 @@
 
 #include "base/optional.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "electron/atom/common/api/api.mojom.h"
+#include "electron/shell/common/api/api.mojom.h"
 #include "native_mate/handle.h"
 #include "native_mate/wrappable.h"
 

shell/browser/api/event_emitter.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 "atom/browser/api/event_emitter.h"
+#include "shell/browser/api/event_emitter.h"
 
 #include <utility>
 
-#include "atom/browser/api/event.h"
-#include "atom/common/node_includes.h"
 #include "content/public/browser/render_frame_host.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
+#include "shell/browser/api/event.h"
+#include "shell/common/node_includes.h"
 #include "ui/events/event_constants.h"
 
 namespace mate {

shell/browser/api/event_emitter.h

@@ -8,11 +8,11 @@
 #include <utility>
 #include <vector>
 
-#include "atom/common/api/event_emitter_caller.h"
 #include "base/optional.h"
 #include "content/public/browser/browser_thread.h"
-#include "electron/atom/common/api/api.mojom.h"
+#include "electron/shell/common/api/api.mojom.h"
 #include "native_mate/wrappable.h"
+#include "shell/common/api/event_emitter_caller.h"
 
 namespace content {
 class RenderFrameHost;

shell/browser/api/frame_subscriber.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 "atom/browser/api/frame_subscriber.h"
+#include "shell/browser/api/frame_subscriber.h"
 
 #include <utility>
 
-#include "atom/common/native_mate_converters/gfx_converter.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "media/capture/mojom/video_capture_types.mojom.h"
+#include "shell/common/native_mate_converters/gfx_converter.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"

shell/browser/api/gpu_info_enumerator.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 "atom/browser/api/gpu_info_enumerator.h"
+#include "shell/browser/api/gpu_info_enumerator.h"
 
 #include <utility>
 

shell/browser/api/gpuinfo_manager.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 "atom/browser/api/gpuinfo_manager.h"
+#include "shell/browser/api/gpuinfo_manager.h"
 
 #include <utility>
 
-#include "atom/browser/api/gpu_info_enumerator.h"
 #include "base/memory/singleton.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/config/gpu_info_collector.h"
+#include "shell/browser/api/gpu_info_enumerator.h"
 
 namespace atom {
 

shell/browser/api/gpuinfo_manager.h

@@ -9,11 +9,11 @@
 #include <unordered_set>
 #include <vector>
 
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/promise_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"  // nogncheck
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
+#include "shell/common/native_mate_converters/value_converter.h"
+#include "shell/common/promise_util.h"
 
 namespace atom {
 

shell/browser/api/process_metric.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 "atom/browser/api/process_metric.h"
+#include "shell/browser/api/process_metric.h"
 
 #include <memory>
 #include <utility>

shell/browser/api/save_page_handler.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 "atom/browser/api/save_page_handler.h"
+#include "shell/browser/api/save_page_handler.h"
 
 #include <string>
 #include <utility>
 
-#include "atom/browser/atom_browser_context.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "content/public/browser/web_contents.h"
+#include "shell/browser/atom_browser_context.h"
 
 namespace atom {
 

shell/browser/api/save_page_handler.h

@@ -7,10 +7,10 @@
 
 #include <string>
 
-#include "atom/common/promise_util.h"
 #include "components/download/public/common/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/save_page_type.h"
+#include "shell/common/promise_util.h"
 #include "v8/include/v8.h"
 
 namespace base {

shell/browser/api/stream_subscriber.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 "atom/browser/api/stream_subscriber.h"
+#include "shell/browser/api/stream_subscriber.h"
 
 #include <string>
 
-#include "atom/browser/net/url_request_stream_job.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/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
+#include "shell/browser/net/url_request_stream_job.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 {