mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: replace includes for atom with shell

Browse source
This commit is contained in:
Samuel Attard 2019-06-19 13:46:59 -07:00 • committed by Samuel Attard
parent d7f07e8a80
commit 2160c1fcc9
458 changed files with 2031 additions and 2031 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/common/api/atom_api_asar.cc
View file

@ -6,14 +6,14 @@
#include <vector>
#include "atom/common/asar/archive.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 "native_mate/arguments.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
#include "native_mate/wrappable.h"
#include "shell/common/asar/archive.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"
#include "third_party/electron_node/src/node_native_module.h"
namespace {

8
shell/common/api/atom_api_clipboard.cc
View file

@ -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/common/api/atom_api_clipboard.h"
#include "shell/common/api/atom_api_clipboard.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/strings/utf_string_conversions.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 "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkPixmap.h"

2
shell/common/api/atom_api_clipboard_mac.mm
View file

@ -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/common/api/atom_api_clipboard.h"
#include "base/strings/sys_string_conversions.h"
#include "shell/common/api/atom_api_clipboard.h"
#include "ui/base/cocoa/find_pasteboard.h"
namespace atom {

6
shell/common/api/atom_api_command_line.cc
View file

@ -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/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/node_includes.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/strings/string_util.h"
#include "native_mate/converter.h"
#include "native_mate/dictionary.h"
#include "services/network/public/cpp/network_switches.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/native_mate_converters/string16_converter.h"
#include "shell/common/node_includes.h"
namespace {

10
shell/common/api/atom_api_crash_reporter.cc
View file

@ -5,15 +5,15 @@
#include <map>
#include <string>
#include "atom/common/crash_reporter/crash_reporter.h"
#include "atom/common/gin_util.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/map_converter.h"
#include "base/bind.h"
#include "gin/data_object_builder.h"
#include "gin/dictionary.h"
#include "shell/common/crash_reporter/crash_reporter.h"
#include "shell/common/gin_util.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/native_mate_converters/map_converter.h"
#include "atom/common/node_includes.h"
#include "shell/common/node_includes.h"
using crash_reporter::CrashReporter;

2
shell/common/api/atom_api_key_weak_map.h
View file

@ -5,10 +5,10 @@
#ifndef ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
#define ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
#include "atom/common/key_weak_map.h"
#include "native_mate/handle.h"
#include "native_mate/object_template_builder.h"
#include "native_mate/wrappable.h"
#include "shell/common/key_weak_map.h"
namespace atom {

16
shell/common/api/atom_api_native_image.cc
View file

@ -2,25 +2,25 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/api/atom_api_native_image.h"
#include "shell/common/api/atom_api_native_image.h"
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "atom/common/asar/asar_util.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/value_converter.h"
#include "atom/common/node_includes.h"
#include "base/files/file_util.h"
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "base/threading/thread_restrictions.h"
#include "native_mate/object_template_builder.h"
#include "net/base/data_url.h"
#include "shell/common/asar/asar_util.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/value_converter.h"
#include "shell/common/node_includes.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkPixelRef.h"
@ -34,8 +34,8 @@
#include "ui/gfx/image/image_util.h"
#if defined(OS_WIN)
#include "atom/common/asar/archive.h"
#include "base/win/scoped_gdi_object.h"
#include "shell/common/asar/archive.h"
#include "ui/gfx/icon_util.h"
#endif

2
shell/common/api/atom_api_native_image_mac.mm
View file

@ -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/common/api/atom_api_native_image.h"
#include "shell/common/api/atom_api_native_image.h"
#include <string>
#include <vector>

14
shell/common/api/atom_api_shell.cc
View file

@ -4,14 +4,14 @@
#include <string>
#include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/node_includes.h"
#include "atom/common/platform_util.h"
#include "atom/common/promise_util.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/gurl_converter.h"
#include "shell/common/native_mate_converters/string16_converter.h"
#include "shell/common/node_includes.h"
#include "shell/common/platform_util.h"
#include "shell/common/promise_util.h"
#if defined(OS_WIN)
#include "base/win/scoped_com_initializer.h"

12
shell/common/api/atom_api_v8_util.cc
View file

@ -5,14 +5,14 @@
#include <string>
#include <utility>
#include "atom/common/api/atom_api_key_weak_map.h"
#include "atom/common/api/remote_callback_freer.h"
#include "atom/common/api/remote_object_freer.h"
#include "atom/common/native_mate_converters/content_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/node_includes.h"
#include "base/hash/hash.h"
#include "native_mate/dictionary.h"
#include "shell/common/api/atom_api_key_weak_map.h"
#include "shell/common/api/remote_callback_freer.h"
#include "shell/common/api/remote_object_freer.h"
#include "shell/common/native_mate_converters/content_converter.h"
#include "shell/common/native_mate_converters/gurl_converter.h"
#include "shell/common/node_includes.h"
#include "url/origin.h"
#include "v8/include/v8-profiler.h"

18
shell/common/api/electron_bindings.cc
View file

@ -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/common/api/electron_bindings.h"
#include "shell/common/api/electron_bindings.h"
#include <algorithm>
#include <iostream>
@ -10,14 +10,6 @@
#include <utility>
#include <vector>
#include "atom/browser/browser.h"
#include "atom/common/api/locker.h"
#include "atom/common/application_info.h"
#include "atom/common/heap_snapshot.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/node_includes.h"
#include "atom/common/promise_util.h"
#include "base/logging.h"
#include "base/process/process.h"
#include "base/process/process_handle.h"
@ -29,6 +21,14 @@
#include "native_mate/dictionary.h"
#include "services/resource_coordinator/public/cpp/memory_instrumentation/global_memory_dump.h"
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
#include "shell/browser/browser.h"
#include "shell/common/api/locker.h"
#include "shell/common/application_info.h"
#include "shell/common/heap_snapshot.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/native_mate_converters/string16_converter.h"
#include "shell/common/node_includes.h"
#include "shell/common/promise_util.h"
#include "third_party/blink/renderer/platform/heap/process_heap.h" // nogncheck
namespace atom {

2
shell/common/api/electron_bindings.h
View file

@ -8,13 +8,13 @@
#include <list>
#include <memory>
#include "atom/common/promise_util.h"
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/scoped_refptr.h"
#include "base/process/process_metrics.h"
#include "base/strings/string16.h"
#include "native_mate/arguments.h"
#include "shell/common/promise_util.h"
#include "uv.h" // NOLINT(build/include)
#include "v8/include/v8.h"

6
shell/common/api/event_emitter_caller.cc
View file

@ -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/common/api/event_emitter_caller.h"
#include "shell/common/api/event_emitter_caller.h"
#include "atom/common/api/locker.h"
#include "atom/common/node_includes.h"
#include "shell/common/api/locker.h"
#include "shell/common/node_includes.h"
namespace mate {

2
shell/common/api/event_emitter_caller.h
View file

@ -8,8 +8,8 @@
#include <utility>
#include <vector>
#include "atom/common/native_mate_converters/string16_converter.h"
#include "native_mate/converter.h"
#include "shell/common/native_mate_converters/string16_converter.h"
namespace mate {

2
shell/common/api/features.cc
View file

@ -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/common/node_includes.h"
#include "electron/buildflags/buildflags.h"
#include "native_mate/dictionary.h"
#include "printing/buildflags/buildflags.h"
#include "shell/common/node_includes.h"
namespace {

2
shell/common/api/locker.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE.chromium file.
#include "atom/common/api/locker.h"
#include "shell/common/api/locker.h"
namespace mate {

2
shell/common/api/object_life_monitor.cc
View file

@ -3,7 +3,7 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/api/object_life_monitor.h"
#include "shell/common/api/object_life_monitor.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"

4
shell/common/api/remote_callback_freer.cc
View file

@ -2,13 +2,13 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/api/remote_callback_freer.h"
#include "shell/common/api/remote_callback_freer.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "electron/atom/common/api/api.mojom.h"
#include "electron/shell/common/api/api.mojom.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
namespace atom {

2
shell/common/api/remote_callback_freer.h
View file

@ -7,8 +7,8 @@
#include <string>
#include "atom/common/api/object_life_monitor.h"
#include "content/public/browser/web_contents_observer.h"
#include "shell/common/api/object_life_monitor.h"
namespace atom {

4
shell/common/api/remote_object_freer.cc
View file

@ -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/common/api/remote_object_freer.h"
#include "shell/common/api/remote_object_freer.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "content/public/renderer/render_frame.h"
#include "electron/atom/common/api/api.mojom.h"
#include "electron/shell/common/api/api.mojom.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/web/web_local_frame.h"

2
shell/common/api/remote_object_freer.h
View file

@ -8,7 +8,7 @@
#include <map>
#include <string>
#include "atom/common/api/object_life_monitor.h"
#include "shell/common/api/object_life_monitor.h"
namespace atom {

4
shell/common/application_info.cc
View file

@ -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/common/application_info.h"
#include "shell/common/application_info.h"
#include "atom/browser/browser.h"
#include "base/no_destructor.h"
#include "base/strings/stringprintf.h"
#include "chrome/common/chrome_version.h"
#include "content/public/common/user_agent.h"
#include "electron/electron_version.h"
#include "shell/browser/browser.h"
namespace atom {

2
shell/common/application_info.h
View file

@ -6,8 +6,8 @@
#define ATOM_COMMON_APPLICATION_INFO_H_
#if defined(OS_WIN)
#include "atom/browser/win/scoped_hstring.h"
#include "base/strings/string16.h"
#include "shell/browser/win/scoped_hstring.h"
#endif
#include <string>

4
shell/common/application_info_linux.cc
View file

@ -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/common/application_info.h"
#include "shell/common/application_info.h"
#include <gio/gdesktopappinfo.h>
#include <gio/gio.h>
@ -10,11 +10,11 @@
#include <memory>
#include <string>
#include "atom/common/platform_util.h"
#include "base/environment.h"
#include "base/logging.h"
#include "chrome/browser/ui/libgtkui/gtk_util.h"
#include "electron/electron_version.h"
#include "shell/common/platform_util.h"
namespace {

4
shell/common/application_info_mac.mm
View file

@ -2,13 +2,13 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#import "atom/common/application_info.h"
#import "shell/common/application_info.h"
#include <string>
#import "atom/common/mac/main_application_bundle.h"
#import "base/mac/foundation_util.h"
#import "base/strings/sys_string_conversions.h"
#import "shell/common/mac/main_application_bundle.h"
namespace atom {

4
shell/common/application_info_win.cc
View file

@ -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/common/application_info.h"
#include "shell/common/application_info.h"
#include <windows.h> // windows.h must be included first
@ -12,11 +12,11 @@
#include <memory>
#include "atom/browser/win/scoped_hstring.h"
#include "base/file_version_info.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "shell/browser/win/scoped_hstring.h"
namespace atom {

4
shell/common/asar/archive.cc
View file

@ -2,13 +2,12 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/asar/archive.h"
#include "shell/common/asar/archive.h"
#include <string>
#include <utility>
#include <vector>
#include "atom/common/asar/scoped_temporary_file.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
@ -18,6 +17,7 @@
#include "base/task/post_task.h"
#include "base/threading/thread_restrictions.h"
#include "base/values.h"
#include "shell/common/asar/scoped_temporary_file.h"
#if defined(OS_WIN)
#include <io.h>

4
shell/common/asar/asar_util.cc
View file

@ -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/common/asar/asar_util.h"
#include "shell/common/asar/asar_util.h"
#include <map>
#include <string>
#include "atom/common/asar/archive.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/lazy_instance.h"
#include "base/stl_util.h"
#include "base/threading/thread_local.h"
#include "shell/common/asar/archive.h"
namespace asar {

2
shell/common/asar/scoped_temporary_file.cc
View file

@ -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/common/asar/scoped_temporary_file.h"
#include "shell/common/asar/scoped_temporary_file.h"
#include <vector>

2
shell/common/atom_command_line.cc
View file

@ -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/common/atom_command_line.h"
#include "shell/common/atom_command_line.h"
#include "base/command_line.h"
#include "uv.h" // NOLINT(build/include)

2
shell/common/atom_constants.cc
View file

@ -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/common/atom_constants.h"
#include "shell/common/atom_constants.h"
namespace atom {

2
shell/common/color_util.cc
View file

@ -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/common/color_util.h"
#include "shell/common/color_util.h"
#include <vector>

10
shell/common/crash_reporter/crash_reporter.cc
View file

@ -2,14 +2,10 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/crash_reporter/crash_reporter.h"
#include "shell/common/crash_reporter/crash_reporter.h"
#include <memory>
#include "atom/browser/browser.h"
#include "atom/common/atom_constants.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/map_converter.h"
#include "base/command_line.h"
#include "base/environment.h"
#include "base/files/file_util.h"
@ -18,6 +14,10 @@
#include "base/threading/thread_restrictions.h"
#include "content/public/common/content_switches.h"
#include "electron/electron_version.h"
#include "shell/browser/browser.h"
#include "shell/common/atom_constants.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/native_mate_converters/map_converter.h"
namespace crash_reporter {

2
shell/common/crash_reporter/crash_reporter_crashpad.cc
View file

@ -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/common/crash_reporter/crash_reporter_crashpad.h"
#include "shell/common/crash_reporter/crash_reporter_crashpad.h"
#include <algorithm>
#include <memory>

2
shell/common/crash_reporter/crash_reporter_crashpad.h
View file

@ -10,9 +10,9 @@
#include <string>
#include <vector>
#include "atom/common/crash_reporter/crash_reporter.h"
#include "base/compiler_specific.h"
#include "base/strings/string_piece.h"
#include "shell/common/crash_reporter/crash_reporter.h"
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#include "third_party/crashpad/crashpad/client/simple_string_dictionary.h"

2
shell/common/crash_reporter/crash_reporter_linux.cc
View file

@ -3,7 +3,7 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/crash_reporter/crash_reporter_linux.h"
#include "shell/common/crash_reporter/crash_reporter_linux.h"
#include <sys/time.h>
#include <unistd.h>

4
shell/common/crash_reporter/crash_reporter_linux.h
View file

@ -8,9 +8,9 @@
#include <memory>
#include <string>
#include "atom/common/crash_reporter/crash_reporter.h"
#include "atom/common/crash_reporter/linux/crash_dump_handler.h"
#include "base/compiler_specific.h"
#include "shell/common/crash_reporter/crash_reporter.h"
#include "shell/common/crash_reporter/linux/crash_dump_handler.h"
namespace base {
template <typename T>

2
shell/common/crash_reporter/crash_reporter_mac.h
View file

@ -8,7 +8,7 @@
#include <memory>
#include <string>
#include "atom/common/crash_reporter/crash_reporter_crashpad.h"
#include "shell/common/crash_reporter/crash_reporter_crashpad.h"
namespace base {
template <typename T>

2
shell/common/crash_reporter/crash_reporter_mac.mm
View file

@ -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/common/crash_reporter/crash_reporter_mac.h"
#include "shell/common/crash_reporter/crash_reporter_mac.h"
#include <algorithm>
#include <map>

8
shell/common/crash_reporter/crash_reporter_win.cc
View file

@ -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/common/crash_reporter/crash_reporter_win.h"
#include "shell/common/crash_reporter/crash_reporter_win.h"
#include <memory>
#include <vector>
#include "atom/browser/ui/inspectable_web_contents_impl.h"
#include "atom/common/atom_constants.h"
#include "base/environment.h"
#include "base/memory/singleton.h"
#include "base/path_service.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "electron/atom/common/api/api.mojom.h"
#include "electron/shell/common/api/api.mojom.h"
#include "shell/browser/ui/inspectable_web_contents_impl.h"
#include "shell/common/atom_constants.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
#include "third_party/crashpad/crashpad/client/crashpad_info.h"

2
shell/common/crash_reporter/crash_reporter_win.h
View file

@ -8,7 +8,7 @@
#include <memory>
#include <string>
#include "atom/common/crash_reporter/crash_reporter_crashpad.h"
#include "shell/common/crash_reporter/crash_reporter_crashpad.h"
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
namespace base {

2
shell/common/crash_reporter/linux/crash_dump_handler.cc
View file

@ -6,7 +6,7 @@
// For linux_syscall_support.h. This makes it safe to call embedded system
// calls when in seccomp mode.
#include "atom/common/crash_reporter/linux/crash_dump_handler.h"
#include "shell/common/crash_reporter/linux/crash_dump_handler.h"
#include <poll.h>

2
shell/common/crash_reporter/win/crash_service.cc
View file

@ -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/common/crash_reporter/win/crash_service.h"
#include "shell/common/crash_reporter/win/crash_service.h"
#include <windows.h>

6
shell/common/crash_reporter/win/crash_service_main.cc
View file

@ -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/common/crash_reporter/win/crash_service_main.h"
#include "shell/common/crash_reporter/win/crash_service_main.h"
#include <string>
#include "atom/common/crash_reporter/crash_reporter.h"
#include "atom/common/crash_reporter/win/crash_service.h"
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "shell/common/crash_reporter/crash_reporter.h"
#include "shell/common/crash_reporter/win/crash_service.h"
#include "third_party/crashpad/crashpad/handler/handler_main.h"
namespace crash_service {

4
shell/common/deprecate_util.cc
View file

@ -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/common/deprecate_util.h"
#include "shell/common/deprecate_util.h"
#include "atom/common/native_mate_converters/callback.h"
#include "base/callback.h"
#include "native_mate/converter.h"
#include "native_mate/dictionary.h"
#include "shell/common/native_mate_converters/callback.h"
namespace atom {

2
shell/common/deprecate_util.h
View file

@ -7,7 +7,7 @@
#include <string>
#include "atom/common/node_includes.h"
#include "shell/common/node_includes.h"
namespace atom {

2
shell/common/heap_snapshot.cc
View file

@ -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/common/heap_snapshot.h"
#include "shell/common/heap_snapshot.h"
#include "v8/include/v8-profiler.h"

2
shell/common/keyboard_util.cc
View file

@ -4,9 +4,9 @@
#include <string>
#include "atom/common/keyboard_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "shell/common/keyboard_util.h"
#include "third_party/blink/public/platform/web_input_event.h"
#include "ui/events/event_constants.h"

2
shell/common/mac/main_application_bundle.mm
View file

@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE-CHROMIUM file.
#import "atom/common/mac/main_application_bundle.h"
#import "shell/common/mac/main_application_bundle.h"
#include "base/files/file_path.h"
#include "base/mac/bundle_locations.h"

2
shell/common/mouse_util.cc
View file

@ -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/common/mouse_util.h"
#include "shell/common/mouse_util.h"
#include <string>
using Cursor = blink::WebCursorInfo::Type;

4
shell/common/native_mate_converters/accelerator_converter.cc
View file

@ -2,11 +2,11 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/native_mate_converters/accelerator_converter.h"
#include "shell/common/native_mate_converters/accelerator_converter.h"
#include <string>
#include "atom/browser/ui/accelerator_util.h"
#include "shell/browser/ui/accelerator_util.h"
namespace mate {

4
shell/common/native_mate_converters/blink_converter.cc
View file

@ -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/common/native_mate_converters/blink_converter.h"
#include "shell/common/native_mate_converters/blink_converter.h"
#include <algorithm>
#include <string>
#include <vector>
#include "atom/common/keyboard_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "gin/converter.h"
#include "native_mate/dictionary.h"
#include "shell/common/keyboard_util.h"
#include "third_party/blink/public/platform/web_input_event.h"
#include "third_party/blink/public/platform/web_mouse_event.h"
#include "third_party/blink/public/platform/web_mouse_wheel_event.h"

2
shell/common/native_mate_converters/callback.cc
View file

@ -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/common/native_mate_converters/callback.h"
#include "shell/common/native_mate_converters/callback.h"
#include "base/stl_util.h"
#include "content/public/browser/browser_thread.h"

2
shell/common/native_mate_converters/callback.h
View file

@ -8,13 +8,13 @@
#include <utility>
#include <vector>
#include "atom/common/api/locker.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "native_mate/function_template.h"
#include "native_mate/scoped_persistent.h"
#include "shell/common/api/locker.h"
namespace mate {

18
shell/common/native_mate_converters/content_converter.cc
View file

@ -2,22 +2,22 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/native_mate_converters/content_converter.h"
#include "shell/common/native_mate_converters/content_converter.h"
#include <string>
#include <vector>
#include "atom/browser/api/atom_api_web_contents.h"
#include "atom/browser/web_contents_permission_helper.h"
#include "atom/common/native_mate_converters/blink_converter.h"
#include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/native_mate_converters/ui_base_types_converter.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/context_menu_params.h"
#include "native_mate/dictionary.h"
#include "shell/browser/api/atom_api_web_contents.h"
#include "shell/browser/web_contents_permission_helper.h"
#include "shell/common/native_mate_converters/blink_converter.h"
#include "shell/common/native_mate_converters/callback.h"
#include "shell/common/native_mate_converters/gurl_converter.h"
#include "shell/common/native_mate_converters/string16_converter.h"
#include "shell/common/native_mate_converters/ui_base_types_converter.h"
#include "shell/common/native_mate_converters/value_converter.h"
namespace {

8
shell/common/native_mate_converters/file_dialog_converter.cc
View file

@ -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/common/native_mate_converters/file_dialog_converter.h"
#include "shell/common/native_mate_converters/file_dialog_converter.h"
#include "atom/browser/api/atom_api_browser_window.h"
#include "atom/browser/ui/file_dialog.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "native_mate/dictionary.h"
#include "shell/browser/api/atom_api_browser_window.h"
#include "shell/browser/ui/file_dialog.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
namespace mate {

2
shell/common/native_mate_converters/file_dialog_converter.h
View file

@ -5,8 +5,8 @@
#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
#include "atom/browser/ui/file_dialog.h"
#include "native_mate/converter.h"
#include "shell/browser/ui/file_dialog.h"
namespace mate {

2
shell/common/native_mate_converters/file_path_converter.h
View file

@ -7,8 +7,8 @@
#include <string>
#include "atom/common/native_mate_converters/string16_converter.h"
#include "base/files/file_path.h"
#include "shell/common/native_mate_converters/string16_converter.h"
namespace gin {

2
shell/common/native_mate_converters/gfx_converter.cc
View file

@ -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/common/native_mate_converters/gfx_converter.h"
#include "shell/common/native_mate_converters/gfx_converter.h"
#include "native_mate/dictionary.h"
#include "ui/display/display.h"

6
shell/common/native_mate_converters/image_converter.cc
View file

@ -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/common/native_mate_converters/image_converter.h"
#include "shell/common/native_mate_converters/image_converter.h"
#include "atom/common/api/atom_api_native_image.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "shell/common/api/atom_api_native_image.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "ui/gfx/image/image_skia.h"
namespace mate {

8
shell/common/native_mate_converters/message_box_converter.cc
View file

@ -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/common/native_mate_converters/message_box_converter.h"
#include "shell/common/native_mate_converters/message_box_converter.h"
#include "atom/browser/api/atom_api_browser_window.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/image_converter.h"
#include "native_mate/dictionary.h"
#include "shell/browser/api/atom_api_browser_window.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/native_mate_converters/image_converter.h"
namespace mate {

2
shell/common/native_mate_converters/message_box_converter.h
View file

@ -5,8 +5,8 @@
#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
#include "atom/browser/ui/message_box.h"
#include "native_mate/converter.h"
#include "shell/browser/ui/message_box.h"
namespace mate {

10
shell/common/native_mate_converters/net_converter.cc
View file

@ -2,17 +2,13 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/native_mate_converters/net_converter.h"
#include "shell/common/native_mate_converters/net_converter.h"
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "atom/common/native_mate_converters/gurl_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 "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/values.h"
@ -26,6 +22,10 @@
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
#include "services/network/public/cpp/resource_request.h"
#include "shell/common/native_mate_converters/gurl_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 "storage/browser/blob/upload_blob_element_reader.h"
namespace mate {

4
shell/common/native_mate_converters/network_converter.cc
View file

@ -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/common/native_mate_converters/network_converter.h"
#include "shell/common/native_mate_converters/network_converter.h"
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "atom/common/native_mate_converters/value_converter.h"
#include "base/numerics/safe_conversions.h"
#include "native_mate/dictionary.h"
#include "services/network/public/cpp/resource_request_body.h"
#include "shell/common/native_mate_converters/value_converter.h"
namespace mate {

2
shell/common/native_mate_converters/once_callback.h
View file

@ -7,7 +7,7 @@
#include <utility>
#include "atom/common/native_mate_converters/callback.h"
#include "shell/common/native_mate_converters/callback.h"
namespace mate {

6
shell/common/native_mate_converters/v8_value_converter.cc
View file

@ -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/common/native_mate_converters/v8_value_converter.h"
#include "shell/common/native_mate_converters/v8_value_converter.h"
#include <map>
#include <memory>
@ -14,8 +14,8 @@
#include "base/values.h"
#include "native_mate/dictionary.h"
#include "atom/common/node_bindings.h"
#include "atom/common/node_includes.h"
#include "shell/common/node_bindings.h"
#include "shell/common/node_includes.h"
namespace atom {

4
shell/common/native_mate_converters/value_converter.cc
View file

@ -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/common/native_mate_converters/value_converter.h"
#include "shell/common/native_mate_converters/value_converter.h"
#include <memory>
#include "atom/common/native_mate_converters/v8_value_converter.h"
#include "base/values.h"
#include "shell/common/native_mate_converters/v8_value_converter.h"
namespace mate {

12
shell/common/node_bindings.cc
View file

@ -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/common/node_bindings.h"
#include "shell/common/node_bindings.h"
#include <algorithm>
#include <memory>
@ -10,11 +10,6 @@
#include <utility>
#include <vector>
#include "atom/common/api/event_emitter_caller.h"
#include "atom/common/api/locker.h"
#include "atom/common/atom_command_line.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/node_includes.h"
#include "base/base_paths.h"
#include "base/command_line.h"
#include "base/environment.h"
@ -28,6 +23,11 @@
#include "content/public/common/content_paths.h"
#include "electron/buildflags/buildflags.h"
#include "native_mate/dictionary.h"
#include "shell/common/api/event_emitter_caller.h"
#include "shell/common/api/locker.h"
#include "shell/common/atom_command_line.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/node_includes.h"
#define ELECTRON_BUILTIN_MODULES(V) \
V(atom_browser_app) \

2
shell/common/node_bindings_linux.cc
View file

@ -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/common/node_bindings_linux.h"
#include "shell/common/node_bindings_linux.h"
#include <sys/epoll.h>

2
shell/common/node_bindings_linux.h
View file

@ -5,8 +5,8 @@
#ifndef ATOM_COMMON_NODE_BINDINGS_LINUX_H_
#define ATOM_COMMON_NODE_BINDINGS_LINUX_H_
#include "atom/common/node_bindings.h"
#include "base/compiler_specific.h"
#include "shell/common/node_bindings.h"
namespace atom {

4
shell/common/node_bindings_mac.cc
View file

@ -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/common/node_bindings_mac.h"
#include "shell/common/node_bindings_mac.h"
#include <errno.h>
#include <sys/select.h>
@ -10,7 +10,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include "atom/common/node_includes.h"
#include "shell/common/node_includes.h"
namespace atom {

2
shell/common/node_bindings_mac.h
View file

@ -5,8 +5,8 @@
#ifndef ATOM_COMMON_NODE_BINDINGS_MAC_H_
#define ATOM_COMMON_NODE_BINDINGS_MAC_H_
#include "atom/common/node_bindings.h"
#include "base/compiler_specific.h"
#include "shell/common/node_bindings.h"
namespace atom {

2
shell/common/node_bindings_win.cc
View file

@ -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/common/node_bindings_win.h"
#include "shell/common/node_bindings_win.h"
#include <windows.h>

2
shell/common/node_bindings_win.h
View file

@ -5,8 +5,8 @@
#ifndef ATOM_COMMON_NODE_BINDINGS_WIN_H_
#define ATOM_COMMON_NODE_BINDINGS_WIN_H_
#include "atom/common/node_bindings.h"
#include "base/compiler_specific.h"
#include "shell/common/node_bindings.h"
namespace atom {

2
shell/common/options_switches.cc
View file

@ -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/common/options_switches.h"
#include "shell/common/options_switches.h"
namespace atom {

2
shell/common/platform_util_linux.cc
View file

@ -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/common/platform_util.h"
#include "shell/common/platform_util.h"
#include <stdio.h>

2
shell/common/platform_util_mac.mm
View file

@ -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/common/platform_util.h"
#include "shell/common/platform_util.h"
#include <string>
#include <utility>

2
shell/common/platform_util_win.cc
View file

@ -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/common/platform_util.h"
#include "shell/common/platform_util.h"
#include <windows.h> // windows.h must be included first

4
shell/common/promise_util.cc
View file

@ -4,8 +4,8 @@
#include <string>
#include "atom/common/api/locker.h"
#include "atom/common/promise_util.h"
#include "shell/common/api/locker.h"
#include "shell/common/promise_util.h"
namespace atom {

6
shell/common/promise_util.h
View file

@ -8,13 +8,13 @@
#include <string>
#include <utility>
#include "atom/common/api/locker.h"
#include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/once_callback.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/converter.h"
#include "shell/common/api/locker.h"
#include "shell/common/native_mate_converters/callback.h"
#include "shell/common/native_mate_converters/once_callback.h"
namespace atom {