diff --git a/shell/app/electron_content_client.cc b/shell/app/electron_content_client.cc index a7962dbbfa3e..4b195f505c3b 100644 --- a/shell/app/electron_content_client.cc +++ b/shell/app/electron_content_client.cc @@ -11,10 +11,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" -#include "base/path_service.h" #include "base/strings/string_split.h" -#include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" #include "content/public/common/content_constants.h" #include "content/public/common/content_switches.h" #include "electron/buildflags/buildflags.h" diff --git a/shell/app/electron_crash_reporter_client.cc b/shell/app/electron_crash_reporter_client.cc index ff05bda23c96..6a01219030a9 100644 --- a/shell/app/electron_crash_reporter_client.cc +++ b/shell/app/electron_crash_reporter_client.cc @@ -7,13 +7,10 @@ #include #include -#include "base/command_line.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/path_service.h" -#include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h" diff --git a/shell/app/electron_crash_reporter_client.h b/shell/app/electron_crash_reporter_client.h index 5944d1559b97..81228ea82105 100644 --- a/shell/app/electron_crash_reporter_client.h +++ b/shell/app/electron_crash_reporter_client.h @@ -8,7 +8,6 @@ #include #include -#include "base/compiler_specific.h" #include "base/no_destructor.h" #include "build/build_config.h" #include "components/crash/core/app/crash_reporter_client.h" diff --git a/shell/app/electron_library_main.h b/shell/app/electron_library_main.h index 1e09d33eb4ba..25e8a73f09e0 100644 --- a/shell/app/electron_library_main.h +++ b/shell/app/electron_library_main.h @@ -6,7 +6,6 @@ #define ELECTRON_SHELL_APP_ELECTRON_LIBRARY_MAIN_H_ #include "build/build_config.h" -#include "electron/buildflags/buildflags.h" #if BUILDFLAG(IS_MAC) extern "C" { diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc index a6f30149b496..7baf1bd10771 100644 --- a/shell/app/electron_main_delegate.cc +++ b/shell/app/electron_main_delegate.cc @@ -18,7 +18,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/strings/string_split.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "components/content_settings/core/common/content_settings_pattern.h" diff --git a/shell/app/electron_main_linux.cc b/shell/app/electron_main_linux.cc index 37e78c40302e..1a6a2b06a09b 100644 --- a/shell/app/electron_main_linux.cc +++ b/shell/app/electron_main_linux.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/i18n/icu_util.h" #include "content/public/app/content_main.h" -#include "electron/buildflags/buildflags.h" #include "electron/fuses.h" #include "shell/app/electron_main_delegate.h" // NOLINT #include "shell/app/node_main.h" diff --git a/shell/app/electron_main_mac.cc b/shell/app/electron_main_mac.cc index 7f53b449873c..b91c3c27bafe 100644 --- a/shell/app/electron_main_mac.cc +++ b/shell/app/electron_main_mac.cc @@ -5,7 +5,6 @@ #include #include -#include "electron/buildflags/buildflags.h" #include "electron/fuses.h" #include "shell/app/electron_library_main.h" #include "shell/app/uv_stdio_fix.h" diff --git a/shell/app/electron_main_win.cc b/shell/app/electron_main_win.cc index e78efc18a5b4..c205a00b3d42 100644 --- a/shell/app/electron_main_win.cc +++ b/shell/app/electron_main_win.cc @@ -17,7 +17,6 @@ #include #include "base/at_exit.h" -#include "base/environment.h" #include "base/i18n/icu_util.h" #include "base/memory/raw_ptr_exclusion.h" #include "base/process/launch.h" diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc index 61a3ad4d8c0e..1010471a55ba 100644 --- a/shell/app/node_main.cc +++ b/shell/app/node_main.cc @@ -16,8 +16,6 @@ #include "base/containers/fixed_flat_set.h" #include "base/environment.h" #include "base/feature_list.h" -#include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "content/public/common/content_switches.h" diff --git a/shell/app/uv_task_runner.cc b/shell/app/uv_task_runner.cc index 24bcf863bfa8..e8cfc22860d7 100644 --- a/shell/app/uv_task_runner.cc +++ b/shell/app/uv_task_runner.cc @@ -5,7 +5,6 @@ #include #include "base/location.h" -#include "base/stl_util.h" #include "base/time/time.h" #include "shell/app/uv_task_runner.h" diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc index b9ab944b8de0..59a25af90012 100644 --- a/shell/browser/api/electron_api_app.cc +++ b/shell/browser/api/electron_api_app.cc @@ -70,6 +70,7 @@ #include "shell/common/gin_converters/file_path_converter.h" #include "shell/common/gin_converters/gurl_converter.h" #include "shell/common/gin_converters/image_converter.h" +#include "shell/common/gin_converters/login_item_settings_converter.h" #include "shell/common/gin_converters/net_converter.h" #include "shell/common/gin_converters/value_converter.h" #include "shell/common/gin_helper/dictionary.h" diff --git a/shell/browser/api/electron_api_auto_updater.cc b/shell/browser/api/electron_api_auto_updater.cc index 387fda264de3..b487cdaec1e6 100644 --- a/shell/browser/api/electron_api_auto_updater.cc +++ b/shell/browser/api/electron_api_auto_updater.cc @@ -5,7 +5,6 @@ #include "shell/browser/api/electron_api_auto_updater.h" #include "base/time/time.h" -#include "shell/browser/browser.h" #include "shell/browser/javascript_environment.h" #include "shell/browser/native_window.h" #include "shell/browser/window_list.h" diff --git a/shell/browser/api/electron_api_crash_reporter.cc b/shell/browser/api/electron_api_crash_reporter.cc index 846bd185600d..aa293ab1ee1b 100644 --- a/shell/browser/api/electron_api_crash_reporter.cc +++ b/shell/browser/api/electron_api_crash_reporter.cc @@ -10,7 +10,6 @@ #include #include -#include "base/command_line.h" #include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/path_service.h" diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc index 83b3ea90048c..e40e7b75939e 100644 --- a/shell/browser/api/electron_api_data_pipe_holder.cc +++ b/shell/browser/api/electron_api_data_pipe_holder.cc @@ -7,7 +7,6 @@ #include #include -#include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" diff --git a/shell/browser/api/electron_api_debugger.h b/shell/browser/api/electron_api_debugger.h index deda78c6cd28..c2c669b8c3e7 100644 --- a/shell/browser/api/electron_api_debugger.h +++ b/shell/browser/api/electron_api_debugger.h @@ -12,7 +12,6 @@ #include "base/values.h" #include "content/public/browser/devtools_agent_host_client.h" #include "content/public/browser/web_contents_observer.h" -#include "gin/arguments.h" #include "gin/handle.h" #include "gin/wrappable.h" #include "shell/browser/event_emitter_mixin.h" @@ -23,6 +22,10 @@ class DevToolsAgentHost; class WebContents; } // namespace content +namespace gin { +class Arguments; +} // namespace gin + namespace electron::api { class Debugger : public gin::Wrappable, diff --git a/shell/browser/api/electron_api_global_shortcut.cc b/shell/browser/api/electron_api_global_shortcut.cc index da142825be71..1aea6a676050 100644 --- a/shell/browser/api/electron_api_global_shortcut.cc +++ b/shell/browser/api/electron_api_global_shortcut.cc @@ -7,8 +7,6 @@ #include #include "base/containers/contains.h" -#include "base/stl_util.h" -#include "base/strings/utf_string_conversions.h" #include "extensions/common/command.h" #include "gin/dictionary.h" #include "gin/object_template_builder.h" diff --git a/shell/browser/api/electron_api_menu.h b/shell/browser/api/electron_api_menu.h index c12fda7e9353..d18babaaa830 100644 --- a/shell/browser/api/electron_api_menu.h +++ b/shell/browser/api/electron_api_menu.h @@ -10,13 +10,16 @@ #include "base/functional/callback.h" #include "base/memory/raw_ptr.h" -#include "gin/arguments.h" #include "shell/browser/api/electron_api_base_window.h" #include "shell/browser/event_emitter_mixin.h" #include "shell/browser/ui/electron_menu_model.h" #include "shell/common/gin_helper/constructible.h" #include "shell/common/gin_helper/pinnable.h" +namespace gin { +class Arguments; +} // namespace gin + namespace electron::api { class Menu : public gin::Wrappable, diff --git a/shell/browser/api/electron_api_menu_mac.mm b/shell/browser/api/electron_api_menu_mac.mm index 2473953ddd9b..c07a4264a477 100644 --- a/shell/browser/api/electron_api_menu_mac.mm +++ b/shell/browser/api/electron_api_menu_mac.mm @@ -12,7 +12,6 @@ #include "base/task/current_thread.h" #include "base/task/sequenced_task_runner.h" #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/common/keyboard_util.h" diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc index 413983e214f1..3235f51ac927 100644 --- a/shell/browser/api/electron_api_native_theme.cc +++ b/shell/browser/api/electron_api_native_theme.cc @@ -13,7 +13,6 @@ #include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/object_template_builder.h" #include "shell/common/node_includes.h" -#include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" namespace electron::api { diff --git a/shell/browser/api/electron_api_notification.cc b/shell/browser/api/electron_api_notification.cc index 9d329fe9a000..99de6e9a8031 100644 --- a/shell/browser/api/electron_api_notification.cc +++ b/shell/browser/api/electron_api_notification.cc @@ -4,7 +4,6 @@ #include "shell/browser/api/electron_api_notification.h" -#include "base/strings/utf_string_conversions.h" #include "base/uuid.h" #include "gin/handle.h" #include "shell/browser/api/electron_api_menu.h" diff --git a/shell/browser/api/electron_api_notification.h b/shell/browser/api/electron_api_notification.h index eabe2eec6122..4e0944456a08 100644 --- a/shell/browser/api/electron_api_notification.h +++ b/shell/browser/api/electron_api_notification.h @@ -9,7 +9,6 @@ #include #include "base/memory/raw_ptr.h" -#include "base/strings/utf_string_conversions.h" #include "gin/wrappable.h" #include "shell/browser/event_emitter_mixin.h" #include "shell/browser/notifications/notification.h" diff --git a/shell/browser/api/electron_api_power_monitor_win.cc b/shell/browser/api/electron_api_power_monitor_win.cc index a7f1acfdf077..3e408c118230 100644 --- a/shell/browser/api/electron_api_power_monitor_win.cc +++ b/shell/browser/api/electron_api_power_monitor_win.cc @@ -10,6 +10,7 @@ #include "base/win/windows_types.h" #include "base/win/wrapped_window_proc.h" #include "content/public/browser/browser_task_traits.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/win/shell.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/shell/browser/api/electron_api_protocol.cc b/shell/browser/api/electron_api_protocol.cc index c4d055e8cdc7..ed1652fdbfdb 100644 --- a/shell/browser/api/electron_api_protocol.cc +++ b/shell/browser/api/electron_api_protocol.cc @@ -8,7 +8,6 @@ #include #include "base/command_line.h" -#include "base/stl_util.h" #include "content/common/url_schemes.h" #include "content/public/browser/child_process_security_policy.h" #include "gin/object_template_builder.h" diff --git a/shell/browser/api/electron_api_protocol.h b/shell/browser/api/electron_api_protocol.h index 7db7b66c3ce1..43143a695ede 100644 --- a/shell/browser/api/electron_api_protocol.h +++ b/shell/browser/api/electron_api_protocol.h @@ -15,6 +15,10 @@ #include "shell/browser/net/electron_url_loader_factory.h" #include "shell/common/gin_helper/constructible.h" +namespace gin { +class Arguments; +} // namespace gin + namespace electron { class ElectronBrowserContext; diff --git a/shell/browser/api/electron_api_screen.cc b/shell/browser/api/electron_api_screen.cc index c008edd808df..3a4065e3e2bc 100644 --- a/shell/browser/api/electron_api_screen.cc +++ b/shell/browser/api/electron_api_screen.cc @@ -8,7 +8,6 @@ #include #include "base/functional/bind.h" -#include "gin/dictionary.h" #include "gin/handle.h" #include "shell/browser/browser.h" #include "shell/common/gin_converters/callback_converter.h" diff --git a/shell/browser/api/electron_api_service_worker_context.cc b/shell/browser/api/electron_api_service_worker_context.cc index 43d51b7b308e..814ab8cb3e7c 100644 --- a/shell/browser/api/electron_api_service_worker_context.cc +++ b/shell/browser/api/electron_api_service_worker_context.cc @@ -19,7 +19,6 @@ #include "shell/common/gin_converters/gurl_converter.h" #include "shell/common/gin_converters/value_converter.h" #include "shell/common/gin_helper/dictionary.h" -#include "shell/common/gin_helper/function_template_extensions.h" #include "shell/common/node_includes.h" namespace electron::api { diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc index d161a29a2bdf..4266a8de1450 100644 --- a/shell/browser/api/electron_api_session.cc +++ b/shell/browser/api/electron_api_session.cc @@ -16,7 +16,6 @@ #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/shell/browser/api/electron_api_session.h b/shell/browser/api/electron_api_session.h index 70972f83d005..40d55c98f38a 100644 --- a/shell/browser/api/electron_api_session.h +++ b/shell/browser/api/electron_api_session.h @@ -10,6 +10,7 @@ #include #include "base/memory/raw_ptr.h" +#include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "content/public/browser/download_manager.h" @@ -23,7 +24,6 @@ #include "shell/common/gin_helper/cleaned_up_at_exit.h" #include "shell/common/gin_helper/constructible.h" #include "shell/common/gin_helper/error_thrower.h" -#include "shell/common/gin_helper/function_template_extensions.h" #include "shell/common/gin_helper/pinnable.h" #include "shell/common/gin_helper/promise.h" diff --git a/shell/browser/api/electron_api_system_preferences.cc b/shell/browser/api/electron_api_system_preferences.cc index 14594d9790df..a9dc69d9ae58 100644 --- a/shell/browser/api/electron_api_system_preferences.cc +++ b/shell/browser/api/electron_api_system_preferences.cc @@ -7,11 +7,8 @@ #include "shell/common/gin_converters/callback_converter.h" #include "shell/common/gin_converters/value_converter.h" #include "shell/common/gin_helper/dictionary.h" -#include "shell/common/gin_helper/function_template_extensions.h" #include "shell/common/node_includes.h" #include "ui/gfx/animation/animation.h" -#include "ui/gfx/color_utils.h" -#include "ui/native_theme/native_theme.h" namespace electron::api { diff --git a/shell/browser/api/electron_api_system_preferences_mac.mm b/shell/browser/api/electron_api_system_preferences_mac.mm index f68806867fb4..424ba6b67d83 100644 --- a/shell/browser/api/electron_api_system_preferences_mac.mm +++ b/shell/browser/api/electron_api_system_preferences_mac.mm @@ -14,7 +14,6 @@ #include "base/apple/scoped_cftyperef.h" #include "base/containers/flat_map.h" -#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h" @@ -28,7 +27,6 @@ #include "shell/common/node_includes.h" #include "shell/common/process_util.h" #include "skia/ext/skia_utils_mac.h" -#include "ui/native_theme/native_theme.h" namespace gin { diff --git a/shell/browser/api/electron_api_tray.cc b/shell/browser/api/electron_api_tray.cc index eaadc4b51ac7..c0357be64e2a 100644 --- a/shell/browser/api/electron_api_tray.cc +++ b/shell/browser/api/electron_api_tray.cc @@ -20,9 +20,7 @@ #include "shell/common/gin_converters/guid_converter.h" #include "shell/common/gin_converters/image_converter.h" #include "shell/common/gin_helper/dictionary.h" -#include "shell/common/gin_helper/function_template_extensions.h" #include "shell/common/node_includes.h" -#include "ui/gfx/image/image.h" namespace gin { diff --git a/shell/browser/api/electron_api_utility_process.cc b/shell/browser/api/electron_api_utility_process.cc index 72f34216b427..0d02fd3adad4 100644 --- a/shell/browser/api/electron_api_utility_process.cc +++ b/shell/browser/api/electron_api_utility_process.cc @@ -19,7 +19,6 @@ #include "content/public/common/result_codes.h" #include "gin/handle.h" #include "gin/object_template_builder.h" -#include "gin/wrappable.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "shell/browser/api/message_port.h" #include "shell/browser/javascript_environment.h" diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 7e2c4c0ef56d..bf9f51d7a319 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -22,7 +22,6 @@ #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h index 328f567009d5..c1321d1b314b 100644 --- a/shell/browser/api/electron_api_web_contents.h +++ b/shell/browser/api/electron_api_web_contents.h @@ -52,7 +52,6 @@ #include "shell/common/gin_helper/pinnable.h" #include "ui/base/cursor/cursor.h" #include "ui/base/models/image_model.h" -#include "ui/gfx/image/image.h" #if BUILDFLAG(ENABLE_PRINTING) #include "components/printing/browser/print_to_pdf/pdf_print_result.h" diff --git a/shell/browser/api/electron_api_web_request.cc b/shell/browser/api/electron_api_web_request.cc index 0ad852279adf..d58a6e4d4c24 100644 --- a/shell/browser/api/electron_api_web_request.cc +++ b/shell/browser/api/electron_api_web_request.cc @@ -12,7 +12,6 @@ #include "base/containers/contains.h" #include "base/containers/fixed_flat_map.h" #include "base/memory/raw_ptr.h" -#include "base/stl_util.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "extensions/browser/api/web_request/web_request_resource_type.h" diff --git a/shell/browser/api/electron_api_web_request.h b/shell/browser/api/electron_api_web_request.h index 64444585358b..f0294cc3ff34 100644 --- a/shell/browser/api/electron_api_web_request.h +++ b/shell/browser/api/electron_api_web_request.h @@ -9,9 +9,7 @@ #include #include "base/memory/raw_ptr.h" -#include "base/values.h" #include "extensions/common/url_pattern.h" -#include "gin/arguments.h" #include "gin/handle.h" #include "gin/wrappable.h" #include "shell/browser/net/web_request_api_interface.h" @@ -20,6 +18,10 @@ namespace content { class BrowserContext; } +namespace gin { +class Arguments; +} + namespace electron::api { class WebRequest : public gin::Wrappable, public WebRequestAPI { diff --git a/shell/browser/api/gpuinfo_manager.cc b/shell/browser/api/gpuinfo_manager.cc index 735b360bd20f..2e6490852760 100644 --- a/shell/browser/api/gpuinfo_manager.cc +++ b/shell/browser/api/gpuinfo_manager.cc @@ -8,7 +8,6 @@ #include "base/memory/singleton.h" #include "base/task/single_thread_task_runner.h" -#include "content/public/browser/browser_thread.h" #include "gpu/config/gpu_info_collector.h" #include "shell/browser/api/gpu_info_enumerator.h" #include "shell/common/gin_converters/value_converter.h" diff --git a/shell/browser/badging/badge_manager_factory.cc b/shell/browser/badging/badge_manager_factory.cc index bf3a8437fd13..7f5047cf7d81 100644 --- a/shell/browser/badging/badge_manager_factory.cc +++ b/shell/browser/badging/badge_manager_factory.cc @@ -6,7 +6,6 @@ #include "base/functional/bind.h" #include "base/memory/ptr_util.h" -#include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "shell/browser/badging/badge_manager.h" diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.h b/shell/browser/bluetooth/electron_bluetooth_delegate.h index f0fef90e0124..a5c90f50a6c5 100644 --- a/shell/browser/bluetooth/electron_bluetooth_delegate.h +++ b/shell/browser/bluetooth/electron_bluetooth_delegate.h @@ -11,8 +11,6 @@ #include #include "base/memory/weak_ptr.h" -#include "base/observer_list.h" -#include "base/scoped_observation.h" #include "content/public/browser/bluetooth_delegate.h" #include "content/public/browser/render_frame_host.h" #include "third_party/blink/public/mojom/bluetooth/web_bluetooth.mojom-forward.h" diff --git a/shell/browser/browser.cc b/shell/browser/browser.cc index be2fe4423922..8680c04f008d 100644 --- a/shell/browser/browser.cc +++ b/shell/browser/browser.cc @@ -9,7 +9,6 @@ #include #include "base/files/file_util.h" -#include "base/no_destructor.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" @@ -22,6 +21,7 @@ #include "shell/browser/window_list.h" #include "shell/common/application_info.h" #include "shell/common/electron_paths.h" +#include "shell/common/gin_converters/login_item_settings_converter.h" #include "shell/common/gin_helper/arguments.h" #include "shell/common/thread_restrictions.h" diff --git a/shell/browser/browser.h b/shell/browser/browser.h index b349d65eb946..d554fb0e008c 100644 --- a/shell/browser/browser.h +++ b/shell/browser/browser.h @@ -10,14 +10,11 @@ #include #include -#include "base/compiler_specific.h" #include "base/observer_list.h" #include "base/task/cancelable_task_tracker.h" #include "base/values.h" -#include "gin/dictionary.h" #include "shell/browser/browser_observer.h" #include "shell/browser/window_list_observer.h" -#include "shell/common/gin_converters/login_item_settings_converter.h" #include "shell/common/gin_helper/promise.h" #if BUILDFLAG(IS_WIN) diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm index 1320d8dc40c0..a388fc6d3a1b 100644 --- a/shell/browser/browser_mac.mm +++ b/shell/browser/browser_mac.mm @@ -30,7 +30,6 @@ #include "shell/common/application_info.h" #include "shell/common/gin_converters/image_converter.h" #include "shell/common/gin_converters/login_item_settings_converter.h" -#include "shell/common/gin_helper/arguments.h" #include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/error_thrower.h" #include "shell/common/gin_helper/promise.h" diff --git a/shell/browser/browser_process_impl.h b/shell/browser/browser_process_impl.h index 373baddd7ce5..fc02158f28b6 100644 --- a/shell/browser/browser_process_impl.h +++ b/shell/browser/browser_process_impl.h @@ -13,7 +13,6 @@ #include #include -#include "base/command_line.h" #include "chrome/browser/browser_process.h" #include "components/embedder_support/origin_trials/origin_trials_settings_storage.h" #include "components/prefs/pref_service.h" diff --git a/shell/browser/browser_win.cc b/shell/browser/browser_win.cc index 6f8315c32f22..077a786280cb 100644 --- a/shell/browser/browser_win.cc +++ b/shell/browser/browser_win.cc @@ -38,7 +38,6 @@ #include "shell/common/gin_converters/file_path_converter.h" #include "shell/common/gin_converters/image_converter.h" #include "shell/common/gin_converters/login_item_settings_converter.h" -#include "shell/common/gin_helper/arguments.h" #include "shell/common/gin_helper/dictionary.h" #include "shell/common/skia_util.h" #include "shell/common/thread_restrictions.h" diff --git a/shell/browser/certificate_manager_model.h b/shell/browser/certificate_manager_model.h index afb0eeb23176..d4bdbbf3a282 100644 --- a/shell/browser/certificate_manager_model.h +++ b/shell/browser/certificate_manager_model.h @@ -10,7 +10,6 @@ #include "base/functional/callback.h" #include "base/memory/raw_ptr.h" -#include "base/memory/ref_counted.h" #include "net/cert/nss_cert_database.h" // CertificateManagerModel provides the data to be displayed in the certificate diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc index e31e6117d42f..f713437fabd2 100644 --- a/shell/browser/electron_browser_client.cc +++ b/shell/browser/electron_browser_client.cc @@ -16,15 +16,11 @@ #include "base/debug/crash_logging.h" #include "base/environment.h" #include "base/files/file_util.h" -#include "base/json/json_reader.h" #include "base/no_destructor.h" #include "base/path_service.h" -#include "base/stl_util.h" #include "base/strings/escape.h" -#include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc index ee0f1feb7b8a..5882e0d78bdf 100644 --- a/shell/browser/electron_browser_main_parts.cc +++ b/shell/browser/electron_browser_main_parts.cc @@ -19,7 +19,6 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/ui/color/chrome_color_mixers.h" diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h index fdcfb6c0629a..00366dc24461 100644 --- a/shell/browser/electron_browser_main_parts.h +++ b/shell/browser/electron_browser_main_parts.h @@ -11,7 +11,6 @@ #include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" -#include "base/timer/timer.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_main_parts.h" #include "electron/buildflags/buildflags.h" diff --git a/shell/browser/electron_browser_main_parts_mac.mm b/shell/browser/electron_browser_main_parts_mac.mm index 96fbc62b9dfc..975853b2f542 100644 --- a/shell/browser/electron_browser_main_parts_mac.mm +++ b/shell/browser/electron_browser_main_parts_mac.mm @@ -8,7 +8,6 @@ #include "base/apple/bundle_locations.h" #include "base/apple/foundation_util.h" -#include "base/path_service.h" #include "services/device/public/cpp/geolocation/geolocation_system_permission_manager.h" #include "services/device/public/cpp/geolocation/system_geolocation_source_apple.h" #include "shell/browser/browser_process_impl.h" diff --git a/shell/browser/electron_browser_main_parts_posix.cc b/shell/browser/electron_browser_main_parts_posix.cc index 35fa02d317df..a13cd8afb9dd 100644 --- a/shell/browser/electron_browser_main_parts_posix.cc +++ b/shell/browser/electron_browser_main_parts_posix.cc @@ -14,11 +14,11 @@ #include #include +#include "base/compiler_specific.h" #include "base/debug/leak_annotations.h" #include "base/posix/eintr_wrapper.h" #include "base/threading/platform_thread.h" #include "content/public/browser/browser_task_traits.h" -#include "content/public/browser/browser_thread.h" #include "shell/browser/browser.h" namespace electron { diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h index 49336cd672b6..9c6ff7af309a 100644 --- a/shell/browser/electron_permission_manager.h +++ b/shell/browser/electron_permission_manager.h @@ -11,7 +11,6 @@ #include "base/containers/id_map.h" #include "base/functional/callback.h" #include "content/public/browser/permission_controller_delegate.h" -#include "gin/dictionary.h" #include "shell/browser/electron_browser_context.h" #include "shell/common/gin_helper/dictionary.h" diff --git a/shell/browser/electron_web_ui_controller_factory.cc b/shell/browser/electron_web_ui_controller_factory.cc index b28807c9dd2e..21a2fb6790cc 100644 --- a/shell/browser/electron_web_ui_controller_factory.cc +++ b/shell/browser/electron_web_ui_controller_factory.cc @@ -4,10 +4,10 @@ #include "shell/browser/electron_web_ui_controller_factory.h" +#include "base/memory/singleton.h" #include "chrome/common/webui_url_constants.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_controller.h" -#include "electron/buildflags/buildflags.h" #include "shell/browser/ui/devtools_ui.h" #include "shell/browser/ui/webui/accessibility_ui.h" diff --git a/shell/browser/extended_web_contents_observer.h b/shell/browser/extended_web_contents_observer.h index 6ebb7db390b3..7868244cb8d3 100644 --- a/shell/browser/extended_web_contents_observer.h +++ b/shell/browser/extended_web_contents_observer.h @@ -6,11 +6,12 @@ #define ELECTRON_SHELL_BROWSER_EXTENDED_WEB_CONTENTS_OBSERVER_H_ #include -#include -#include "base/observer_list.h" #include "electron/shell/common/api/api.mojom.h" -#include "ui/gfx/geometry/rect.h" + +namespace gfx { +class Rect; +} namespace electron { diff --git a/shell/browser/extensions/api/extension_action/extension_action_api.cc b/shell/browser/extensions/api/extension_action/extension_action_api.cc index 6fc338166133..19d2be3c105b 100644 --- a/shell/browser/extensions/api/extension_action/extension_action_api.cc +++ b/shell/browser/extensions/api/extension_action/extension_action_api.cc @@ -11,7 +11,6 @@ #include "base/functional/bind.h" #include "base/no_destructor.h" -#include "base/observer_list.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_util.h" diff --git a/shell/browser/extensions/api/extension_action/extension_action_api.h b/shell/browser/extensions/api/extension_action/extension_action_api.h index 62fadaf4fb35..1d2931c2e7d1 100644 --- a/shell/browser/extensions/api/extension_action/extension_action_api.h +++ b/shell/browser/extensions/api/extension_action/extension_action_api.h @@ -8,8 +8,6 @@ #include #include "base/memory/raw_ptr.h" -#include "base/observer_list.h" -#include "base/values.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_action.h" #include "extensions/browser/extension_function.h" diff --git a/shell/browser/extensions/api/management/electron_management_api_delegate.cc b/shell/browser/extensions/api/management/electron_management_api_delegate.cc index 0a19528e6be5..6e20758ab91b 100644 --- a/shell/browser/extensions/api/management/electron_management_api_delegate.cc +++ b/shell/browser/extensions/api/management/electron_management_api_delegate.cc @@ -10,7 +10,6 @@ #include #include "base/functional/bind.h" -#include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/extension_metrics.h" diff --git a/shell/browser/extensions/api/resources_private/resources_private_api.cc b/shell/browser/extensions/api/resources_private/resources_private_api.cc index e9d3c26f49cc..c2ab5bf5f93d 100644 --- a/shell/browser/extensions/api/resources_private/resources_private_api.cc +++ b/shell/browser/extensions/api/resources_private/resources_private_api.cc @@ -14,7 +14,6 @@ #include "components/strings/grit/components_strings.h" #include "components/zoom/page_zoom_constants.h" #include "electron/buildflags/buildflags.h" -#include "printing/buildflags/buildflags.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" diff --git a/shell/browser/extensions/api/scripting/scripting_api.cc b/shell/browser/extensions/api/scripting/scripting_api.cc index ac7da18f0792..a5977a70de39 100644 --- a/shell/browser/extensions/api/scripting/scripting_api.cc +++ b/shell/browser/extensions/api/scripting/scripting_api.cc @@ -15,7 +15,6 @@ #include "base/types/optional_util.h" #include "chrome/common/extensions/api/scripting.h" #include "content/public/browser/browser_task_traits.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "extensions/browser/extension_api_frame_id_map.h" diff --git a/shell/browser/extensions/electron_component_extension_resource_manager.cc b/shell/browser/extensions/electron_component_extension_resource_manager.cc index ead79a5a6da9..34f664ec51d8 100644 --- a/shell/browser/extensions/electron_component_extension_resource_manager.cc +++ b/shell/browser/extensions/electron_component_extension_resource_manager.cc @@ -8,9 +8,7 @@ #include #include "base/containers/contains.h" -#include "base/logging.h" #include "base/path_service.h" -#include "base/stl_util.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h" diff --git a/shell/browser/extensions/electron_extension_loader.h b/shell/browser/extensions/electron_extension_loader.h index 16d3a13663d9..1e22adada968 100644 --- a/shell/browser/extensions/electron_extension_loader.h +++ b/shell/browser/extensions/electron_extension_loader.h @@ -10,7 +10,6 @@ #include "base/functional/callback.h" #include "base/memory/raw_ptr.h" -#include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "extensions/browser/extension_registrar.h" #include "extensions/common/extension_id.h" diff --git a/shell/browser/extensions/electron_extension_system.cc b/shell/browser/extensions/electron_extension_system.cc index 66f43b700be0..a550db631cb2 100644 --- a/shell/browser/extensions/electron_extension_system.cc +++ b/shell/browser/extensions/electron_extension_system.cc @@ -10,7 +10,6 @@ #include #include "base/files/file_path.h" -#include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/path_service.h" @@ -33,7 +32,6 @@ #include "extensions/browser/service_worker_manager.h" #include "extensions/browser/user_script_manager.h" #include "extensions/common/constants.h" -#include "extensions/common/file_util.h" #include "shell/browser/extensions/electron_extension_loader.h" #if BUILDFLAG(ENABLE_PDF_VIEWER) diff --git a/shell/browser/extensions/electron_extension_system.h b/shell/browser/extensions/electron_extension_system.h index d91ce936158b..6b20f9f354af 100644 --- a/shell/browser/extensions/electron_extension_system.h +++ b/shell/browser/extensions/electron_extension_system.h @@ -8,9 +8,7 @@ #include #include -#include "base/compiler_specific.h" #include "base/memory/raw_ptr.h" -#include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/one_shot_event.h" #include "components/value_store/value_store_factory.h" diff --git a/shell/browser/extensions/electron_extensions_browser_client.h b/shell/browser/extensions/electron_extensions_browser_client.h index f29b541c1dd4..135d348a2749 100644 --- a/shell/browser/extensions/electron_extensions_browser_client.h +++ b/shell/browser/extensions/electron_extensions_browser_client.h @@ -9,7 +9,6 @@ #include #include -#include "base/compiler_specific.h" #include "build/build_config.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/kiosk/kiosk_delegate.h" diff --git a/shell/browser/extensions/electron_messaging_delegate.cc b/shell/browser/extensions/electron_messaging_delegate.cc index 487515f12f75..a534759a0b51 100644 --- a/shell/browser/extensions/electron_messaging_delegate.cc +++ b/shell/browser/extensions/electron_messaging_delegate.cc @@ -8,7 +8,6 @@ #include #include "base/functional/callback.h" -#include "base/logging.h" #include "base/values.h" #include "build/build_config.h" #include "components/prefs/pref_service.h" diff --git a/shell/browser/extensions/electron_process_manager_delegate.cc b/shell/browser/extensions/electron_process_manager_delegate.cc index db3e9bb027a1..ce9df4a07100 100644 --- a/shell/browser/extensions/electron_process_manager_delegate.cc +++ b/shell/browser/extensions/electron_process_manager_delegate.cc @@ -6,7 +6,6 @@ #include "shell/browser/extensions/electron_process_manager_delegate.h" #include "base/command_line.h" -#include "base/logging.h" #include "base/one_shot_event.h" #include "build/build_config.h" #include "content/public/browser/notification_service.h" diff --git a/shell/browser/extensions/electron_process_manager_delegate.h b/shell/browser/extensions/electron_process_manager_delegate.h index f99e18d11fb0..f7cbadee47d3 100644 --- a/shell/browser/extensions/electron_process_manager_delegate.h +++ b/shell/browser/extensions/electron_process_manager_delegate.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_PROCESS_MANAGER_DELEGATE_H_ #define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_PROCESS_MANAGER_DELEGATE_H_ -#include "base/compiler_specific.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/process_manager_delegate.h" diff --git a/shell/browser/file_select_helper.cc b/shell/browser/file_select_helper.cc index 7798be96778d..154886c75133 100644 --- a/shell/browser/file_select_helper.cc +++ b/shell/browser/file_select_helper.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/memory/ptr_util.h" -#include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h" diff --git a/shell/browser/file_select_helper.h b/shell/browser/file_select_helper.h index 7ade0b04d394..c5604b521bae 100644 --- a/shell/browser/file_select_helper.h +++ b/shell/browser/file_select_helper.h @@ -9,9 +9,7 @@ #include #include -#include "base/compiler_specific.h" #include "base/memory/raw_ptr.h" -#include "base/scoped_observation.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_widget_host.h" diff --git a/shell/browser/file_system_access/file_system_access_permission_context.cc b/shell/browser/file_system_access/file_system_access_permission_context.cc index 0ffa1b9f2723..85c258da8658 100644 --- a/shell/browser/file_system_access/file_system_access_permission_context.cc +++ b/shell/browser/file_system_access/file_system_access_permission_context.cc @@ -13,7 +13,6 @@ #include "base/path_service.h" #include "base/task/thread_pool.h" #include "base/time/time.h" -#include "base/timer/timer.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/file_system_access/chrome_file_system_access_permission_context.h" // nogncheck diff --git a/shell/browser/font_defaults.cc b/shell/browser/font_defaults.cc index 018d7d6f0f55..a551b3d8d95d 100644 --- a/shell/browser/font_defaults.cc +++ b/shell/browser/font_defaults.cc @@ -8,7 +8,6 @@ #include #include -#include "base/stl_util.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/pref_names.h" diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc index 8cd163dbb27a..35f0cf115ec9 100644 --- a/shell/browser/hid/electron_hid_delegate.cc +++ b/shell/browser/hid/electron_hid_delegate.cc @@ -7,7 +7,6 @@ #include #include -#include "base/command_line.h" #include "base/containers/contains.h" #include "base/scoped_observation.h" #include "chrome/common/chrome_features.h" diff --git a/shell/browser/hid/hid_chooser_context.cc b/shell/browser/hid/hid_chooser_context.cc index fa0d02562ab0..34dc9092e47a 100644 --- a/shell/browser/hid/hid_chooser_context.cc +++ b/shell/browser/hid/hid_chooser_context.cc @@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/map_util.h" -#include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/shell/browser/hid/hid_chooser_controller.cc b/shell/browser/hid/hid_chooser_controller.cc index 3e9fa6c4144f..e547720e5700 100644 --- a/shell/browser/hid/hid_chooser_controller.cc +++ b/shell/browser/hid/hid_chooser_controller.cc @@ -21,7 +21,6 @@ #include "shell/common/gin_converters/content_converter.h" #include "shell/common/gin_converters/hid_device_info_converter.h" #include "shell/common/gin_converters/value_converter.h" -#include "shell/common/gin_helper/dictionary.h" #include "shell/common/node_includes.h" #include "shell/common/process_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/shell/browser/linux/unity_service.cc b/shell/browser/linux/unity_service.cc index afff6ad83f14..65cb52e3e0e0 100644 --- a/shell/browser/linux/unity_service.cc +++ b/shell/browser/linux/unity_service.cc @@ -9,7 +9,6 @@ #include -#include "base/environment.h" #include "base/nix/xdg_util.h" // Unity data typedefs. diff --git a/shell/browser/login_handler.h b/shell/browser/login_handler.h index 1f229baaa37d..b4456703fffa 100644 --- a/shell/browser/login_handler.h +++ b/shell/browser/login_handler.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_BROWSER_LOGIN_HANDLER_H_ #define ELECTRON_SHELL_BROWSER_LOGIN_HANDLER_H_ -#include "base/values.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/login_delegate.h" #include "content/public/browser/web_contents_observer.h" diff --git a/shell/browser/mac/electron_application_delegate.mm b/shell/browser/mac/electron_application_delegate.mm index 9102fa1bf1e3..953e480890ec 100644 --- a/shell/browser/mac/electron_application_delegate.mm +++ b/shell/browser/mac/electron_application_delegate.mm @@ -11,7 +11,6 @@ #include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/values.h" #include "shell/browser/api/electron_api_push_notifications.h" #include "shell/browser/browser.h" #include "shell/browser/mac/dict_util.h" diff --git a/shell/browser/mac/in_app_purchase_observer.mm b/shell/browser/mac/in_app_purchase_observer.mm index ade5aeee98e2..9f0ee425ac33 100644 --- a/shell/browser/mac/in_app_purchase_observer.mm +++ b/shell/browser/mac/in_app_purchase_observer.mm @@ -7,7 +7,6 @@ #include #include "base/functional/bind.h" -#include "base/strings/sys_string_conversions.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" diff --git a/shell/browser/microtasks_runner.cc b/shell/browser/microtasks_runner.cc index e5de356cfca9..ac8774e71053 100755 --- a/shell/browser/microtasks_runner.cc +++ b/shell/browser/microtasks_runner.cc @@ -6,7 +6,6 @@ #include "shell/browser/microtasks_runner.h" #include "shell/browser/electron_browser_main_parts.h" -#include "shell/browser/javascript_environment.h" #include "shell/common/node_includes.h" #include "v8/include/v8.h" diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm index 6921a877d9db..06036607ddd0 100644 --- a/shell/browser/native_window_mac.mm +++ b/shell/browser/native_window_mac.mm @@ -44,7 +44,6 @@ #include "third_party/webrtc/modules/desktop_capture/mac/window_list_utils.h" #include "ui/base/hit_test.h" #include "ui/display/screen.h" -#include "ui/gfx/skia_util.h" #include "ui/gl/gpu_switching_manager.h" #include "ui/views/background.h" #include "ui/views/cocoa/native_widget_mac_ns_window_host.h" diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc index 724fd0d88df2..6485cf0ec62b 100644 --- a/shell/browser/native_window_views.cc +++ b/shell/browser/native_window_views.cc @@ -21,10 +21,8 @@ #include #include "base/containers/contains.h" -#include "base/memory/raw_ptr.h" -#include "base/stl_util.h" +#include "base/memory/raw_ref.h" #include "base/strings/utf_string_conversions.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_media_id.h" #include "content/public/common/color_parser.h" #include "shell/browser/api/electron_api_web_contents.h" diff --git a/shell/browser/net/asar/asar_url_loader.cc b/shell/browser/net/asar/asar_url_loader.cc index 0540794375e5..a32e52e9d67c 100644 --- a/shell/browser/net/asar/asar_url_loader.cc +++ b/shell/browser/net/asar/asar_url_loader.cc @@ -10,7 +10,6 @@ #include #include -#include "base/strings/stringprintf.h" #include "base/task/thread_pool.h" #include "content/public/browser/file_url_loader.h" #include "electron/fuses.h" diff --git a/shell/browser/net/electron_url_loader_factory.cc b/shell/browser/net/electron_url_loader_factory.cc index 9c74ad01af3a..fd3b0b091b3f 100644 --- a/shell/browser/net/electron_url_loader_factory.cc +++ b/shell/browser/net/electron_url_loader_factory.cc @@ -34,6 +34,7 @@ #include "shell/common/gin_converters/gurl_converter.h" #include "shell/common/gin_converters/net_converter.h" #include "shell/common/gin_converters/value_converter.h" +#include "shell/common/gin_helper/dictionary.h" #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #include "shell/common/node_includes.h" diff --git a/shell/browser/net/electron_url_loader_factory.h b/shell/browser/net/electron_url_loader_factory.h index 9fd628bddd88..5e05bde03d1d 100644 --- a/shell/browser/net/electron_url_loader_factory.h +++ b/shell/browser/net/electron_url_loader_factory.h @@ -21,7 +21,15 @@ #include "services/network/public/mojom/url_loader.mojom.h" #include "services/network/public/mojom/url_loader_factory.mojom.h" #include "services/network/public/mojom/url_response_head.mojom.h" -#include "shell/common/gin_helper/dictionary.h" +#include "v8/include/v8-array-buffer.h" + +namespace gin { +class Arguments; +} // namespace gin + +namespace gin_helper { +class Dictionary; +} // namespace gin_helper namespace electron { diff --git a/shell/browser/net/network_context_service.h b/shell/browser/net/network_context_service.h index a790a182840f..113e57607900 100644 --- a/shell/browser/net/network_context_service.h +++ b/shell/browser/net/network_context_service.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_ #define ELECTRON_SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_ -#include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/net/proxy_config_monitor.h" #include "components/keyed_service/core/keyed_service.h" @@ -14,6 +13,10 @@ #include "services/network/public/mojom/network_context.mojom.h" #include "shell/browser/electron_browser_context.h" +namespace base { +class FilePath; +} // namespace base + namespace electron { // KeyedService that initializes and provides access to the NetworkContexts for diff --git a/shell/browser/net/network_context_service_factory.h b/shell/browser/net/network_context_service_factory.h index ef0b32b66a43..5f997f37b20b 100644 --- a/shell/browser/net/network_context_service_factory.h +++ b/shell/browser/net/network_context_service_factory.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_ -#include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" class KeyedService; diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc index 2a0728105ffe..7c8df6192c85 100644 --- a/shell/browser/net/proxying_url_loader_factory.cc +++ b/shell/browser/net/proxying_url_loader_factory.cc @@ -11,7 +11,6 @@ #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/strings/string_split.h" -#include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "content/public/browser/browser_context.h" #include "extensions/browser/extension_navigation_ui_data.h" diff --git a/shell/browser/net/resolve_host_function.cc b/shell/browser/net/resolve_host_function.cc index 826511f0067d..fe17752d7582 100644 --- a/shell/browser/net/resolve_host_function.cc +++ b/shell/browser/net/resolve_host_function.cc @@ -7,7 +7,6 @@ #include #include "base/functional/bind.h" -#include "base/values.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc index 53e0a17d54e3..f2785ef8fa35 100644 --- a/shell/browser/net/system_network_context_manager.cc +++ b/shell/browser/net/system_network_context_manager.cc @@ -12,7 +12,6 @@ #include "base/command_line.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" -#include "base/strings/string_split.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h" #include "chrome/common/chrome_features.h" diff --git a/shell/browser/net/system_network_context_manager.h b/shell/browser/net/system_network_context_manager.h index 819894da4cae..02b0a0851245 100644 --- a/shell/browser/net/system_network_context_manager.h +++ b/shell/browser/net/system_network_context_manager.h @@ -7,7 +7,6 @@ #include -#include "base/memory/ref_counted.h" #include "chrome/browser/net/proxy_config_monitor.h" #include "mojo/public/cpp/bindings/remote.h" #include "sandbox/policy/features.h" diff --git a/shell/browser/notifications/mac/cocoa_notification.mm b/shell/browser/notifications/mac/cocoa_notification.mm index c073dd2e531d..8d5f3ad70b19 100644 --- a/shell/browser/notifications/mac/cocoa_notification.mm +++ b/shell/browser/notifications/mac/cocoa_notification.mm @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/strings/utf_string_conversions.h" #include "shell/browser/notifications/notification_delegate.h" #include "shell/browser/notifications/notification_presenter.h" #include "skia/ext/skia_utils_mac.h" diff --git a/shell/browser/notifications/platform_notification_service.cc b/shell/browser/notifications/platform_notification_service.cc index b091716a92a9..f3858f7738e2 100644 --- a/shell/browser/notifications/platform_notification_service.cc +++ b/shell/browser/notifications/platform_notification_service.cc @@ -4,7 +4,6 @@ #include "shell/browser/notifications/platform_notification_service.h" -#include "base/strings/utf_string_conversions.h" #include "content/public/browser/notification_event_dispatcher.h" #include "content/public/browser/render_process_host.h" #include "shell/browser/electron_browser_client.h" diff --git a/shell/browser/notifications/win/windows_toast_notification.cc b/shell/browser/notifications/win/windows_toast_notification.cc index 6069bdeae077..fae04cd611e0 100644 --- a/shell/browser/notifications/win/windows_toast_notification.cc +++ b/shell/browser/notifications/win/windows_toast_notification.cc @@ -19,7 +19,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util_win.h" -#include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "shell/browser/notifications/notification_delegate.h" diff --git a/shell/browser/osr/osr_host_display_client.cc b/shell/browser/osr/osr_host_display_client.cc index 38687e4facfd..6311d21efb0e 100644 --- a/shell/browser/osr/osr_host_display_client.cc +++ b/shell/browser/osr/osr_host_display_client.cc @@ -12,7 +12,6 @@ #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/src/core/SkDevice.h" -#include "ui/gfx/skia_util.h" #if BUILDFLAG(IS_WIN) #include "skia/ext/skia_utils_win.h" diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc index f112a7f23c0e..8ec96213bdaa 100644 --- a/shell/browser/osr/osr_render_widget_host_view.cc +++ b/shell/browser/osr/osr_render_widget_host_view.cc @@ -41,7 +41,6 @@ #include "ui/display/screen.h" #include "ui/events/base_event_utils.h" #include "ui/events/event_constants.h" -#include "ui/gfx/canvas.h" #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image_skia.h" diff --git a/shell/browser/plugins/plugin_utils.cc b/shell/browser/plugins/plugin_utils.cc index 2b569d4ec419..c14167337afa 100644 --- a/shell/browser/plugins/plugin_utils.cc +++ b/shell/browser/plugins/plugin_utils.cc @@ -7,7 +7,6 @@ #include #include "base/containers/contains.h" -#include "base/values.h" #include "content/public/common/webplugininfo.h" #include "electron/buildflags/buildflags.h" #include "url/gurl.h" diff --git a/shell/browser/printing/print_view_manager_electron.h b/shell/browser/printing/print_view_manager_electron.h index b9c30e8a0f96..362c85359b53 100644 --- a/shell/browser/printing/print_view_manager_electron.h +++ b/shell/browser/printing/print_view_manager_electron.h @@ -8,7 +8,6 @@ #include #include -#include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h" #include "build/build_config.h" #include "chrome/browser/printing/print_view_manager_base.h" diff --git a/shell/browser/relauncher.cc b/shell/browser/relauncher.cc index ed22f0d17000..a3454196bac0 100644 --- a/shell/browser/relauncher.cc +++ b/shell/browser/relauncher.cc @@ -11,6 +11,7 @@ #endif #include "base/files/file_util.h" +#include "base/files/scoped_file.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process/launch.h" diff --git a/shell/browser/relauncher_linux.cc b/shell/browser/relauncher_linux.cc index 9268775768d3..ee4e7b1c27e4 100644 --- a/shell/browser/relauncher_linux.cc +++ b/shell/browser/relauncher_linux.cc @@ -9,9 +9,9 @@ #include #include -#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/process/launch.h" #include "base/synchronization/waitable_event.h" diff --git a/shell/browser/relauncher_mac.cc b/shell/browser/relauncher_mac.cc index 17b93e71daa2..c03a299b2fdc 100644 --- a/shell/browser/relauncher_mac.cc +++ b/shell/browser/relauncher_mac.cc @@ -11,10 +11,10 @@ #include "base/apple/osstatus_logging.h" #include "base/files/file_util.h" +#include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/process/launch.h" -#include "base/strings/sys_string_conversions.h" namespace relauncher::internal { diff --git a/shell/browser/relauncher_win.cc b/shell/browser/relauncher_win.cc index cfa80e054623..6d69b171a358 100644 --- a/shell/browser/relauncher_win.cc +++ b/shell/browser/relauncher_win.cc @@ -11,7 +11,6 @@ #include "base/process/process_handle.h" #include "base/strings/strcat_win.h" #include "base/strings/string_number_conversions_win.h" -#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "sandbox/win/src/nt_internals.h" #include "sandbox/win/src/win_utils.h" diff --git a/shell/browser/serial/electron_serial_delegate.h b/shell/browser/serial/electron_serial_delegate.h index b2613726e4c1..ea95e803c4e7 100644 --- a/shell/browser/serial/electron_serial_delegate.h +++ b/shell/browser/serial/electron_serial_delegate.h @@ -10,6 +10,7 @@ #include #include "base/memory/weak_ptr.h" +#include "base/observer_list.h" #include "base/scoped_observation.h" #include "content/public/browser/serial_delegate.h" #include "shell/browser/serial/serial_chooser_context.h" diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc index 6b77330cb16d..30b52b09a39f 100644 --- a/shell/browser/serial/serial_chooser_context.cc +++ b/shell/browser/serial/serial_chooser_context.cc @@ -9,7 +9,6 @@ #include "base/base64.h" #include "base/containers/contains.h" -#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/public/browser/device_service.h" #include "content/public/browser/web_contents.h" diff --git a/shell/browser/serial/serial_chooser_controller.cc b/shell/browser/serial/serial_chooser_controller.cc index 1b013e6d01dd..e95be7391880 100644 --- a/shell/browser/serial/serial_chooser_controller.cc +++ b/shell/browser/serial/serial_chooser_controller.cc @@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/functional/bind.h" #include "base/strings/stringprintf.h" -#include "base/strings/utf_string_conversions.h" #include "device/bluetooth/public/cpp/bluetooth_uuid.h" #include "services/device/public/cpp/bluetooth/bluetooth_utils.h" #include "services/device/public/mojom/serial.mojom.h" diff --git a/shell/browser/ui/accelerator_util.cc b/shell/browser/ui/accelerator_util.cc index 33792ba5230e..fa80d725b364 100644 --- a/shell/browser/ui/accelerator_util.cc +++ b/shell/browser/ui/accelerator_util.cc @@ -10,7 +10,6 @@ #include #include "base/logging.h" -#include "base/stl_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "shell/common/keyboard_util.h" diff --git a/shell/browser/ui/accelerator_util_unittests.cc b/shell/browser/ui/accelerator_util_unittests.cc index 1fe48dab22eb..255e798456db 100644 --- a/shell/browser/ui/accelerator_util_unittests.cc +++ b/shell/browser/ui/accelerator_util_unittests.cc @@ -4,7 +4,6 @@ #include "shell/browser/ui/accelerator_util.h" -#include "base/memory/raw_ref.h" #include "testing/gtest/include/gtest/gtest.h" namespace accelerator_util { diff --git a/shell/browser/ui/certificate_trust.h b/shell/browser/ui/certificate_trust.h index fd266d46eca8..382d02cebce7 100644 --- a/shell/browser/ui/certificate_trust.h +++ b/shell/browser/ui/certificate_trust.h @@ -7,9 +7,7 @@ #include -#include "base/memory/ref_counted.h" #include "net/cert/x509_certificate.h" -#include "shell/browser/javascript_environment.h" #include "shell/common/gin_helper/promise.h" namespace electron { diff --git a/shell/browser/ui/certificate_trust_mac.mm b/shell/browser/ui/certificate_trust_mac.mm index 63ee1b1753d1..92500405039d 100644 --- a/shell/browser/ui/certificate_trust_mac.mm +++ b/shell/browser/ui/certificate_trust_mac.mm @@ -14,6 +14,7 @@ #include "base/strings/sys_string_conversions.h" #include "net/cert/cert_database.h" #include "net/cert/x509_util_apple.h" +#include "shell/browser/javascript_environment.h" #include "shell/browser/native_window.h" @interface TrustDelegate : NSObject { diff --git a/shell/browser/ui/cocoa/electron_menu_controller.mm b/shell/browser/ui/cocoa/electron_menu_controller.mm index 084424a2e4bc..7ee1ced9e589 100644 --- a/shell/browser/ui/cocoa/electron_menu_controller.mm +++ b/shell/browser/ui/cocoa/electron_menu_controller.mm @@ -23,7 +23,6 @@ #include "ui/base/l10n/l10n_util_mac.h" #include "ui/events/cocoa/cocoa_event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_mac.h" -#include "ui/gfx/image/image.h" #include "ui/strings/grit/ui_strings.h" using content::BrowserThread; diff --git a/shell/browser/ui/devtools_manager_delegate.cc b/shell/browser/ui/devtools_manager_delegate.cc index 89711a7f6149..439ac68f5b3e 100644 --- a/shell/browser/ui/devtools_manager_delegate.cc +++ b/shell/browser/ui/devtools_manager_delegate.cc @@ -12,8 +12,6 @@ #include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" -#include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_frontend_host.h" diff --git a/shell/browser/ui/devtools_manager_delegate.h b/shell/browser/ui/devtools_manager_delegate.h index a315dec79b1d..7a26f43b0cb9 100644 --- a/shell/browser/ui/devtools_manager_delegate.h +++ b/shell/browser/ui/devtools_manager_delegate.h @@ -7,7 +7,6 @@ #include -#include "base/compiler_specific.h" #include "content/public/browser/devtools_manager_delegate.h" namespace content { diff --git a/shell/browser/ui/devtools_ui.cc b/shell/browser/ui/devtools_ui.cc index 0da78f52fb27..fc62d6d9b0d8 100644 --- a/shell/browser/ui/devtools_ui.cc +++ b/shell/browser/ui/devtools_ui.cc @@ -11,7 +11,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #include "chrome/common/webui_url_constants.h" #include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/url_data_source.h" diff --git a/shell/browser/ui/devtools_ui.h b/shell/browser/ui/devtools_ui.h index 30194d7d2036..190499b3b3a7 100644 --- a/shell/browser/ui/devtools_ui.h +++ b/shell/browser/ui/devtools_ui.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_BROWSER_UI_DEVTOOLS_UI_H_ #define ELECTRON_SHELL_BROWSER_UI_DEVTOOLS_UI_H_ -#include "base/compiler_specific.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/web_ui_controller.h" diff --git a/shell/browser/ui/electron_menu_model.cc b/shell/browser/ui/electron_menu_model.cc index bc2456c8f4b3..e926d24e3bd1 100644 --- a/shell/browser/ui/electron_menu_model.cc +++ b/shell/browser/ui/electron_menu_model.cc @@ -6,8 +6,6 @@ #include -#include "base/stl_util.h" - namespace electron { #if BUILDFLAG(IS_MAC) diff --git a/shell/browser/ui/file_dialog_linux.cc b/shell/browser/ui/file_dialog_linux.cc index 7ba59eacbbb3..66f39b5600ea 100644 --- a/shell/browser/ui/file_dialog_linux.cc +++ b/shell/browser/ui/file_dialog_linux.cc @@ -8,10 +8,7 @@ #include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/functional/callback.h" -#include "base/memory/raw_ptr.h" -#include "base/memory/raw_ptr_exclusion.h" #include "base/run_loop.h" -#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "shell/browser/javascript_environment.h" #include "shell/browser/native_window_views.h" diff --git a/shell/browser/ui/file_dialog_win.cc b/shell/browser/ui/file_dialog_win.cc index 44ecb929ecf5..2f535a67ef26 100644 --- a/shell/browser/ui/file_dialog_win.cc +++ b/shell/browser/ui/file_dialog_win.cc @@ -16,7 +16,6 @@ #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" -#include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc index 5be01b703138..93d7735cc4ae 100644 --- a/shell/browser/ui/inspectable_web_contents.cc +++ b/shell/browser/ui/inspectable_web_contents.cc @@ -10,18 +10,15 @@ #include #include "base/base64.h" -#include "base/json/json_reader.h" -#include "base/json/json_writer.h" -#include "base/json/string_escape.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram.h" #include "base/ranges/algorithm.h" -#include "base/stl_util.h" #include "base/strings/pattern.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "base/timer/timer.h" #include "base/uuid.h" #include "base/values.h" #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" @@ -30,7 +27,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/file_select_listener.h" #include "content/public/browser/file_url_loader.h" #include "content/public/browser/host_zoom_map.h" diff --git a/shell/browser/ui/inspectable_web_contents_view.cc b/shell/browser/ui/inspectable_web_contents_view.cc index e3e03bc97b21..2d21a8beb5ef 100644 --- a/shell/browser/ui/inspectable_web_contents_view.cc +++ b/shell/browser/ui/inspectable_web_contents_view.cc @@ -9,7 +9,6 @@ #include #include "base/memory/raw_ptr.h" -#include "base/strings/utf_string_conversions.h" #include "shell/browser/ui/drag_util.h" #include "shell/browser/ui/inspectable_web_contents.h" #include "shell/browser/ui/inspectable_web_contents_delegate.h" diff --git a/shell/browser/ui/message_box_mac.mm b/shell/browser/ui/message_box_mac.mm index 09fa5472b229..c1cce045f691 100644 --- a/shell/browser/ui/message_box_mac.mm +++ b/shell/browser/ui/message_box_mac.mm @@ -4,9 +4,7 @@ #include "shell/browser/ui/message_box.h" -#include #include -#include #import diff --git a/shell/browser/ui/tray_icon_cocoa.mm b/shell/browser/ui/tray_icon_cocoa.mm index 16dc1b8e24a4..0cc6bf4eae65 100644 --- a/shell/browser/ui/tray_icon_cocoa.mm +++ b/shell/browser/ui/tray_icon_cocoa.mm @@ -17,7 +17,6 @@ #include "shell/browser/ui/cocoa/electron_menu_controller.h" #include "ui/events/cocoa/cocoa_event_utils.h" #include "ui/gfx/mac/coordinate_conversion.h" -#include "ui/native_theme/native_theme.h" @interface StatusItemView : NSView { raw_ptr trayIcon_; // weak diff --git a/shell/browser/ui/views/client_frame_view_linux.cc b/shell/browser/ui/views/client_frame_view_linux.cc index 7e5f1e83aacb..4a7b4c0c0d16 100644 --- a/shell/browser/ui/views/client_frame_view_linux.cc +++ b/shell/browser/ui/views/client_frame_view_linux.cc @@ -21,7 +21,6 @@ #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/skia_conversions.h" -#include "ui/gfx/skia_util.h" #include "ui/gfx/text_constants.h" #include "ui/gtk/gtk_compat.h" // nogncheck #include "ui/gtk/gtk_util.h" // nogncheck diff --git a/shell/browser/ui/views/electron_views_delegate.h b/shell/browser/ui/views/electron_views_delegate.h index ac8cb219dc45..0311a26a6759 100644 --- a/shell/browser/ui/views/electron_views_delegate.h +++ b/shell/browser/ui/views/electron_views_delegate.h @@ -8,7 +8,6 @@ #include #include -#include "base/compiler_specific.h" #include "base/containers/flat_map.h" #include "ui/views/views_delegate.h" diff --git a/shell/browser/ui/views/global_menu_bar_registrar_x11.cc b/shell/browser/ui/views/global_menu_bar_registrar_x11.cc index df3428b34b0d..76e0940b81b3 100644 --- a/shell/browser/ui/views/global_menu_bar_registrar_x11.cc +++ b/shell/browser/ui/views/global_menu_bar_registrar_x11.cc @@ -8,7 +8,7 @@ #include "base/debug/leak_annotations.h" #include "base/functional/bind.h" -#include "base/logging.h" +#include "base/memory/singleton.h" #include "content/public/browser/browser_thread.h" #include "shell/browser/ui/views/global_menu_bar_x11.h" diff --git a/shell/browser/ui/views/global_menu_bar_registrar_x11.h b/shell/browser/ui/views/global_menu_bar_registrar_x11.h index 71e2a9fd6084..5e4ac03c7030 100644 --- a/shell/browser/ui/views/global_menu_bar_registrar_x11.h +++ b/shell/browser/ui/views/global_menu_bar_registrar_x11.h @@ -10,7 +10,6 @@ #include #include "base/memory/raw_ptr.h" -#include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "ui/base/glib/scoped_gsignal.h" #include "ui/gfx/x/xproto.h" diff --git a/shell/browser/ui/views/global_menu_bar_x11.h b/shell/browser/ui/views/global_menu_bar_x11.h index 31bca417f275..893f2cf6a040 100644 --- a/shell/browser/ui/views/global_menu_bar_x11.h +++ b/shell/browser/ui/views/global_menu_bar_x11.h @@ -7,7 +7,6 @@ #include -#include "base/compiler_specific.h" #include "base/memory/raw_ptr.h" #include "shell/browser/ui/electron_menu_model.h" #include "ui/base/glib/scoped_gsignal.h" diff --git a/shell/browser/ui/views/opaque_frame_view.h b/shell/browser/ui/views/opaque_frame_view.h index d23e0ffa076a..af5f8eb8b571 100644 --- a/shell/browser/ui/views/opaque_frame_view.h +++ b/shell/browser/ui/views/opaque_frame_view.h @@ -8,7 +8,6 @@ #include #include "base/memory/raw_ptr.h" -#include "base/scoped_observation.h" #include "chrome/browser/ui/view_ids.h" #include "shell/browser/ui/views/frameless_view.h" #include "ui/base/metadata/metadata_header_macros.h" diff --git a/shell/browser/ui/views/root_view.h b/shell/browser/ui/views/root_view.h index 58163544d43d..22d92aea193f 100644 --- a/shell/browser/ui/views/root_view.h +++ b/shell/browser/ui/views/root_view.h @@ -7,7 +7,6 @@ #include -#include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "shell/browser/ui/accelerator_util.h" #include "ui/gfx/geometry/insets.h" diff --git a/shell/browser/ui/views/submenu_button.cc b/shell/browser/ui/views/submenu_button.cc index 0b7e3c6e0aa8..9ff4a960383a 100644 --- a/shell/browser/ui/views/submenu_button.cc +++ b/shell/browser/ui/views/submenu_button.cc @@ -5,7 +5,6 @@ #include "shell/browser/ui/views/submenu_button.h" #include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" #include "ui/accessibility/ax_enums.mojom.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" diff --git a/shell/browser/ui/views/win_caption_button.cc b/shell/browser/ui/views/win_caption_button.cc index 5d6de2460e56..6320a60c653a 100644 --- a/shell/browser/ui/views/win_caption_button.cc +++ b/shell/browser/ui/views/win_caption_button.cc @@ -17,7 +17,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/theme_provider.h" #include "ui/gfx/animation/tween.h" -#include "ui/gfx/color_utils.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/scoped_canvas.h" diff --git a/shell/browser/ui/views/win_caption_button.h b/shell/browser/ui/views/win_caption_button.h index fdc31a0d1ec5..ff96851c842a 100644 --- a/shell/browser/ui/views/win_caption_button.h +++ b/shell/browser/ui/views/win_caption_button.h @@ -15,9 +15,12 @@ #include "shell/browser/ui/views/win_icon_painter.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/metadata/metadata_impl_macros.h" -#include "ui/gfx/canvas.h" #include "ui/views/controls/button/button.h" +namespace gfx { +class Canvas; +} + namespace electron { class WinFrameView; diff --git a/shell/browser/ui/views/win_icon_painter.cc b/shell/browser/ui/views/win_icon_painter.cc index b11f2eab7bef..d50c0f13960e 100644 --- a/shell/browser/ui/views/win_icon_painter.cc +++ b/shell/browser/ui/views/win_icon_painter.cc @@ -5,8 +5,9 @@ #include "shell/browser/ui/views/win_icon_painter.h" #include "base/numerics/safe_conversions.h" +#include "cc/paint/paint_flags.h" #include "third_party/skia/include/core/SkPath.h" -#include "ui/gfx/color_utils.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/geometry/rrect_f.h" #include "ui/gfx/geometry/skia_conversions.h" diff --git a/shell/browser/ui/views/win_icon_painter.h b/shell/browser/ui/views/win_icon_painter.h index 57bf16376f72..4e3a360cbcbb 100644 --- a/shell/browser/ui/views/win_icon_painter.h +++ b/shell/browser/ui/views/win_icon_painter.h @@ -5,8 +5,14 @@ #ifndef ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_ICON_PAINTER_H_ #define ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_ICON_PAINTER_H_ -#include "base/memory/raw_ptr.h" -#include "ui/gfx/canvas.h" +namespace cc { +class PaintFlags; +} // namespace cc + +namespace gfx { +class Canvas; +class Rect; +} // namespace gfx namespace electron { diff --git a/shell/browser/ui/webui/accessibility_ui.cc b/shell/browser/ui/webui/accessibility_ui.cc index 28f22b6da86a..fcf9a7fea656 100644 --- a/shell/browser/ui/webui/accessibility_ui.cc +++ b/shell/browser/ui/webui/accessibility_ui.cc @@ -10,12 +10,11 @@ #include #include -#include "base/command_line.h" #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/strings/escape.h" -#include "base/strings/pattern.h" +#include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" diff --git a/shell/browser/ui/win/notify_icon.h b/shell/browser/ui/win/notify_icon.h index 9649923811d5..d41a3b642d49 100644 --- a/shell/browser/ui/win/notify_icon.h +++ b/shell/browser/ui/win/notify_icon.h @@ -12,7 +12,6 @@ #include #include -#include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/win/scoped_gdi_object.h" #include "shell/browser/ui/tray_icon.h" diff --git a/shell/browser/ui/win/notify_icon_host.cc b/shell/browser/ui/win/notify_icon_host.cc index e7205aa594fe..dd46755ba24e 100644 --- a/shell/browser/ui/win/notify_icon_host.cc +++ b/shell/browser/ui/win/notify_icon_host.cc @@ -10,7 +10,6 @@ #include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" -#include "base/stl_util.h" #include "base/timer/timer.h" #include "base/win/win_util.h" #include "base/win/windows_types.h" diff --git a/shell/browser/ui/win/taskbar_host.cc b/shell/browser/ui/win/taskbar_host.cc index 1615663d8c55..e75211bce4d9 100644 --- a/shell/browser/ui/win/taskbar_host.cc +++ b/shell/browser/ui/win/taskbar_host.cc @@ -7,7 +7,6 @@ #include #include -#include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_gdi_object.h" #include "shell/browser/native_window.h" diff --git a/shell/browser/ui/win/taskbar_host.h b/shell/browser/ui/win/taskbar_host.h index 73060b1cc4e4..0134abfb0775 100644 --- a/shell/browser/ui/win/taskbar_host.h +++ b/shell/browser/ui/win/taskbar_host.h @@ -14,9 +14,12 @@ #include "base/functional/callback.h" #include "shell/browser/native_window.h" -#include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image.h" +namespace gfx { +class Rect; +} // namespace gfx + namespace electron { class TaskbarHost { diff --git a/shell/browser/usb/usb_chooser_context.cc b/shell/browser/usb/usb_chooser_context.cc index b237a7b578b1..25cc990dfd3c 100644 --- a/shell/browser/usb/usb_chooser_context.cc +++ b/shell/browser/usb/usb_chooser_context.cc @@ -9,10 +9,6 @@ #include "base/containers/contains.h" #include "base/functional/bind.h" -#include "base/observer_list.h" -#include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" -#include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "build/build_config.h" diff --git a/shell/browser/usb/usb_chooser_controller.cc b/shell/browser/usb/usb_chooser_controller.cc index d7cb9560c34c..d4366062e9a4 100644 --- a/shell/browser/usb/usb_chooser_controller.cc +++ b/shell/browser/usb/usb_chooser_controller.cc @@ -9,8 +9,6 @@ #include "base/functional/bind.h" #include "base/ranges/algorithm.h" -#include "base/strings/stringprintf.h" -#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/render_frame_host.h" diff --git a/shell/browser/usb/usb_chooser_controller.h b/shell/browser/usb/usb_chooser_controller.h index f2bab4ad286f..c04b3e266a65 100644 --- a/shell/browser/usb/usb_chooser_controller.h +++ b/shell/browser/usb/usb_chooser_controller.h @@ -7,8 +7,6 @@ #include -#include "base/memory/raw_ptr.h" -#include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "content/public/browser/web_contents.h" diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc index e9aa635c8a81..1704344be508 100644 --- a/shell/browser/web_contents_preferences.cc +++ b/shell/browser/web_contents_preferences.cc @@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/containers/fixed_flat_map.h" #include "base/memory/ptr_util.h" -#include "base/strings/utf_string_conversions.h" #include "cc/base/switches.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" diff --git a/shell/browser/win/dark_mode.cc b/shell/browser/win/dark_mode.cc index 633eac49c8ab..444b832771d3 100644 --- a/shell/browser/win/dark_mode.cc +++ b/shell/browser/win/dark_mode.cc @@ -7,6 +7,7 @@ #include // DwmSetWindowAttribute() #include "base/win/windows_version.h" +#include "ui/native_theme/native_theme.h" // This flag works since Win10 20H1 but is not documented until Windows 11 #define DWMWA_USE_IMMERSIVE_DARK_MODE 20 diff --git a/shell/browser/win/dark_mode.h b/shell/browser/win/dark_mode.h index 8bd34a39e01f..7fd5333081e9 100644 --- a/shell/browser/win/dark_mode.h +++ b/shell/browser/win/dark_mode.h @@ -13,8 +13,6 @@ #undef WIN32_LEAN_AND_MEAN #endif -#include "ui/native_theme/native_theme.h" - namespace electron::win { bool IsDarkModeSupported(); diff --git a/shell/browser/zoom_level_delegate.cc b/shell/browser/zoom_level_delegate.cc index 41eaca5d19db..27fec5b66562 100644 --- a/shell/browser/zoom_level_delegate.cc +++ b/shell/browser/zoom_level_delegate.cc @@ -16,7 +16,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service_factory.h" #include "components/prefs/scoped_user_pref_update.h" -#include "content/public/browser/browser_thread.h" #include "third_party/blink/public/common/page/page_zoom.h" namespace electron { diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc index b99fde799b65..a43039be9e76 100644 --- a/shell/common/api/electron_api_native_image.cc +++ b/shell/common/api/electron_api_native_image.cc @@ -13,12 +13,10 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/pattern.h" -#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "gin/arguments.h" #include "gin/object_template_builder.h" #include "gin/per_isolate_data.h" -#include "gin/wrappable.h" #include "net/base/data_url.h" #include "shell/browser/browser.h" #include "shell/common/asar/asar_util.h" diff --git a/shell/common/api/electron_bindings.cc b/shell/common/api/electron_bindings.cc index 929f467b3b81..127be2e0e76d 100644 --- a/shell/common/api/electron_bindings.cc +++ b/shell/common/api/electron_bindings.cc @@ -10,7 +10,6 @@ #include #include "base/containers/contains.h" -#include "base/logging.h" #include "base/process/process.h" #include "base/process/process_handle.h" #include "base/system/sys_info.h" diff --git a/shell/common/api/electron_bindings.h b/shell/common/api/electron_bindings.h index 7cd9f2d4275d..85846e7f35a0 100644 --- a/shell/common/api/electron_bindings.h +++ b/shell/common/api/electron_bindings.h @@ -8,13 +8,16 @@ #include #include -#include "base/files/file_path.h" #include "base/memory/scoped_refptr.h" #include "base/process/process_metrics.h" #include "shell/common/gin_helper/promise.h" #include "shell/common/node_bindings.h" #include "uv.h" // NOLINT(build/include_directory) +namespace base { +class FilePath; +} + namespace gin_helper { class Arguments; class Dictionary; diff --git a/shell/common/application_info_linux.cc b/shell/common/application_info_linux.cc index cb043d1d0f90..f1f4e55ce019 100644 --- a/shell/common/application_info_linux.cc +++ b/shell/common/application_info_linux.cc @@ -9,7 +9,6 @@ #include -#include "base/environment.h" #include "base/logging.h" #include "electron/electron_version.h" #include "shell/common/platform_util.h" diff --git a/shell/common/application_info_win.cc b/shell/common/application_info_win.cc index 77fec81eb14b..7df23001c0a9 100644 --- a/shell/common/application_info_win.cc +++ b/shell/common/application_info_win.cc @@ -16,7 +16,6 @@ #include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/string_util_win.h" -#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "shell/browser/win/scoped_hstring.h" diff --git a/shell/common/asar/archive_mac.mm b/shell/common/asar/archive_mac.mm index ac4b485991e2..455c5e03c2d0 100644 --- a/shell/common/asar/archive_mac.mm +++ b/shell/common/asar/archive_mac.mm @@ -15,7 +15,6 @@ #include "base/apple/foundation_util.h" #include "base/apple/scoped_cftyperef.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "shell/common/asar/asar_util.h" diff --git a/shell/common/asar/asar_util.cc b/shell/common/asar/asar_util.cc index f3dc4a53a417..54049cfd9801 100644 --- a/shell/common/asar/asar_util.cc +++ b/shell/common/asar/asar_util.cc @@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/no_destructor.h" -#include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/synchronization/lock.h" diff --git a/shell/common/asar/scoped_temporary_file.cc b/shell/common/asar/scoped_temporary_file.cc index d0f00034dba2..357793a9e264 100644 --- a/shell/common/asar/scoped_temporary_file.cc +++ b/shell/common/asar/scoped_temporary_file.cc @@ -7,7 +7,6 @@ #include #include "base/files/file_util.h" -#include "base/logging.h" #include "shell/common/asar/asar_util.h" #include "shell/common/thread_restrictions.h" diff --git a/shell/common/color_util.cc b/shell/common/color_util.cc index 897d1e673906..3b48c3a8afda 100644 --- a/shell/common/color_util.cc +++ b/shell/common/color_util.cc @@ -6,12 +6,10 @@ #include #include -#include #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "content/public/common/color_parser.h" -#include "ui/gfx/color_utils.h" namespace { diff --git a/shell/common/crash_keys.cc b/shell/common/crash_keys.cc index ac99f22e1371..dff146194e6b 100644 --- a/shell/common/crash_keys.cc +++ b/shell/common/crash_keys.cc @@ -12,7 +12,6 @@ #include "base/command_line.h" #include "base/environment.h" #include "base/no_destructor.h" -#include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "components/crash/core/common/crash_key.h" #include "content/public/common/content_switches.h" diff --git a/shell/common/extensions/electron_extensions_api_provider.cc b/shell/common/extensions/electron_extensions_api_provider.cc index 4b60901ca690..6361e15170bc 100644 --- a/shell/common/extensions/electron_extensions_api_provider.cc +++ b/shell/common/extensions/electron_extensions_api_provider.cc @@ -8,7 +8,6 @@ #include #include "base/containers/span.h" -#include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/chrome_manifest_url_handlers.h" #include "chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.h" #include "electron/buildflags/buildflags.h" diff --git a/shell/common/extensions/electron_extensions_client.h b/shell/common/extensions/electron_extensions_client.h index 885f85554f62..e7de9d52f588 100644 --- a/shell/common/extensions/electron_extensions_client.h +++ b/shell/common/extensions/electron_extensions_client.h @@ -7,7 +7,6 @@ #include -#include "base/compiler_specific.h" #include "extensions/common/extensions_client.h" #include "url/gurl.h" diff --git a/shell/common/gin_converters/media_converter.cc b/shell/common/gin_converters/media_converter.cc index c653a23a1c74..676d90baaeb7 100644 --- a/shell/common/gin_converters/media_converter.cc +++ b/shell/common/gin_converters/media_converter.cc @@ -9,7 +9,6 @@ #include "gin/data_object_builder.h" #include "shell/common/gin_converters/frame_converter.h" #include "shell/common/gin_converters/gurl_converter.h" -#include "shell/common/gin_helper/dictionary.h" #include "third_party/blink/public/mojom/mediastream/media_stream.mojom.h" namespace gin { diff --git a/shell/common/gin_helper/callback.h b/shell/common/gin_helper/callback.h index d047e7fdbb73..8402435602c9 100644 --- a/shell/common/gin_helper/callback.h +++ b/shell/common/gin_helper/callback.h @@ -9,7 +9,6 @@ #include #include "base/functional/bind.h" -#include "gin/dictionary.h" #include "shell/common/gin_converters/std_converter.h" #include "shell/common/gin_helper/function_template.h" #include "shell/common/gin_helper/locker.h" diff --git a/shell/common/gin_helper/constructible.h b/shell/common/gin_helper/constructible.h index 247f9f80ec1c..30995cd786f2 100644 --- a/shell/common/gin_helper/constructible.h +++ b/shell/common/gin_helper/constructible.h @@ -6,7 +6,6 @@ #define ELECTRON_SHELL_COMMON_GIN_HELPER_CONSTRUCTIBLE_H_ #include "gin/per_isolate_data.h" -#include "gin/wrappable.h" #include "shell/common/gin_helper/event_emitter_template.h" #include "shell/common/gin_helper/function_template_extensions.h" diff --git a/shell/common/gin_helper/event_emitter.h b/shell/common/gin_helper/event_emitter.h index cd53bfea3671..5b5fe86dd0d5 100644 --- a/shell/common/gin_helper/event_emitter.h +++ b/shell/common/gin_helper/event_emitter.h @@ -7,9 +7,7 @@ #include #include -#include -#include "content/public/browser/browser_thread.h" #include "electron/shell/common/api/api.mojom.h" #include "gin/handle.h" #include "shell/common/gin_helper/event.h" @@ -27,7 +25,6 @@ template class EventEmitter : public gin_helper::Wrappable { public: using Base = gin_helper::Wrappable; - using ValueArray = std::vector>; // Make the convenient methods visible: // https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members diff --git a/shell/common/gin_helper/function_template.cc b/shell/common/gin_helper/function_template.cc index 857c23dc1974..54019899bbf5 100644 --- a/shell/common/gin_helper/function_template.cc +++ b/shell/common/gin_helper/function_template.cc @@ -4,7 +4,6 @@ #include "shell/common/gin_helper/function_template.h" -#include "base/observer_list.h" #include "base/strings/strcat.h" namespace gin_helper { diff --git a/shell/common/mac/main_application_bundle.mm b/shell/common/mac/main_application_bundle.mm index 4605f929d947..39a0acad1fb2 100644 --- a/shell/common/mac/main_application_bundle.mm +++ b/shell/common/mac/main_application_bundle.mm @@ -9,7 +9,6 @@ #include "base/apple/foundation_util.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/strings/string_util.h" #include "content/browser/mac_helpers.h" namespace electron { diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc index a28e4fb20bf3..ed99776efa88 100644 --- a/shell/common/node_bindings.cc +++ b/shell/common/node_bindings.cc @@ -21,7 +21,6 @@ #include "base/task/single_thread_task_runner.h" #include "base/trace_event/trace_event.h" #include "chrome/common/chrome_version.h" -#include "content/public/browser/browser_thread.h" #include "content/public/common/content_paths.h" #include "electron/buildflags/buildflags.h" #include "electron/electron_version.h" diff --git a/shell/common/node_bindings_linux.h b/shell/common/node_bindings_linux.h index 00b1a09c0d23..df2cc28fffb9 100644 --- a/shell/common/node_bindings_linux.h +++ b/shell/common/node_bindings_linux.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_COMMON_NODE_BINDINGS_LINUX_H_ #define ELECTRON_SHELL_COMMON_NODE_BINDINGS_LINUX_H_ -#include "base/compiler_specific.h" #include "shell/common/node_bindings.h" namespace electron { diff --git a/shell/common/node_bindings_mac.h b/shell/common/node_bindings_mac.h index 5f3faba4f462..55e660a699b0 100644 --- a/shell/common/node_bindings_mac.h +++ b/shell/common/node_bindings_mac.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_COMMON_NODE_BINDINGS_MAC_H_ #define ELECTRON_SHELL_COMMON_NODE_BINDINGS_MAC_H_ -#include "base/compiler_specific.h" #include "shell/common/node_bindings.h" namespace electron { diff --git a/shell/common/node_bindings_win.h b/shell/common/node_bindings_win.h index 1df63c30d039..1df0193e5788 100644 --- a/shell/common/node_bindings_win.h +++ b/shell/common/node_bindings_win.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_COMMON_NODE_BINDINGS_WIN_H_ #define ELECTRON_SHELL_COMMON_NODE_BINDINGS_WIN_H_ -#include "base/compiler_specific.h" #include "shell/common/node_bindings.h" namespace electron { diff --git a/shell/common/platform_util.cc b/shell/common/platform_util.cc index 23e546bf8502..7d4b34baebf7 100644 --- a/shell/common/platform_util.cc +++ b/shell/common/platform_util.cc @@ -9,7 +9,6 @@ #include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_task_traits.h" -#include "content/public/browser/browser_thread.h" #include "shell/common/platform_util_internal.h" namespace platform_util { diff --git a/shell/common/platform_util_linux.cc b/shell/common/platform_util_linux.cc index 27245423dbcf..bfa76da244e3 100644 --- a/shell/common/platform_util_linux.cc +++ b/shell/common/platform_util_linux.cc @@ -15,6 +15,7 @@ #include "base/containers/contains.h" #include "base/environment.h" #include "base/files/file_util.h" +#include "base/files/scoped_file.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/nix/xdg_util.h" diff --git a/shell/common/platform_util_mac.mm b/shell/common/platform_util_mac.mm index 370eccd45b61..811836dec6bf 100644 --- a/shell/common/platform_util_mac.mm +++ b/shell/common/platform_util_mac.mm @@ -19,11 +19,9 @@ #include "base/functional/callback.h" #include "base/logging.h" #include "base/mac/scoped_aedesc.h" -#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_task_traits.h" -#include "content/public/browser/browser_thread.h" #include "net/base/apple/url_conversions.h" #include "ui/views/widget/widget.h" #include "url/gurl.h" diff --git a/shell/common/platform_util_win.cc b/shell/common/platform_util_win.cc index b3af90117e82..7afdb35ccd22 100644 --- a/shell/common/platform_util_win.cc +++ b/shell/common/platform_util_win.cc @@ -22,9 +22,7 @@ #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/logging.h" -#include "base/stl_util.h" #include "base/strings/escape.h" -#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" diff --git a/shell/renderer/api/electron_api_context_bridge.cc b/shell/renderer/api/electron_api_context_bridge.cc index 2c4de5d0dbad..5058a4dea241 100644 --- a/shell/renderer/api/electron_api_context_bridge.cc +++ b/shell/renderer/api/electron_api_context_bridge.cc @@ -13,7 +13,6 @@ #include "base/containers/contains.h" #include "base/feature_list.h" -#include "base/no_destructor.h" #include "base/trace_event/trace_event.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" diff --git a/shell/renderer/api/electron_api_ipc_renderer.cc b/shell/renderer/api/electron_api_ipc_renderer.cc index 7eceed45bd9f..bf8867a31ecb 100644 --- a/shell/renderer/api/electron_api_ipc_renderer.cc +++ b/shell/renderer/api/electron_api_ipc_renderer.cc @@ -4,7 +4,6 @@ #include -#include "base/values.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" #include "gin/dictionary.h" diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc index 062d33ea3a00..495ddf4b5eca 100644 --- a/shell/renderer/api/electron_api_web_frame.cc +++ b/shell/renderer/api/electron_api_web_frame.cc @@ -9,7 +9,6 @@ #include #include -#include "base/command_line.h" #include "base/memory/memory_pressure_listener.h" #include "base/strings/utf_string_conversions.h" #include "components/spellcheck/renderer/spellcheck.h" diff --git a/shell/renderer/content_settings_observer.cc b/shell/renderer/content_settings_observer.cc index dc357ac41502..ce66e8d00785 100644 --- a/shell/renderer/content_settings_observer.cc +++ b/shell/renderer/content_settings_observer.cc @@ -4,7 +4,6 @@ #include "shell/renderer/content_settings_observer.h" -#include "base/command_line.h" #include "content/public/renderer/render_frame.h" #include "shell/common/options_switches.h" #include "third_party/blink/public/common/web_preferences/web_preferences.h" diff --git a/shell/renderer/content_settings_observer.h b/shell/renderer/content_settings_observer.h index ca73c13a78a1..77c04b973a5f 100644 --- a/shell/renderer/content_settings_observer.h +++ b/shell/renderer/content_settings_observer.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ #define ELECTRON_SHELL_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ -#include "base/compiler_specific.h" #include "content/public/renderer/render_frame_observer.h" #include "third_party/blink/public/platform/web_content_settings_client.h" diff --git a/shell/renderer/electron_api_service_impl.cc b/shell/renderer/electron_api_service_impl.cc index a236dfe7c277..207f5b7d8aec 100644 --- a/shell/renderer/electron_api_service_impl.cc +++ b/shell/renderer/electron_api_service_impl.cc @@ -9,7 +9,6 @@ #include #include -#include "base/environment.h" #include "base/trace_event/trace_event.h" #include "gin/data_object_builder.h" #include "mojo/public/cpp/system/platform_handle.h" diff --git a/shell/renderer/electron_api_service_impl.h b/shell/renderer/electron_api_service_impl.h index 52228a62313a..1a50a18b0143 100644 --- a/shell/renderer/electron_api_service_impl.h +++ b/shell/renderer/electron_api_service_impl.h @@ -10,7 +10,6 @@ #include "base/memory/weak_ptr.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" -#include "electron/buildflags/buildflags.h" #include "electron/shell/common/api/api.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc index 29d24edd3c97..6a6708b33050 100644 --- a/shell/renderer/electron_render_frame_observer.cc +++ b/shell/renderer/electron_render_frame_observer.cc @@ -5,13 +5,10 @@ #include "shell/renderer/electron_render_frame_observer.h" #include -#include -#include "base/command_line.h" #include "base/memory/ref_counted_memory.h" #include "base/trace_event/trace_event.h" #include "content/public/renderer/render_frame.h" -#include "electron/buildflags/buildflags.h" #include "electron/shell/common/api/api.mojom.h" #include "ipc/ipc_message_macros.h" #include "net/base/net_module.h" diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc index a8e7dfea4f95..85b96c394094 100644 --- a/shell/renderer/electron_renderer_client.cc +++ b/shell/renderer/electron_renderer_client.cc @@ -8,7 +8,6 @@ #include "base/containers/contains.h" #include "base/debug/stack_trace.h" #include "content/public/renderer/render_frame.h" -#include "electron/buildflags/buildflags.h" #include "net/http/http_request_headers.h" #include "shell/common/api/electron_bindings.h" #include "shell/common/gin_helper/dictionary.h" diff --git a/shell/renderer/electron_renderer_pepper_host_factory.cc b/shell/renderer/electron_renderer_pepper_host_factory.cc index 9d3d0c54cc09..3892b067ad31 100644 --- a/shell/renderer/electron_renderer_pepper_host_factory.cc +++ b/shell/renderer/electron_renderer_pepper_host_factory.cc @@ -7,7 +7,6 @@ #include #include -#include "base/logging.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/ppapi_host.h" diff --git a/shell/renderer/electron_renderer_pepper_host_factory.h b/shell/renderer/electron_renderer_pepper_host_factory.h index 41cb0f9b8ca5..d9e0071df8ed 100644 --- a/shell/renderer/electron_renderer_pepper_host_factory.h +++ b/shell/renderer/electron_renderer_pepper_host_factory.h @@ -7,7 +7,6 @@ #include -#include "base/compiler_specific.h" #include "base/memory/raw_ptr.h" #include "ppapi/host/host_factory.h" diff --git a/shell/renderer/electron_sandboxed_renderer_client.cc b/shell/renderer/electron_sandboxed_renderer_client.cc index 843558368152..ea91e8fb77ea 100644 --- a/shell/renderer/electron_sandboxed_renderer_client.cc +++ b/shell/renderer/electron_sandboxed_renderer_client.cc @@ -11,12 +11,9 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/containers/contains.h" -#include "base/files/file_path.h" -#include "base/path_service.h" #include "base/process/process_handle.h" #include "base/process/process_metrics.h" #include "content/public/renderer/render_frame.h" -#include "electron/buildflags/buildflags.h" #include "shell/common/api/electron_bindings.h" #include "shell/common/application_info.h" #include "shell/common/gin_helper/dictionary.h" diff --git a/shell/renderer/pepper_helper.h b/shell/renderer/pepper_helper.h index 033a192fd4d5..98c41b5a6757 100644 --- a/shell/renderer/pepper_helper.h +++ b/shell/renderer/pepper_helper.h @@ -5,7 +5,6 @@ #ifndef ELECTRON_SHELL_RENDERER_PEPPER_HELPER_H_ #define ELECTRON_SHELL_RENDERER_PEPPER_HELPER_H_ -#include "base/compiler_specific.h" #include "base/component_export.h" #include "content/public/renderer/render_frame_observer.h" diff --git a/shell/renderer/renderer_client_base.h b/shell/renderer/renderer_client_base.h index 67562c60ede1..c1dad2738fcd 100644 --- a/shell/renderer/renderer_client_base.h +++ b/shell/renderer/renderer_client_base.h @@ -12,7 +12,6 @@ #include "electron/buildflags/buildflags.h" #include "media/base/key_systems_support_registration.h" #include "printing/buildflags/buildflags.h" -#include "shell/common/gin_helper/dictionary.h" // In SHARED_INTERMEDIATE_DIR. #include "widevine_cdm_version.h" // NOLINT(build/include_directory) @@ -31,6 +30,10 @@ namespace blink { class WebLocalFrame; } +namespace gin_helper { +class Dictionary; +} + #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS) namespace extensions { class ExtensionsClient; diff --git a/shell/renderer/web_worker_observer.cc b/shell/renderer/web_worker_observer.cc index eafa8ba00a1c..6d71e1b3c1f5 100644 --- a/shell/renderer/web_worker_observer.cc +++ b/shell/renderer/web_worker_observer.cc @@ -4,7 +4,6 @@ #include "shell/renderer/web_worker_observer.h" -#include #include #include "base/no_destructor.h" diff --git a/shell/utility/electron_content_utility_client.cc b/shell/utility/electron_content_utility_client.cc index 85b3c7bcef8b..98cd602beec8 100644 --- a/shell/utility/electron_content_utility_client.cc +++ b/shell/utility/electron_content_utility_client.cc @@ -9,7 +9,9 @@ #include "base/command_line.h" #include "base/no_destructor.h" #include "content/public/utility/utility_thread.h" +#include "mojo/public/cpp/bindings/binder_map.h" #include "mojo/public/cpp/bindings/service_factory.h" +#include "printing/buildflags/buildflags.h" #include "sandbox/policy/mojom/sandbox.mojom.h" #include "sandbox/policy/sandbox_type.h" #include "services/proxy_resolver/proxy_resolver_factory_impl.h" diff --git a/shell/utility/electron_content_utility_client.h b/shell/utility/electron_content_utility_client.h index 4ecfe6490c79..0a896dcd3930 100644 --- a/shell/utility/electron_content_utility_client.h +++ b/shell/utility/electron_content_utility_client.h @@ -5,14 +5,12 @@ #ifndef ELECTRON_SHELL_UTILITY_ELECTRON_CONTENT_UTILITY_CLIENT_H_ #define ELECTRON_SHELL_UTILITY_ELECTRON_CONTENT_UTILITY_CLIENT_H_ -#include "base/compiler_specific.h" #include "content/public/utility/content_utility_client.h" -#include "mojo/public/cpp/bindings/binder_map.h" -#include "printing/buildflags/buildflags.h" namespace mojo { +class BinderMap; class ServiceFactory; -} +} // namespace mojo namespace electron {