From 2160c1fcc9d5678679d55c586168d45ccfa69b7b Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 19 Jun 2019 13:46:59 -0700 Subject: [PATCH] refactor: replace includes for atom with shell --- .circleci/config.yml | 2 +- BUILD.gn | 122 +- appveyor.yml | 2 +- .../chrome/browser/process_singleton_posix.cc | 4 +- .../frame/global_menu_bar_registrar_x11.cc | 2 +- filenames.gni | 1140 ++++++++--------- shell/app/atom_content_client.cc | 6 +- shell/app/atom_library_main.mm | 10 +- shell/app/atom_main.cc | 20 +- shell/app/atom_main_delegate.cc | 24 +- shell/app/atom_main_delegate_mac.mm | 8 +- shell/app/command_line_args.cc | 2 +- shell/app/manifests.cc | 2 +- shell/app/node_main.cc | 20 +- shell/app/uv_task_runner.cc | 2 +- shell/browser/api/atom_api_app.cc | 48 +- shell/browser/api/atom_api_app.h | 14 +- shell/browser/api/atom_api_app_mac.mm | 6 +- shell/browser/api/atom_api_app_mas.mm | 2 +- shell/browser/api/atom_api_auto_updater.cc | 14 +- shell/browser/api/atom_api_auto_updater.h | 6 +- shell/browser/api/atom_api_browser_view.cc | 18 +- shell/browser/api/atom_api_browser_view.h | 4 +- shell/browser/api/atom_api_browser_window.cc | 22 +- shell/browser/api/atom_api_browser_window.h | 4 +- .../api/atom_api_browser_window_mac.mm | 8 +- .../api/atom_api_browser_window_views.cc | 4 +- shell/browser/api/atom_api_content_tracing.cc | 10 +- shell/browser/api/atom_api_cookies.cc | 12 +- shell/browser/api/atom_api_cookies.h | 6 +- shell/browser/api/atom_api_debugger.cc | 8 +- shell/browser/api/atom_api_debugger.h | 4 +- .../browser/api/atom_api_desktop_capturer.cc | 8 +- shell/browser/api/atom_api_desktop_capturer.h | 2 +- shell/browser/api/atom_api_dialog.cc | 26 +- shell/browser/api/atom_api_download_item.cc | 14 +- shell/browser/api/atom_api_download_item.h | 4 +- shell/browser/api/atom_api_event.cc | 4 +- shell/browser/api/atom_api_global_shortcut.cc | 10 +- shell/browser/api/atom_api_global_shortcut.h | 2 +- shell/browser/api/atom_api_in_app_purchase.cc | 6 +- shell/browser/api/atom_api_in_app_purchase.h | 10 +- shell/browser/api/atom_api_menu.cc | 14 +- shell/browser/api/atom_api_menu.h | 6 +- shell/browser/api/atom_api_menu_mac.h | 4 +- shell/browser/api/atom_api_menu_mac.mm | 8 +- shell/browser/api/atom_api_menu_views.cc | 6 +- shell/browser/api/atom_api_menu_views.h | 2 +- shell/browser/api/atom_api_net.cc | 6 +- shell/browser/api/atom_api_net.h | 2 +- shell/browser/api/atom_api_net_log.cc | 12 +- shell/browser/api/atom_api_net_log.h | 4 +- shell/browser/api/atom_api_notification.cc | 16 +- shell/browser/api/atom_api_notification.h | 8 +- shell/browser/api/atom_api_power_monitor.cc | 8 +- shell/browser/api/atom_api_power_monitor.h | 4 +- .../browser/api/atom_api_power_monitor_mac.mm | 2 +- .../browser/api/atom_api_power_monitor_win.cc | 2 +- .../api/atom_api_power_save_blocker.cc | 4 +- shell/browser/api/atom_api_protocol.cc | 26 +- shell/browser/api/atom_api_protocol.h | 8 +- shell/browser/api/atom_api_protocol_ns.cc | 10 +- shell/browser/api/atom_api_protocol_ns.h | 4 +- shell/browser/api/atom_api_screen.cc | 10 +- shell/browser/api/atom_api_screen.h | 2 +- shell/browser/api/atom_api_session.cc | 46 +- shell/browser/api/atom_api_session.h | 8 +- .../api/atom_api_system_preferences.cc | 8 +- .../browser/api/atom_api_system_preferences.h | 8 +- .../api/atom_api_system_preferences_mac.mm | 12 +- .../api/atom_api_system_preferences_win.cc | 4 +- .../browser/api/atom_api_top_level_window.cc | 32 +- shell/browser/api/atom_api_top_level_window.h | 8 +- shell/browser/api/atom_api_tray.cc | 16 +- shell/browser/api/atom_api_tray.h | 6 +- shell/browser/api/atom_api_url_request.cc | 18 +- shell/browser/api/atom_api_url_request.h | 4 +- shell/browser/api/atom_api_view.cc | 4 +- shell/browser/api/atom_api_view.h | 2 +- shell/browser/api/atom_api_web_contents.cc | 84 +- shell/browser/api/atom_api_web_contents.h | 14 +- .../browser/api/atom_api_web_contents_impl.cc | 6 +- .../browser/api/atom_api_web_contents_mac.mm | 2 +- .../browser/api/atom_api_web_contents_view.cc | 14 +- .../browser/api/atom_api_web_contents_view.h | 2 +- shell/browser/api/atom_api_web_request.cc | 12 +- shell/browser/api/atom_api_web_request.h | 4 +- .../browser/api/atom_api_web_view_manager.cc | 14 +- shell/browser/api/event.cc | 6 +- shell/browser/api/event.h | 2 +- shell/browser/api/event_emitter.cc | 6 +- shell/browser/api/event_emitter.h | 4 +- shell/browser/api/frame_subscriber.cc | 4 +- shell/browser/api/gpu_info_enumerator.cc | 2 +- shell/browser/api/gpuinfo_manager.cc | 4 +- shell/browser/api/gpuinfo_manager.h | 4 +- shell/browser/api/process_metric.cc | 2 +- shell/browser/api/save_page_handler.cc | 4 +- shell/browser/api/save_page_handler.h | 2 +- shell/browser/api/stream_subscriber.cc | 10 +- shell/browser/api/trackable_object.cc | 4 +- shell/browser/api/trackable_object.h | 4 +- .../browser/api/views/atom_api_box_layout.cc | 8 +- shell/browser/api/views/atom_api_box_layout.h | 2 +- shell/browser/api/views/atom_api_button.cc | 6 +- shell/browser/api/views/atom_api_button.h | 2 +- .../api/views/atom_api_label_button.cc | 6 +- .../browser/api/views/atom_api_label_button.h | 2 +- .../api/views/atom_api_layout_manager.cc | 6 +- .../api/views/atom_api_layout_manager.h | 2 +- .../api/views/atom_api_md_text_button.cc | 6 +- .../api/views/atom_api_md_text_button.h | 2 +- .../browser/api/views/atom_api_resize_area.cc | 6 +- .../browser/api/views/atom_api_resize_area.h | 2 +- .../browser/api/views/atom_api_text_field.cc | 6 +- shell/browser/api/views/atom_api_text_field.h | 2 +- shell/browser/atom_blob_reader.cc | 4 +- shell/browser/atom_blob_reader.h | 2 +- shell/browser/atom_browser_client.cc | 62 +- shell/browser/atom_browser_context.cc | 32 +- shell/browser/atom_browser_context.h | 4 +- shell/browser/atom_browser_main_parts.cc | 44 +- shell/browser/atom_browser_main_parts_mac.mm | 6 +- .../browser/atom_browser_main_parts_posix.cc | 4 +- .../browser/atom_download_manager_delegate.cc | 16 +- .../browser/atom_download_manager_delegate.h | 2 +- shell/browser/atom_gpu_client.cc | 2 +- .../browser/atom_javascript_dialog_manager.cc | 12 +- shell/browser/atom_navigation_throttle.cc | 4 +- shell/browser/atom_permission_manager.cc | 8 +- .../browser/atom_quota_permission_context.cc | 2 +- ...tom_speech_recognition_manager_delegate.cc | 2 +- .../browser/atom_web_ui_controller_factory.cc | 8 +- shell/browser/auto_updater.cc | 2 +- shell/browser/auto_updater_mac.mm | 8 +- shell/browser/browser.cc | 16 +- shell/browser/browser.h | 6 +- shell/browser/browser_linux.cc | 8 +- shell/browser/browser_mac.mm | 18 +- shell/browser/browser_observer.h | 2 +- shell/browser/browser_process_impl.cc | 2 +- shell/browser/browser_process_impl.h | 4 +- shell/browser/browser_win.cc | 8 +- shell/browser/child_web_contents_tracker.cc | 2 +- shell/browser/common_web_contents_delegate.cc | 22 +- shell/browser/common_web_contents_delegate.h | 8 +- .../common_web_contents_delegate_mac.mm | 6 +- .../common_web_contents_delegate_views.cc | 10 +- shell/browser/cookie_change_notifier.cc | 6 +- shell/browser/fake_location_provider.cc | 2 +- shell/browser/feature_list.cc | 2 +- shell/browser/font_defaults.cc | 2 +- shell/browser/io_thread.cc | 4 +- shell/browser/io_thread.h | 2 +- shell/browser/javascript_environment.cc | 6 +- shell/browser/lib/bluetooth_chooser.cc | 6 +- shell/browser/lib/bluetooth_chooser.h | 2 +- shell/browser/lib/power_observer.h | 2 +- shell/browser/lib/power_observer_linux.cc | 2 +- .../loader/layered_resource_handler.cc | 2 +- shell/browser/login_handler.cc | 6 +- shell/browser/mac/atom_application.mm | 8 +- shell/browser/mac/atom_application_delegate.h | 2 +- .../browser/mac/atom_application_delegate.mm | 8 +- shell/browser/mac/dict_util.mm | 2 +- shell/browser/mac/in_app_purchase.mm | 2 +- shell/browser/mac/in_app_purchase_observer.mm | 2 +- shell/browser/mac/in_app_purchase_product.mm | 2 +- .../media/media_capture_devices_dispatcher.cc | 2 +- shell/browser/media/media_device_id_salt.cc | 2 +- .../media/media_stream_devices_controller.cc | 4 +- shell/browser/microtasks_runner.cc | 2 +- shell/browser/native_browser_view.cc | 6 +- shell/browser/native_browser_view_mac.h | 2 +- shell/browser/native_browser_view_mac.mm | 6 +- shell/browser/native_browser_view_views.cc | 4 +- shell/browser/native_browser_view_views.h | 2 +- shell/browser/native_window.cc | 10 +- shell/browser/native_window.h | 2 +- shell/browser/native_window_mac.h | 2 +- shell/browser/native_window_mac.mm | 24 +- shell/browser/native_window_views.cc | 42 +- shell/browser/native_window_views.h | 4 +- shell/browser/native_window_views_win.cc | 8 +- shell/browser/net/about_protocol_handler.cc | 4 +- .../browser/net/asar/asar_protocol_handler.cc | 4 +- shell/browser/net/asar/asar_url_loader.cc | 6 +- .../browser/net/asar/url_request_asar_job.cc | 8 +- shell/browser/net/asar/url_request_asar_job.h | 4 +- shell/browser/net/atom_cert_verifier.cc | 8 +- shell/browser/net/atom_network_delegate.cc | 10 +- shell/browser/net/atom_url_loader_factory.cc | 24 +- shell/browser/net/atom_url_request.cc | 8 +- shell/browser/net/atom_url_request.h | 4 +- .../net/atom_url_request_job_factory.cc | 2 +- shell/browser/net/http_protocol_handler.cc | 2 +- shell/browser/net/js_asker.cc | 4 +- shell/browser/net/network_context_service.cc | 8 +- shell/browser/net/network_context_service.h | 2 +- .../net/network_context_service_factory.cc | 4 +- shell/browser/net/node_stream_loader.cc | 8 +- .../net/proxying_url_loader_factory.cc | 4 +- .../browser/net/proxying_url_loader_factory.h | 2 +- shell/browser/net/require_ct_delegate.cc | 2 +- shell/browser/net/resolve_proxy_helper.cc | 4 +- .../net/system_network_context_manager.cc | 10 +- shell/browser/net/url_pipe_loader.cc | 2 +- shell/browser/net/url_request_about_job.cc | 2 +- .../browser/net/url_request_async_asar_job.cc | 8 +- .../browser/net/url_request_async_asar_job.h | 4 +- shell/browser/net/url_request_buffer_job.cc | 8 +- shell/browser/net/url_request_buffer_job.h | 2 +- .../browser/net/url_request_context_getter.cc | 26 +- shell/browser/net/url_request_fetch_job.cc | 10 +- shell/browser/net/url_request_fetch_job.h | 2 +- shell/browser/net/url_request_stream_job.cc | 10 +- shell/browser/net/url_request_stream_job.h | 4 +- shell/browser/net/url_request_string_job.cc | 8 +- shell/browser/net/url_request_string_job.h | 2 +- shell/browser/node_debugger.cc | 4 +- .../linux/libnotify_notification.cc | 8 +- .../linux/libnotify_notification.h | 2 +- .../linux/notification_presenter_linux.cc | 4 +- .../linux/notification_presenter_linux.h | 2 +- .../notifications/mac/cocoa_notification.h | 2 +- .../notifications/mac/cocoa_notification.mm | 6 +- .../mac/notification_center_delegate.mm | 6 +- .../mac/notification_presenter_mac.h | 4 +- .../mac/notification_presenter_mac.mm | 6 +- shell/browser/notifications/notification.cc | 6 +- .../notifications/notification_presenter.cc | 4 +- .../platform_notification_service.cc | 10 +- .../win/notification_presenter_win.cc | 6 +- .../win/notification_presenter_win.h | 2 +- .../win/notification_presenter_win7.cc | 4 +- .../win/notification_presenter_win7.h | 4 +- .../desktop_notification_controller.cc | 6 +- .../win/win32_desktop_notifications/toast.cc | 6 +- .../win/win32_desktop_notifications/toast.h | 2 +- .../win32_desktop_notifications/toast_uia.cc | 4 +- .../win32_desktop_notifications/toast_uia.h | 2 +- .../notifications/win/win32_notification.cc | 2 +- .../notifications/win/win32_notification.h | 4 +- .../win/windows_toast_notification.cc | 10 +- .../win/windows_toast_notification.h | 2 +- shell/browser/osr/osr_host_display_client.cc | 2 +- .../osr/osr_host_display_client_mac.mm | 2 +- .../osr/osr_render_widget_host_view.cc | 2 +- .../browser/osr/osr_render_widget_host_view.h | 6 +- shell/browser/osr/osr_video_consumer.cc | 4 +- shell/browser/osr/osr_view_proxy.cc | 2 +- shell/browser/osr/osr_web_contents_view.cc | 2 +- shell/browser/osr/osr_web_contents_view.h | 6 +- .../browser/osr/osr_web_contents_view_mac.mm | 2 +- shell/browser/pref_store_delegate.cc | 4 +- .../printing/print_preview_message_handler.cc | 4 +- .../printing/print_preview_message_handler.h | 2 +- shell/browser/relauncher.cc | 4 +- shell/browser/relauncher_linux.cc | 2 +- shell/browser/relauncher_mac.cc | 2 +- shell/browser/relauncher_win.cc | 2 +- shell/browser/session_preferences.cc | 4 +- shell/browser/special_storage_policy.cc | 2 +- shell/browser/ui/accelerator_util.cc | 4 +- shell/browser/ui/accelerator_util.h | 2 +- shell/browser/ui/atom_menu_model.cc | 2 +- shell/browser/ui/autofill_popup.cc | 10 +- shell/browser/ui/autofill_popup.h | 2 +- shell/browser/ui/certificate_trust.h | 2 +- shell/browser/ui/certificate_trust_mac.mm | 4 +- shell/browser/ui/certificate_trust_win.cc | 2 +- shell/browser/ui/cocoa/NSColor+Hex.mm | 2 +- shell/browser/ui/cocoa/NSString+ANSI.mm | 4 +- shell/browser/ui/cocoa/atom_bundle_mover.mm | 4 +- .../atom_inspectable_web_contents_view.mm | 10 +- .../browser/ui/cocoa/atom_menu_controller.mm | 6 +- .../ui/cocoa/atom_native_widget_mac.mm | 4 +- shell/browser/ui/cocoa/atom_ns_window.h | 2 +- shell/browser/ui/cocoa/atom_ns_window.mm | 10 +- .../ui/cocoa/atom_ns_window_delegate.mm | 10 +- shell/browser/ui/cocoa/atom_preview_item.mm | 2 +- shell/browser/ui/cocoa/atom_touch_bar.h | 4 +- shell/browser/ui/cocoa/atom_touch_bar.mm | 6 +- .../ui/cocoa/delayed_native_view_host.cc | 2 +- .../ui/cocoa/event_dispatching_window.mm | 2 +- shell/browser/ui/cocoa/root_view_mac.mm | 4 +- shell/browser/ui/cocoa/views_delegate_mac.mm | 2 +- shell/browser/ui/devtools_manager_delegate.cc | 4 +- shell/browser/ui/devtools_ui.cc | 2 +- shell/browser/ui/drag_util_mac.mm | 2 +- shell/browser/ui/drag_util_views.cc | 2 +- shell/browser/ui/file_dialog.h | 4 +- shell/browser/ui/file_dialog_gtk.cc | 6 +- shell/browser/ui/file_dialog_mac.mm | 4 +- shell/browser/ui/file_dialog_win.cc | 6 +- shell/browser/ui/inspectable_web_contents.cc | 4 +- .../ui/inspectable_web_contents_impl.cc | 10 +- .../ui/inspectable_web_contents_impl.h | 2 +- .../inspectable_web_contents_view_delegate.cc | 2 +- .../ui/inspectable_web_contents_view_mac.h | 2 +- .../ui/inspectable_web_contents_view_mac.mm | 8 +- shell/browser/ui/message_box_gtk.cc | 10 +- shell/browser/ui/message_box_mac.mm | 4 +- shell/browser/ui/message_box_win.cc | 8 +- shell/browser/ui/tray_icon.cc | 2 +- shell/browser/ui/tray_icon.h | 4 +- shell/browser/ui/tray_icon_cocoa.h | 2 +- shell/browser/ui/tray_icon_cocoa.mm | 8 +- shell/browser/ui/tray_icon_gtk.cc | 6 +- shell/browser/ui/tray_icon_gtk.h | 2 +- shell/browser/ui/tray_icon_win.cc | 4 +- shell/browser/ui/views/atom_views_delegate.cc | 2 +- shell/browser/ui/views/autofill_popup_view.cc | 2 +- shell/browser/ui/views/autofill_popup_view.h | 4 +- shell/browser/ui/views/frameless_view.cc | 4 +- shell/browser/ui/views/global_menu_bar_x11.cc | 6 +- shell/browser/ui/views/global_menu_bar_x11.h | 2 +- .../inspectable_web_contents_view_views.cc | 8 +- .../inspectable_web_contents_view_views.h | 2 +- shell/browser/ui/views/menu_bar.cc | 6 +- shell/browser/ui/views/menu_bar.h | 6 +- shell/browser/ui/views/menu_delegate.cc | 6 +- shell/browser/ui/views/menu_delegate.h | 2 +- shell/browser/ui/views/menu_model_adapter.cc | 2 +- shell/browser/ui/views/menu_model_adapter.h | 2 +- shell/browser/ui/views/native_frame_view.cc | 4 +- shell/browser/ui/views/root_view.cc | 6 +- shell/browser/ui/views/root_view.h | 2 +- shell/browser/ui/views/submenu_button.cc | 2 +- shell/browser/ui/views/win_frame_view.cc | 4 +- shell/browser/ui/views/win_frame_view.h | 2 +- shell/browser/ui/webui/pdf_viewer_handler.cc | 4 +- shell/browser/ui/webui/pdf_viewer_handler.h | 2 +- shell/browser/ui/webui/pdf_viewer_ui.cc | 10 +- .../ui/win/atom_desktop_native_widget_aura.cc | 4 +- .../ui/win/atom_desktop_native_widget_aura.h | 2 +- .../win/atom_desktop_window_tree_host_win.cc | 2 +- .../win/atom_desktop_window_tree_host_win.h | 2 +- shell/browser/ui/win/jump_list.cc | 2 +- shell/browser/ui/win/notify_icon.cc | 4 +- shell/browser/ui/win/notify_icon.h | 2 +- shell/browser/ui/win/notify_icon_host.cc | 4 +- shell/browser/ui/win/taskbar_host.cc | 4 +- shell/browser/ui/win/taskbar_host.h | 2 +- shell/browser/ui/x/event_disabler.cc | 2 +- shell/browser/ui/x/window_state_watcher.cc | 2 +- shell/browser/ui/x/window_state_watcher.h | 2 +- shell/browser/ui/x/x_window_utils.cc | 2 +- shell/browser/unresponsive_suppressor.cc | 2 +- .../browser/web_contents_permission_helper.cc | 8 +- shell/browser/web_contents_preferences.cc | 10 +- shell/browser/web_contents_zoom_controller.cc | 2 +- shell/browser/web_dialog_helper.cc | 10 +- shell/browser/web_view_guest_delegate.cc | 6 +- shell/browser/web_view_guest_delegate.h | 2 +- shell/browser/web_view_manager.cc | 4 +- shell/browser/win/scoped_hstring.cc | 2 +- shell/browser/window_list.cc | 6 +- shell/browser/zoom_level_delegate.cc | 2 +- shell/common/api/atom_api_asar.cc | 8 +- shell/common/api/atom_api_clipboard.cc | 8 +- shell/common/api/atom_api_clipboard_mac.mm | 2 +- shell/common/api/atom_api_command_line.cc | 6 +- shell/common/api/atom_api_crash_reporter.cc | 10 +- shell/common/api/atom_api_key_weak_map.h | 2 +- shell/common/api/atom_api_native_image.cc | 16 +- shell/common/api/atom_api_native_image_mac.mm | 2 +- shell/common/api/atom_api_shell.cc | 14 +- shell/common/api/atom_api_v8_util.cc | 12 +- shell/common/api/electron_bindings.cc | 18 +- shell/common/api/electron_bindings.h | 2 +- shell/common/api/event_emitter_caller.cc | 6 +- shell/common/api/event_emitter_caller.h | 2 +- shell/common/api/features.cc | 2 +- shell/common/api/locker.cc | 2 +- shell/common/api/object_life_monitor.cc | 2 +- shell/common/api/remote_callback_freer.cc | 4 +- shell/common/api/remote_callback_freer.h | 2 +- shell/common/api/remote_object_freer.cc | 4 +- shell/common/api/remote_object_freer.h | 2 +- shell/common/application_info.cc | 4 +- shell/common/application_info.h | 2 +- shell/common/application_info_linux.cc | 4 +- shell/common/application_info_mac.mm | 4 +- shell/common/application_info_win.cc | 4 +- shell/common/asar/archive.cc | 4 +- shell/common/asar/asar_util.cc | 4 +- shell/common/asar/scoped_temporary_file.cc | 2 +- shell/common/atom_command_line.cc | 2 +- shell/common/atom_constants.cc | 2 +- shell/common/color_util.cc | 2 +- shell/common/crash_reporter/crash_reporter.cc | 10 +- .../crash_reporter/crash_reporter_crashpad.cc | 2 +- .../crash_reporter/crash_reporter_crashpad.h | 2 +- .../crash_reporter/crash_reporter_linux.cc | 2 +- .../crash_reporter/crash_reporter_linux.h | 4 +- .../crash_reporter/crash_reporter_mac.h | 2 +- .../crash_reporter/crash_reporter_mac.mm | 2 +- .../crash_reporter/crash_reporter_win.cc | 8 +- .../crash_reporter/crash_reporter_win.h | 2 +- .../linux/crash_dump_handler.cc | 2 +- .../crash_reporter/win/crash_service.cc | 2 +- .../crash_reporter/win/crash_service_main.cc | 6 +- shell/common/deprecate_util.cc | 4 +- shell/common/deprecate_util.h | 2 +- shell/common/heap_snapshot.cc | 2 +- shell/common/keyboard_util.cc | 2 +- shell/common/mac/main_application_bundle.mm | 2 +- shell/common/mouse_util.cc | 2 +- .../accelerator_converter.cc | 4 +- .../native_mate_converters/blink_converter.cc | 4 +- .../common/native_mate_converters/callback.cc | 2 +- .../common/native_mate_converters/callback.h | 2 +- .../content_converter.cc | 18 +- .../file_dialog_converter.cc | 8 +- .../file_dialog_converter.h | 2 +- .../file_path_converter.h | 2 +- .../native_mate_converters/gfx_converter.cc | 2 +- .../native_mate_converters/image_converter.cc | 6 +- .../message_box_converter.cc | 8 +- .../message_box_converter.h | 2 +- .../native_mate_converters/net_converter.cc | 10 +- .../network_converter.cc | 4 +- .../native_mate_converters/once_callback.h | 2 +- .../v8_value_converter.cc | 6 +- .../native_mate_converters/value_converter.cc | 4 +- shell/common/node_bindings.cc | 12 +- shell/common/node_bindings_linux.cc | 2 +- shell/common/node_bindings_linux.h | 2 +- shell/common/node_bindings_mac.cc | 4 +- shell/common/node_bindings_mac.h | 2 +- shell/common/node_bindings_win.cc | 2 +- shell/common/node_bindings_win.h | 2 +- shell/common/options_switches.cc | 2 +- shell/common/platform_util_linux.cc | 2 +- shell/common/platform_util_mac.mm | 2 +- shell/common/platform_util_win.cc | 2 +- shell/common/promise_util.cc | 4 +- shell/common/promise_util.h | 6 +- shell/renderer/api/atom_api_renderer_ipc.cc | 10 +- .../api/atom_api_spell_check_client.cc | 4 +- shell/renderer/api/atom_api_web_frame.cc | 18 +- shell/renderer/atom_autofill_agent.cc | 2 +- shell/renderer/atom_autofill_agent.h | 2 +- shell/renderer/atom_render_frame_observer.cc | 12 +- shell/renderer/atom_render_frame_observer.h | 2 +- shell/renderer/atom_renderer_client.cc | 18 +- shell/renderer/atom_renderer_client.h | 2 +- .../atom_sandboxed_renderer_client.cc | 18 +- .../renderer/atom_sandboxed_renderer_client.h | 2 +- shell/renderer/content_settings_observer.cc | 2 +- shell/renderer/electron_api_service_impl.cc | 18 +- shell/renderer/electron_api_service_impl.h | 2 +- shell/renderer/guest_view_container.cc | 2 +- .../print_render_frame_helper_delegate.cc | 2 +- shell/renderer/renderer_client_base.cc | 20 +- shell/renderer/web_worker_observer.cc | 12 +- shell/utility/atom_content_utility_client.cc | 2 +- 458 files changed, 2031 insertions(+), 2031 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b4d143609..04467248a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -261,7 +261,7 @@ step-gn-check: &step-gn-check gn check out/Default //electron:electron_lib gn check out/Default //electron:electron_app gn check out/Default //electron:manifests - gn check out/Default //electron/atom/common/api:mojo + gn check out/Default //electron/shell/common/api:mojo step-electron-build: &step-electron-build run: diff --git a/BUILD.gn b/BUILD.gn index da0a2c8659..2fa21240b9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -40,7 +40,7 @@ if (is_linux) { } } -branding = read_file("atom/app/BRANDING.json", "json") +branding = read_file("shell/app/BRANDING.json", "json") electron_project_name = branding.project_name electron_product_name = branding.product_name electron_mac_bundle_id = branding.mac_bundle_id @@ -286,14 +286,14 @@ if (is_linux) { source_set("manifests") { sources = [ - "//electron/atom/app/manifests.cc", - "//electron/atom/app/manifests.h", + "//electron/shell/app/manifests.cc", + "//electron/shell/app/manifests.h", ] include_dirs = [ "//electron" ] deps = [ - "//electron/atom/common/api:mojo", + "//electron/shell/common/api:mojo", "//printing/buildflags", "//services/proxy_resolver/public/cpp:manifest", "//services/service_manager/public/cpp", @@ -345,10 +345,10 @@ static_library("electron_lib") { ":electron_version_header", ":manifests", ":resources", - "atom/common/api:mojo", "buildflags", "chromium_src:chrome", "native_mate", + "shell/common/api:mojo", "//base:base_static", "//base/allocator:buildflags", "//chrome/app/resources:platform_locale_settings", @@ -465,8 +465,8 @@ static_library("electron_lib") { if (enable_fake_location_provider) { sources += [ - "atom/browser/fake_location_provider.cc", - "atom/browser/fake_location_provider.h", + "shell/browser/fake_location_provider.cc", + "shell/browser/fake_location_provider.h", ] } @@ -476,15 +476,15 @@ static_library("electron_lib") { "//ui/accelerated_widget_mac", ] sources += [ - "atom/browser/ui/views/autofill_popup_view.cc", - "atom/browser/ui/views/autofill_popup_view.h", + "shell/browser/ui/views/autofill_popup_view.cc", + "shell/browser/ui/views/autofill_popup_view.h", ] if (is_mas_build) { - sources += [ "atom/browser/api/atom_api_app_mas.mm" ] + sources += [ "shell/browser/api/atom_api_app_mas.mm" ] sources -= [ - "atom/browser/auto_updater_mac.mm", - "atom/common/crash_reporter/crash_reporter_mac.h", - "atom/common/crash_reporter/crash_reporter_mac.mm", + "shell/browser/auto_updater_mac.mm", + "shell/common/crash_reporter/crash_reporter_mac.h", + "shell/common/crash_reporter/crash_reporter_mac.mm", ] defines += [ "MAS_BUILD" ] } else { @@ -540,8 +540,8 @@ static_library("electron_lib") { if ((is_mac && !is_mas_build) || is_win) { sources += [ - "atom/common/crash_reporter/crash_reporter_crashpad.cc", - "atom/common/crash_reporter/crash_reporter_crashpad.h", + "shell/common/crash_reporter/crash_reporter_crashpad.cc", + "shell/common/crash_reporter/crash_reporter_crashpad.h", ] deps += [ "//third_party/crashpad/crashpad/client" ] } @@ -552,25 +552,25 @@ static_library("electron_lib") { if (enable_run_as_node) { sources += [ - "atom/app/node_main.cc", - "atom/app/node_main.h", + "shell/app/node_main.cc", + "shell/app/node_main.h", ] } if (enable_osr) { sources += [ - "atom/browser/osr/osr_host_display_client.cc", - "atom/browser/osr/osr_host_display_client.h", - "atom/browser/osr/osr_host_display_client_mac.mm", - "atom/browser/osr/osr_render_widget_host_view.cc", - "atom/browser/osr/osr_render_widget_host_view.h", - "atom/browser/osr/osr_video_consumer.cc", - "atom/browser/osr/osr_video_consumer.h", - "atom/browser/osr/osr_view_proxy.cc", - "atom/browser/osr/osr_view_proxy.h", - "atom/browser/osr/osr_web_contents_view.cc", - "atom/browser/osr/osr_web_contents_view.h", - "atom/browser/osr/osr_web_contents_view_mac.mm", + "shell/browser/osr/osr_host_display_client.cc", + "shell/browser/osr/osr_host_display_client.h", + "shell/browser/osr/osr_host_display_client_mac.mm", + "shell/browser/osr/osr_render_widget_host_view.cc", + "shell/browser/osr/osr_render_widget_host_view.h", + "shell/browser/osr/osr_video_consumer.cc", + "shell/browser/osr/osr_video_consumer.h", + "shell/browser/osr/osr_view_proxy.cc", + "shell/browser/osr/osr_view_proxy.h", + "shell/browser/osr/osr_web_contents_view.cc", + "shell/browser/osr/osr_web_contents_view.h", + "shell/browser/osr/osr_web_contents_view_mac.mm", ] deps += [ "//components/viz/service", @@ -586,36 +586,36 @@ static_library("electron_lib") { deps += [ "//third_party/webrtc/modules/desktop_capture" ] } sources += [ - "atom/browser/api/atom_api_desktop_capturer.cc", - "atom/browser/api/atom_api_desktop_capturer.h", + "shell/browser/api/atom_api_desktop_capturer.cc", + "shell/browser/api/atom_api_desktop_capturer.h", ] } if (enable_view_api) { sources += [ - "atom/browser/api/views/atom_api_box_layout.cc", - "atom/browser/api/views/atom_api_box_layout.h", - "atom/browser/api/views/atom_api_button.cc", - "atom/browser/api/views/atom_api_button.h", - "atom/browser/api/views/atom_api_label_button.cc", - "atom/browser/api/views/atom_api_label_button.h", - "atom/browser/api/views/atom_api_layout_manager.cc", - "atom/browser/api/views/atom_api_layout_manager.h", - "atom/browser/api/views/atom_api_md_text_button.cc", - "atom/browser/api/views/atom_api_md_text_button.h", - "atom/browser/api/views/atom_api_resize_area.cc", - "atom/browser/api/views/atom_api_resize_area.h", - "atom/browser/api/views/atom_api_text_field.cc", - "atom/browser/api/views/atom_api_text_field.h", + "shell/browser/api/views/atom_api_box_layout.cc", + "shell/browser/api/views/atom_api_box_layout.h", + "shell/browser/api/views/atom_api_button.cc", + "shell/browser/api/views/atom_api_button.h", + "shell/browser/api/views/atom_api_label_button.cc", + "shell/browser/api/views/atom_api_label_button.h", + "shell/browser/api/views/atom_api_layout_manager.cc", + "shell/browser/api/views/atom_api_layout_manager.h", + "shell/browser/api/views/atom_api_md_text_button.cc", + "shell/browser/api/views/atom_api_md_text_button.h", + "shell/browser/api/views/atom_api_resize_area.cc", + "shell/browser/api/views/atom_api_resize_area.h", + "shell/browser/api/views/atom_api_text_field.cc", + "shell/browser/api/views/atom_api_text_field.h", ] } if (enable_basic_printing) { sources += [ - "atom/browser/printing/print_preview_message_handler.cc", - "atom/browser/printing/print_preview_message_handler.h", - "atom/renderer/printing/print_render_frame_helper_delegate.cc", - "atom/renderer/printing/print_render_frame_helper_delegate.h", + "shell/browser/printing/print_preview_message_handler.cc", + "shell/browser/printing/print_preview_message_handler.h", + "shell/renderer/printing/print_render_frame_helper_delegate.cc", + "shell/renderer/printing/print_render_frame_helper_delegate.h", ] } @@ -711,7 +711,7 @@ if (is_mac) { if (!is_mas_build) { deps += [ ":electron_crashpad_helper" ] } - info_plist = "atom/common/resources/mac/Info.plist" + info_plist = "shell/common/resources/mac/Info.plist" electron_version = read_file("ELECTRON_VERSION", "trim string") extra_substitutions = [ @@ -763,9 +763,9 @@ if (is_mac) { } defines = [ "HELPER_EXECUTABLE" ] sources = filenames.app_sources - sources += [ "atom/common/atom_constants.cc" ] + sources += [ "shell/common/atom_constants.cc" ] include_dirs = [ "." ] - info_plist = "atom/renderer/resources/mac/Info.plist" + info_plist = "shell/renderer/resources/mac/Info.plist" extra_substitutions = [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.helper" ] ldflags = [ @@ -806,7 +806,7 @@ if (is_mac) { sources = filenames.login_helper_sources include_dirs = [ "." ] libs = [ "AppKit.framework" ] - info_plist = "atom/app/resources/mac/loginhelper-Info.plist" + info_plist = "shell/app/resources/mac/loginhelper-Info.plist" extra_substitutions = [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ] } @@ -860,7 +860,7 @@ if (is_mac) { ] sources = [ "$root_out_dir/resources/default_app.asar", - "atom/browser/resources/mac/electron.icns", + "shell/browser/resources/mac/electron.icns", ] outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}", @@ -870,7 +870,7 @@ if (is_mac) { mac_app_bundle("electron_app") { output_name = electron_product_name sources = filenames.app_sources - sources += [ "atom/common/atom_constants.cc" ] + sources += [ "shell/common/atom_constants.cc" ] include_dirs = [ "." ] deps = [ ":electron_app_framework_bundle_data", @@ -879,7 +879,7 @@ if (is_mac) { if (is_mas_build) { deps += [ ":electron_login_helper_app" ] } - info_plist = "atom/browser/resources/mac/Info.plist" + info_plist = "shell/browser/resources/mac/Info.plist" electron_version = read_file("ELECTRON_VERSION", "trim string") extra_substitutions = [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id", @@ -893,8 +893,8 @@ if (is_mac) { } else { windows_manifest("electron_app_manifest") { sources = [ - "atom/browser/resources/win/disable_window_filtering.manifest", - "atom/browser/resources/win/dpi_aware.manifest", + "shell/browser/resources/win/disable_window_filtering.manifest", + "shell/browser/resources/win/dpi_aware.manifest", as_invoker_manifest, common_controls_manifest, default_compatibility_manifest, @@ -937,9 +937,9 @@ if (is_mac) { if (is_win) { sources += [ # TODO: we should be generating our .rc files more like how chrome does - "atom/browser/resources/win/atom.ico", - "atom/browser/resources/win/atom.rc", - "atom/browser/resources/win/resource.h", + "shell/browser/resources/win/atom.ico", + "shell/browser/resources/win/atom.rc", + "shell/browser/resources/win/resource.h", ] libs = [ diff --git a/appveyor.yml b/appveyor.yml index ca6c8d98eb..bf066d97a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,7 +75,7 @@ build_script: - gn check out/Default //electron:electron_lib - gn check out/Default //electron:electron_app - gn check out/Default //electron:manifests - - gn check out/Default //electron/atom/common/api:mojo + - gn check out/Default //electron/shell/common/api:mojo - ninja -C out/Default electron:electron_app - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default ) - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%" diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc index 547e6f1052..25b0007bae 100644 --- a/chromium_src/chrome/browser/process_singleton_posix.cc +++ b/chromium_src/chrome/browser/process_singleton_posix.cc @@ -55,8 +55,8 @@ #include -#include "atom/browser/browser.h" -#include "atom/common/atom_command_line.h" +#include "shell/browser/browser.h" +#include "shell/common/atom_command_line.h" #include "base/base_paths.h" #include "base/bind.h" diff --git a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc index 54bf67e503..bf13c3f01b 100644 --- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc +++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" -#include "atom/browser/ui/views/global_menu_bar_x11.h" #include "base/bind.h" #include "base/debug/leak_annotations.h" #include "base/logging.h" #include "content/public/browser/browser_thread.h" +#include "shell/browser/ui/views/global_menu_bar_x11.h" using content::BrowserThread; diff --git a/filenames.gni b/filenames.gni index 53b6c8b650..8eec52480b 100644 --- a/filenames.gni +++ b/filenames.gni @@ -23,571 +23,571 @@ filenames = { ] lib_sources = [ - "atom/app/atom_content_client.cc", - "atom/app/atom_content_client.h", - "atom/app/atom_main_delegate.cc", - "atom/app/atom_main_delegate.h", - "atom/app/atom_main_delegate_mac.h", - "atom/app/atom_main_delegate_mac.mm", - "atom/app/command_line_args.cc", - "atom/app/command_line_args.h", - "atom/app/uv_task_runner.cc", - "atom/app/uv_task_runner.h", - "atom/browser/api/atom_api_app_mac.mm", - "atom/browser/api/atom_api_app.cc", - "atom/browser/font_defaults.cc", - "atom/browser/font_defaults.h", - "atom/browser/feature_list.cc", - "atom/browser/feature_list.h", - "atom/browser/api/atom_api_app.h", - "atom/browser/api/atom_api_auto_updater.cc", - "atom/browser/api/atom_api_auto_updater.h", - "atom/browser/api/atom_api_browser_view.cc", - "atom/browser/api/atom_api_browser_view.h", - "atom/browser/api/atom_api_content_tracing.cc", - "atom/browser/api/atom_api_cookies.cc", - "atom/browser/api/atom_api_cookies.h", - "atom/browser/api/atom_api_debugger.cc", - "atom/browser/api/atom_api_debugger.h", - "atom/browser/api/atom_api_dialog.cc", - "atom/browser/api/atom_api_download_item.cc", - "atom/browser/api/atom_api_download_item.h", - "atom/browser/api/atom_api_event.cc", - "atom/browser/api/atom_api_global_shortcut.cc", - "atom/browser/api/atom_api_global_shortcut.h", - "atom/browser/api/atom_api_in_app_purchase.cc", - "atom/browser/api/atom_api_in_app_purchase.h", - "atom/browser/api/atom_api_menu.cc", - "atom/browser/api/atom_api_menu.h", - "atom/browser/api/atom_api_menu_mac.h", - "atom/browser/api/atom_api_menu_mac.mm", - "atom/browser/api/atom_api_menu_views.cc", - "atom/browser/api/atom_api_menu_views.h", - "atom/browser/api/atom_api_net.cc", - "atom/browser/api/atom_api_net.h", - "atom/browser/api/atom_api_net_log.cc", - "atom/browser/api/atom_api_net_log.h", - "atom/browser/api/atom_api_notification.cc", - "atom/browser/api/atom_api_notification.h", - "atom/browser/api/atom_api_power_monitor_mac.mm", - "atom/browser/api/atom_api_power_monitor_win.cc", - "atom/browser/api/atom_api_power_monitor.cc", - "atom/browser/api/atom_api_power_monitor.h", - "atom/browser/api/atom_api_power_save_blocker.cc", - "atom/browser/api/atom_api_power_save_blocker.h", - "atom/browser/api/atom_api_protocol.cc", - "atom/browser/api/atom_api_protocol.h", - "atom/browser/api/atom_api_protocol_ns.cc", - "atom/browser/api/atom_api_protocol_ns.h", - "atom/browser/api/atom_api_screen.cc", - "atom/browser/api/atom_api_screen.h", - "atom/browser/api/atom_api_session.cc", - "atom/browser/api/atom_api_session.h", - "atom/browser/api/atom_api_system_preferences.cc", - "atom/browser/api/atom_api_system_preferences.h", - "atom/browser/api/atom_api_system_preferences_mac.mm", - "atom/browser/api/atom_api_system_preferences_win.cc", - "atom/browser/api/atom_api_top_level_window.cc", - "atom/browser/api/atom_api_top_level_window.h", - "atom/browser/api/atom_api_tray.cc", - "atom/browser/api/atom_api_tray.h", - "atom/browser/api/atom_api_url_request.cc", - "atom/browser/api/atom_api_url_request.h", - "atom/browser/api/atom_api_view.cc", - "atom/browser/api/atom_api_view.h", - "atom/browser/api/atom_api_web_contents.cc", - "atom/browser/api/atom_api_web_contents.h", - "atom/browser/api/atom_api_web_contents_impl.cc", - "atom/browser/api/atom_api_web_contents_mac.mm", - "atom/browser/api/atom_api_web_contents_view.cc", - "atom/browser/api/atom_api_web_contents_view.h", - "atom/browser/api/atom_api_web_request.cc", - "atom/browser/api/atom_api_web_request.h", - "atom/browser/api/atom_api_web_view_manager.cc", - "atom/browser/api/atom_api_browser_window.cc", - "atom/browser/api/atom_api_browser_window.h", - "atom/browser/api/atom_api_browser_window_mac.mm", - "atom/browser/api/atom_api_browser_window_views.cc", - "atom/browser/api/event.cc", - "atom/browser/api/event.h", - "atom/browser/api/event_emitter.cc", - "atom/browser/api/event_emitter.h", - "atom/browser/api/stream_subscriber.cc", - "atom/browser/api/stream_subscriber.h", - "atom/browser/api/trackable_object.cc", - "atom/browser/api/trackable_object.h", - "atom/browser/api/frame_subscriber.cc", - "atom/browser/api/frame_subscriber.h", - "atom/browser/api/gpu_info_enumerator.cc", - "atom/browser/api/gpu_info_enumerator.h", - "atom/browser/api/gpuinfo_manager.cc", - "atom/browser/api/gpuinfo_manager.h", - "atom/browser/api/process_metric.cc", - "atom/browser/api/process_metric.h", - "atom/browser/api/save_page_handler.cc", - "atom/browser/api/save_page_handler.h", - "atom/browser/auto_updater.cc", - "atom/browser/auto_updater.h", - "atom/browser/auto_updater_mac.mm", - "atom/browser/atom_blob_reader.cc", - "atom/browser/atom_blob_reader.h", - "atom/browser/atom_browser_client.cc", - "atom/browser/atom_browser_client.h", - "atom/browser/atom_browser_context.cc", - "atom/browser/atom_browser_context.h", - "atom/browser/atom_download_manager_delegate.cc", - "atom/browser/atom_download_manager_delegate.h", - "atom/browser/atom_gpu_client.cc", - "atom/browser/atom_gpu_client.h", - "atom/browser/atom_browser_main_parts.cc", - "atom/browser/atom_browser_main_parts.h", - "atom/browser/atom_browser_main_parts_mac.mm", - "atom/browser/atom_browser_main_parts_posix.cc", - "atom/browser/atom_javascript_dialog_manager.cc", - "atom/browser/atom_javascript_dialog_manager.h", - "atom/browser/atom_navigation_throttle.h", - "atom/browser/atom_navigation_throttle.cc", - "atom/browser/atom_paths.h", - "atom/browser/atom_permission_manager.cc", - "atom/browser/atom_permission_manager.h", - "atom/browser/atom_quota_permission_context.cc", - "atom/browser/atom_quota_permission_context.h", - "atom/browser/atom_speech_recognition_manager_delegate.cc", - "atom/browser/atom_speech_recognition_manager_delegate.h", - "atom/browser/atom_web_ui_controller_factory.cc", - "atom/browser/atom_web_ui_controller_factory.h", - "atom/browser/browser.cc", - "atom/browser/browser.h", - "atom/browser/browser_linux.cc", - "atom/browser/browser_mac.mm", - "atom/browser/browser_win.cc", - "atom/browser/browser_observer.h", - "atom/browser/browser_process_impl.cc", - "atom/browser/browser_process_impl.h", - "atom/browser/child_web_contents_tracker.cc", - "atom/browser/child_web_contents_tracker.h", - "atom/browser/common_web_contents_delegate_mac.mm", - "atom/browser/common_web_contents_delegate_views.cc", - "atom/browser/common_web_contents_delegate.cc", - "atom/browser/common_web_contents_delegate.h", - "atom/browser/cookie_change_notifier.cc", - "atom/browser/cookie_change_notifier.h", - "atom/browser/io_thread.cc", - "atom/browser/io_thread.h", - "atom/browser/javascript_environment.cc", - "atom/browser/javascript_environment.h", - "atom/browser/lib/bluetooth_chooser.cc", - "atom/browser/lib/bluetooth_chooser.h", - "atom/browser/lib/power_observer.h", - "atom/browser/lib/power_observer_linux.h", - "atom/browser/lib/power_observer_linux.cc", - "atom/browser/loader/layered_resource_handler.cc", - "atom/browser/loader/layered_resource_handler.h", - "atom/browser/login_handler.cc", - "atom/browser/login_handler.h", - "atom/browser/mac/atom_application.h", - "atom/browser/mac/atom_application.mm", - "atom/browser/mac/atom_application_delegate.h", - "atom/browser/mac/atom_application_delegate.mm", - "atom/browser/mac/dict_util.h", - "atom/browser/mac/dict_util.mm", - "atom/browser/mac/in_app_purchase.h", - "atom/browser/mac/in_app_purchase.mm", - "atom/browser/mac/in_app_purchase_observer.h", - "atom/browser/mac/in_app_purchase_observer.mm", - "atom/browser/mac/in_app_purchase_product.h", - "atom/browser/mac/in_app_purchase_product.mm", - "atom/browser/microtasks_runner.cc", - "atom/browser/microtasks_runner.h", - "atom/browser/native_browser_view.cc", - "atom/browser/native_browser_view.h", - "atom/browser/native_browser_view_mac.h", - "atom/browser/native_browser_view_mac.mm", - "atom/browser/native_browser_view_views.h", - "atom/browser/native_browser_view_views.cc", - "atom/browser/native_window.cc", - "atom/browser/native_window.h", - "atom/browser/native_window_views_win.cc", - "atom/browser/native_window_views.cc", - "atom/browser/native_window_views.h", - "atom/browser/native_window_mac.h", - "atom/browser/native_window_mac.mm", - "atom/browser/native_window_observer.h", - "atom/browser/media/media_capture_devices_dispatcher.cc", - "atom/browser/media/media_capture_devices_dispatcher.h", - "atom/browser/media/media_device_id_salt.cc", - "atom/browser/media/media_device_id_salt.h", - "atom/browser/media/media_stream_devices_controller.cc", - "atom/browser/media/media_stream_devices_controller.h", - "atom/browser/net/about_protocol_handler.cc", - "atom/browser/net/about_protocol_handler.h", - "atom/browser/net/asar/asar_protocol_handler.cc", - "atom/browser/net/asar/asar_protocol_handler.h", - "atom/browser/net/asar/asar_url_loader.cc", - "atom/browser/net/asar/asar_url_loader.h", - "atom/browser/net/asar/url_request_asar_job.cc", - "atom/browser/net/asar/url_request_asar_job.h", - "atom/browser/net/atom_cert_verifier.cc", - "atom/browser/net/atom_cert_verifier.h", - "atom/browser/net/atom_network_delegate.cc", - "atom/browser/net/atom_network_delegate.h", - "atom/browser/net/atom_url_loader_factory.cc", - "atom/browser/net/atom_url_loader_factory.h", - "atom/browser/net/atom_url_request.cc", - "atom/browser/net/atom_url_request.h", - "atom/browser/net/atom_url_request_job_factory.cc", - "atom/browser/net/atom_url_request_job_factory.h", - "atom/browser/net/http_protocol_handler.cc", - "atom/browser/net/http_protocol_handler.h", - "atom/browser/net/proxying_url_loader_factory.cc", - "atom/browser/net/proxying_url_loader_factory.h", - "atom/browser/net/js_asker.cc", - "atom/browser/net/js_asker.h", - "atom/browser/net/network_context_service_factory.cc", - "atom/browser/net/network_context_service_factory.h", - "atom/browser/net/network_context_service.cc", - "atom/browser/net/network_context_service.h", - "atom/browser/net/node_stream_loader.cc", - "atom/browser/net/node_stream_loader.h", - "atom/browser/net/require_ct_delegate.cc", - "atom/browser/net/require_ct_delegate.h", - "atom/browser/net/resolve_proxy_helper.cc", - "atom/browser/net/resolve_proxy_helper.h", - "atom/browser/net/system_network_context_manager.cc", - "atom/browser/net/system_network_context_manager.h", - "atom/browser/net/url_pipe_loader.cc", - "atom/browser/net/url_pipe_loader.h", - "atom/browser/net/url_request_about_job.cc", - "atom/browser/net/url_request_about_job.h", - "atom/browser/net/url_request_async_asar_job.cc", - "atom/browser/net/url_request_async_asar_job.h", - "atom/browser/net/url_request_string_job.cc", - "atom/browser/net/url_request_string_job.h", - "atom/browser/net/url_request_buffer_job.cc", - "atom/browser/net/url_request_buffer_job.h", - "atom/browser/net/url_request_context_getter.cc", - "atom/browser/net/url_request_context_getter.h", - "atom/browser/net/url_request_fetch_job.cc", - "atom/browser/net/url_request_fetch_job.h", - "atom/browser/net/url_request_stream_job.cc", - "atom/browser/net/url_request_stream_job.h", - "atom/browser/notifications/linux/libnotify_notification.cc", - "atom/browser/notifications/linux/libnotify_notification.h", - "atom/browser/notifications/linux/notification_presenter_linux.cc", - "atom/browser/notifications/linux/notification_presenter_linux.h", - "atom/browser/notifications/mac/cocoa_notification.h", - "atom/browser/notifications/mac/cocoa_notification.mm", - "atom/browser/notifications/mac/notification_center_delegate.h", - "atom/browser/notifications/mac/notification_center_delegate.mm", - "atom/browser/notifications/mac/notification_presenter_mac.h", - "atom/browser/notifications/mac/notification_presenter_mac.mm", - "atom/browser/notifications/notification.cc", - "atom/browser/notifications/notification.h", - "atom/browser/notifications/notification_delegate.h", - "atom/browser/notifications/notification_presenter.cc", - "atom/browser/notifications/notification_presenter.h", - "atom/browser/notifications/platform_notification_service.cc", - "atom/browser/notifications/platform_notification_service.h", - "atom/browser/notifications/win/notification_presenter_win.cc", - "atom/browser/notifications/win/notification_presenter_win.h", - "atom/browser/notifications/win/notification_presenter_win7.cc", - "atom/browser/notifications/win/notification_presenter_win7.h", - "atom/browser/notifications/win/win32_desktop_notifications/common.h", - "atom/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc", - "atom/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h", - "atom/browser/notifications/win/win32_desktop_notifications/toast.cc", - "atom/browser/notifications/win/win32_desktop_notifications/toast.h", - "atom/browser/notifications/win/win32_desktop_notifications/toast_uia.cc", - "atom/browser/notifications/win/win32_desktop_notifications/toast_uia.h", - "atom/browser/notifications/win/win32_notification.cc", - "atom/browser/notifications/win/win32_notification.h", - "atom/browser/notifications/win/windows_toast_notification.cc", - "atom/browser/notifications/win/windows_toast_notification.h", - "atom/browser/node_debugger.cc", - "atom/browser/node_debugger.h", - "atom/browser/pref_store_delegate.cc", - "atom/browser/pref_store_delegate.h", - "atom/browser/relauncher_linux.cc", - "atom/browser/relauncher_mac.cc", - "atom/browser/relauncher_win.cc", - "atom/browser/relauncher.cc", - "atom/browser/relauncher.h", - "atom/browser/session_preferences.cc", - "atom/browser/session_preferences.h", - "atom/browser/special_storage_policy.cc", - "atom/browser/special_storage_policy.h", - "atom/browser/ui/accelerator_util.cc", - "atom/browser/ui/accelerator_util.h", - "atom/browser/ui/atom_menu_model.cc", - "atom/browser/ui/atom_menu_model.h", - "atom/browser/ui/autofill_popup.cc", - "atom/browser/ui/autofill_popup.h", - "atom/browser/ui/certificate_trust.h", - "atom/browser/ui/certificate_trust_mac.mm", - "atom/browser/ui/certificate_trust_win.cc", - "atom/browser/ui/cocoa/atom_bundle_mover.h", - "atom/browser/ui/cocoa/atom_bundle_mover.mm", - "atom/browser/ui/cocoa/atom_menu_controller.h", - "atom/browser/ui/cocoa/atom_menu_controller.mm", - "atom/browser/ui/cocoa/atom_native_widget_mac.h", - "atom/browser/ui/cocoa/atom_native_widget_mac.mm", - "atom/browser/ui/cocoa/atom_ns_window.h", - "atom/browser/ui/cocoa/atom_ns_window.mm", - "atom/browser/ui/cocoa/atom_ns_window_delegate.h", - "atom/browser/ui/cocoa/atom_ns_window_delegate.mm", - "atom/browser/ui/cocoa/atom_preview_item.h", - "atom/browser/ui/cocoa/atom_preview_item.mm", - "atom/browser/ui/cocoa/atom_touch_bar.h", - "atom/browser/ui/cocoa/atom_touch_bar.mm", - "atom/browser/ui/cocoa/delayed_native_view_host.cc", - "atom/browser/ui/cocoa/delayed_native_view_host.h", - "atom/browser/ui/cocoa/views_delegate_mac.h", - "atom/browser/ui/cocoa/views_delegate_mac.mm", - "atom/browser/ui/cocoa/root_view_mac.mm", - "atom/browser/ui/cocoa/root_view_mac.h", - "atom/browser/ui/cocoa/touch_bar_forward_declarations.h", - "atom/browser/ui/cocoa/atom_inspectable_web_contents_view.h", - "atom/browser/ui/cocoa/atom_inspectable_web_contents_view.mm", - "atom/browser/ui/cocoa/event_dispatching_window.h", - "atom/browser/ui/cocoa/event_dispatching_window.mm", - "atom/browser/ui/devtools_manager_delegate.cc", - "atom/browser/ui/devtools_manager_delegate.h", - "atom/browser/ui/devtools_ui.cc", - "atom/browser/ui/devtools_ui.h", - "atom/browser/ui/drag_util_mac.mm", - "atom/browser/ui/drag_util_views.cc", - "atom/browser/ui/drag_util.h", - "atom/browser/ui/file_dialog.h", - "atom/browser/ui/file_dialog_gtk.cc", - "atom/browser/ui/file_dialog_mac.mm", - "atom/browser/ui/file_dialog_win.cc", - "atom/browser/ui/inspectable_web_contents.cc", - "atom/browser/ui/inspectable_web_contents.h", - "atom/browser/ui/inspectable_web_contents_delegate.h", - "atom/browser/ui/inspectable_web_contents_impl.cc", - "atom/browser/ui/inspectable_web_contents_impl.h", - "atom/browser/ui/inspectable_web_contents_view.h", - "atom/browser/ui/inspectable_web_contents_view_delegate.cc", - "atom/browser/ui/inspectable_web_contents_view_delegate.h", - "atom/browser/ui/inspectable_web_contents_view_mac.h", - "atom/browser/ui/inspectable_web_contents_view_mac.mm", - "atom/browser/ui/message_box.h", - "atom/browser/ui/message_box_gtk.cc", - "atom/browser/ui/message_box_mac.mm", - "atom/browser/ui/message_box_win.cc", - "atom/browser/ui/cocoa/NSColor+Hex.mm", - "atom/browser/ui/cocoa/NSColor+Hex.h", - "atom/browser/ui/cocoa/NSString+ANSI.mm", - "atom/browser/ui/cocoa/NSString+ANSI.h", - "atom/browser/ui/tray_icon.cc", - "atom/browser/ui/tray_icon.h", - "atom/browser/ui/tray_icon_gtk.cc", - "atom/browser/ui/tray_icon_gtk.h", - "atom/browser/ui/tray_icon_cocoa.h", - "atom/browser/ui/tray_icon_cocoa.mm", - "atom/browser/ui/tray_icon_observer.h", - "atom/browser/ui/tray_icon_win.cc", - "atom/browser/ui/views/atom_views_delegate.cc", - "atom/browser/ui/views/atom_views_delegate.h", - "atom/browser/ui/views/autofill_popup_view.cc", - "atom/browser/ui/views/autofill_popup_view.h", - "atom/browser/ui/views/frameless_view.cc", - "atom/browser/ui/views/frameless_view.h", - "atom/browser/ui/views/global_menu_bar_x11.cc", - "atom/browser/ui/views/global_menu_bar_x11.h", - "atom/browser/ui/views/inspectable_web_contents_view_views.cc", - "atom/browser/ui/views/inspectable_web_contents_view_views.h", - "atom/browser/ui/views/menu_bar.cc", - "atom/browser/ui/views/menu_bar.h", - "atom/browser/ui/views/menu_delegate.cc", - "atom/browser/ui/views/menu_delegate.h", - "atom/browser/ui/views/menu_model_adapter.cc", - "atom/browser/ui/views/menu_model_adapter.h", - "atom/browser/ui/views/native_frame_view.cc", - "atom/browser/ui/views/native_frame_view.h", - "atom/browser/ui/views/root_view.cc", - "atom/browser/ui/views/root_view.h", - "atom/browser/ui/views/submenu_button.cc", - "atom/browser/ui/views/submenu_button.h", - "atom/browser/ui/views/win_frame_view.cc", - "atom/browser/ui/views/win_frame_view.h", - "atom/browser/ui/win/atom_desktop_native_widget_aura.cc", - "atom/browser/ui/win/atom_desktop_native_widget_aura.h", - "atom/browser/ui/win/atom_desktop_window_tree_host_win.cc", - "atom/browser/ui/win/atom_desktop_window_tree_host_win.h", - "atom/browser/ui/win/jump_list.cc", - "atom/browser/ui/win/jump_list.h", - "atom/browser/ui/win/notify_icon_host.cc", - "atom/browser/ui/win/notify_icon_host.h", - "atom/browser/ui/win/notify_icon.cc", - "atom/browser/ui/win/notify_icon.h", - "atom/browser/ui/win/taskbar_host.cc", - "atom/browser/ui/win/taskbar_host.h", - "atom/browser/ui/x/event_disabler.cc", - "atom/browser/ui/x/event_disabler.h", - "atom/browser/ui/x/window_state_watcher.cc", - "atom/browser/ui/x/window_state_watcher.h", - "atom/browser/ui/x/x_window_utils.cc", - "atom/browser/ui/x/x_window_utils.h", - "atom/browser/unresponsive_suppressor.cc", - "atom/browser/unresponsive_suppressor.h", - "atom/browser/win/scoped_hstring.cc", - "atom/browser/win/scoped_hstring.h", - "atom/browser/web_contents_permission_helper.cc", - "atom/browser/web_contents_permission_helper.h", - "atom/browser/web_contents_preferences.cc", - "atom/browser/web_contents_preferences.h", - "atom/browser/web_contents_zoom_controller.cc", - "atom/browser/web_contents_zoom_controller.h", - "atom/browser/web_dialog_helper.cc", - "atom/browser/web_dialog_helper.h", - "atom/browser/web_view_guest_delegate.cc", - "atom/browser/web_view_guest_delegate.h", - "atom/browser/web_view_manager.cc", - "atom/browser/web_view_manager.h", - "atom/browser/window_list.cc", - "atom/browser/window_list.h", - "atom/browser/window_list_observer.h", - "atom/browser/zoom_level_delegate.cc", - "atom/browser/zoom_level_delegate.h", - "atom/common/api/atom_api_asar.cc", - "atom/common/api/atom_api_clipboard.cc", - "atom/common/api/atom_api_clipboard.h", - "atom/common/api/atom_api_clipboard_mac.mm", - "atom/common/api/atom_api_command_line.cc", - "atom/common/api/atom_api_crash_reporter.cc", - "atom/common/api/atom_api_key_weak_map.h", - "atom/common/api/atom_api_native_image.cc", - "atom/common/api/atom_api_native_image.h", - "atom/common/api/atom_api_native_image_mac.mm", - "atom/common/api/atom_api_shell.cc", - "atom/common/api/atom_api_v8_util.cc", - "atom/common/api/electron_bindings.cc", - "atom/common/api/electron_bindings.h", - "atom/common/api/constructor.h", - "atom/common/api/event_emitter_caller.cc", - "atom/common/api/event_emitter_caller.h", - "atom/common/api/features.cc", - "atom/common/api/locker.cc", - "atom/common/api/locker.h", - "atom/common/api/object_life_monitor.cc", - "atom/common/api/object_life_monitor.h", - "atom/common/api/remote_callback_freer.cc", - "atom/common/api/remote_callback_freer.h", - "atom/common/api/remote_object_freer.cc", - "atom/common/api/remote_object_freer.h", - "atom/common/asar/archive.cc", - "atom/common/asar/archive.h", - "atom/common/asar/asar_util.cc", - "atom/common/asar/asar_util.h", - "atom/common/asar/scoped_temporary_file.cc", - "atom/common/asar/scoped_temporary_file.h", - "atom/common/application_info_linux.cc", - "atom/common/application_info_mac.mm", - "atom/common/application_info_win.cc", - "atom/common/application_info.cc", - "atom/common/application_info.h", - "atom/common/atom_command_line.cc", - "atom/common/atom_command_line.h", - "atom/common/atom_constants.cc", - "atom/common/atom_constants.h", - "atom/common/color_util.cc", - "atom/common/color_util.h", - "atom/common/crash_reporter/crash_reporter.cc", - "atom/common/crash_reporter/crash_reporter.h", - "atom/common/crash_reporter/crash_reporter_linux.cc", - "atom/common/crash_reporter/crash_reporter_linux.h", - "atom/common/crash_reporter/crash_reporter_mac.h", - "atom/common/crash_reporter/crash_reporter_mac.mm", - "atom/common/crash_reporter/crash_reporter_win.h", - "atom/common/crash_reporter/crash_reporter_win.cc", - "atom/common/crash_reporter/linux/crash_dump_handler.cc", - "atom/common/crash_reporter/linux/crash_dump_handler.h", - "atom/common/crash_reporter/win/crash_service_main.cc", - "atom/common/crash_reporter/win/crash_service_main.h", - "atom/common/gin_util.h", - "atom/common/heap_snapshot.cc", - "atom/common/heap_snapshot.h", - "atom/common/key_weak_map.h", - "atom/common/keyboard_util.cc", - "atom/common/keyboard_util.h", - "atom/common/deprecate_util.cc", - "atom/common/deprecate_util.h", - "atom/common/mouse_util.cc", - "atom/common/mouse_util.h", - "atom/common/mac/main_application_bundle.h", - "atom/common/mac/main_application_bundle.mm", - "atom/common/native_mate_converters/accelerator_converter.cc", - "atom/common/native_mate_converters/accelerator_converter.h", - "atom/common/native_mate_converters/blink_converter.cc", - "atom/common/native_mate_converters/blink_converter.h", - "atom/common/native_mate_converters/callback.cc", - "atom/common/native_mate_converters/callback.h", - "atom/common/native_mate_converters/content_converter.cc", - "atom/common/native_mate_converters/content_converter.h", - "atom/common/native_mate_converters/file_dialog_converter.cc", - "atom/common/native_mate_converters/file_dialog_converter.h", - "atom/common/native_mate_converters/message_box_converter.cc", - "atom/common/native_mate_converters/message_box_converter.h", - "atom/common/native_mate_converters/file_path_converter.h", - "atom/common/native_mate_converters/gfx_converter.cc", - "atom/common/native_mate_converters/gfx_converter.h", - "atom/common/native_mate_converters/gurl_converter.h", - "atom/common/native_mate_converters/image_converter.cc", - "atom/common/native_mate_converters/image_converter.h", - "atom/common/native_mate_converters/map_converter.h", - "atom/common/native_mate_converters/net_converter.cc", - "atom/common/native_mate_converters/net_converter.h", - "atom/common/native_mate_converters/network_converter.cc", - "atom/common/native_mate_converters/network_converter.h", - "atom/common/native_mate_converters/once_callback.h", - "atom/common/native_mate_converters/string16_converter.h", - "atom/common/native_mate_converters/ui_base_types_converter.h", - "atom/common/native_mate_converters/v8_value_converter.cc", - "atom/common/native_mate_converters/v8_value_converter.h", - "atom/common/native_mate_converters/value_converter.cc", - "atom/common/native_mate_converters/value_converter.h", - "atom/common/node_bindings.cc", - "atom/common/node_bindings.h", - "atom/common/node_bindings_linux.cc", - "atom/common/node_bindings_linux.h", - "atom/common/node_bindings_mac.cc", - "atom/common/node_bindings_mac.h", - "atom/common/node_bindings_win.cc", - "atom/common/node_bindings_win.h", - "atom/common/node_includes.h", - "atom/common/options_switches.cc", - "atom/common/options_switches.h", - "atom/common/platform_util.h", - "atom/common/platform_util_linux.cc", - "atom/common/platform_util_mac.mm", - "atom/common/platform_util_win.cc", - "atom/common/promise_util.h", - "atom/common/promise_util.cc", - "atom/renderer/api/atom_api_renderer_ipc.cc", - "atom/renderer/api/atom_api_spell_check_client.cc", - "atom/renderer/api/atom_api_spell_check_client.h", - "atom/renderer/api/atom_api_web_frame.cc", - "atom/renderer/atom_autofill_agent.cc", - "atom/renderer/atom_autofill_agent.h", - "atom/renderer/atom_render_frame_observer.cc", - "atom/renderer/atom_render_frame_observer.h", - "atom/renderer/atom_renderer_client.cc", - "atom/renderer/atom_renderer_client.h", - "atom/renderer/content_settings_observer.cc", - "atom/renderer/content_settings_observer.h", - "atom/renderer/electron_api_service_impl.cc", - "atom/renderer/electron_api_service_impl.h", - "atom/renderer/atom_sandboxed_renderer_client.cc", - "atom/renderer/atom_sandboxed_renderer_client.h", - "atom/renderer/guest_view_container.cc", - "atom/renderer/guest_view_container.h", - "atom/renderer/renderer_client_base.cc", - "atom/renderer/renderer_client_base.h", - "atom/renderer/web_worker_observer.cc", - "atom/renderer/web_worker_observer.h", - "atom/utility/atom_content_utility_client.cc", - "atom/utility/atom_content_utility_client.h", + "shell/app/atom_content_client.cc", + "shell/app/atom_content_client.h", + "shell/app/atom_main_delegate.cc", + "shell/app/atom_main_delegate.h", + "shell/app/atom_main_delegate_mac.h", + "shell/app/atom_main_delegate_mac.mm", + "shell/app/command_line_args.cc", + "shell/app/command_line_args.h", + "shell/app/uv_task_runner.cc", + "shell/app/uv_task_runner.h", + "shell/browser/api/atom_api_app_mac.mm", + "shell/browser/api/atom_api_app.cc", + "shell/browser/font_defaults.cc", + "shell/browser/font_defaults.h", + "shell/browser/feature_list.cc", + "shell/browser/feature_list.h", + "shell/browser/api/atom_api_app.h", + "shell/browser/api/atom_api_auto_updater.cc", + "shell/browser/api/atom_api_auto_updater.h", + "shell/browser/api/atom_api_browser_view.cc", + "shell/browser/api/atom_api_browser_view.h", + "shell/browser/api/atom_api_content_tracing.cc", + "shell/browser/api/atom_api_cookies.cc", + "shell/browser/api/atom_api_cookies.h", + "shell/browser/api/atom_api_debugger.cc", + "shell/browser/api/atom_api_debugger.h", + "shell/browser/api/atom_api_dialog.cc", + "shell/browser/api/atom_api_download_item.cc", + "shell/browser/api/atom_api_download_item.h", + "shell/browser/api/atom_api_event.cc", + "shell/browser/api/atom_api_global_shortcut.cc", + "shell/browser/api/atom_api_global_shortcut.h", + "shell/browser/api/atom_api_in_app_purchase.cc", + "shell/browser/api/atom_api_in_app_purchase.h", + "shell/browser/api/atom_api_menu.cc", + "shell/browser/api/atom_api_menu.h", + "shell/browser/api/atom_api_menu_mac.h", + "shell/browser/api/atom_api_menu_mac.mm", + "shell/browser/api/atom_api_menu_views.cc", + "shell/browser/api/atom_api_menu_views.h", + "shell/browser/api/atom_api_net.cc", + "shell/browser/api/atom_api_net.h", + "shell/browser/api/atom_api_net_log.cc", + "shell/browser/api/atom_api_net_log.h", + "shell/browser/api/atom_api_notification.cc", + "shell/browser/api/atom_api_notification.h", + "shell/browser/api/atom_api_power_monitor_mac.mm", + "shell/browser/api/atom_api_power_monitor_win.cc", + "shell/browser/api/atom_api_power_monitor.cc", + "shell/browser/api/atom_api_power_monitor.h", + "shell/browser/api/atom_api_power_save_blocker.cc", + "shell/browser/api/atom_api_power_save_blocker.h", + "shell/browser/api/atom_api_protocol.cc", + "shell/browser/api/atom_api_protocol.h", + "shell/browser/api/atom_api_protocol_ns.cc", + "shell/browser/api/atom_api_protocol_ns.h", + "shell/browser/api/atom_api_screen.cc", + "shell/browser/api/atom_api_screen.h", + "shell/browser/api/atom_api_session.cc", + "shell/browser/api/atom_api_session.h", + "shell/browser/api/atom_api_system_preferences.cc", + "shell/browser/api/atom_api_system_preferences.h", + "shell/browser/api/atom_api_system_preferences_mac.mm", + "shell/browser/api/atom_api_system_preferences_win.cc", + "shell/browser/api/atom_api_top_level_window.cc", + "shell/browser/api/atom_api_top_level_window.h", + "shell/browser/api/atom_api_tray.cc", + "shell/browser/api/atom_api_tray.h", + "shell/browser/api/atom_api_url_request.cc", + "shell/browser/api/atom_api_url_request.h", + "shell/browser/api/atom_api_view.cc", + "shell/browser/api/atom_api_view.h", + "shell/browser/api/atom_api_web_contents.cc", + "shell/browser/api/atom_api_web_contents.h", + "shell/browser/api/atom_api_web_contents_impl.cc", + "shell/browser/api/atom_api_web_contents_mac.mm", + "shell/browser/api/atom_api_web_contents_view.cc", + "shell/browser/api/atom_api_web_contents_view.h", + "shell/browser/api/atom_api_web_request.cc", + "shell/browser/api/atom_api_web_request.h", + "shell/browser/api/atom_api_web_view_manager.cc", + "shell/browser/api/atom_api_browser_window.cc", + "shell/browser/api/atom_api_browser_window.h", + "shell/browser/api/atom_api_browser_window_mac.mm", + "shell/browser/api/atom_api_browser_window_views.cc", + "shell/browser/api/event.cc", + "shell/browser/api/event.h", + "shell/browser/api/event_emitter.cc", + "shell/browser/api/event_emitter.h", + "shell/browser/api/stream_subscriber.cc", + "shell/browser/api/stream_subscriber.h", + "shell/browser/api/trackable_object.cc", + "shell/browser/api/trackable_object.h", + "shell/browser/api/frame_subscriber.cc", + "shell/browser/api/frame_subscriber.h", + "shell/browser/api/gpu_info_enumerator.cc", + "shell/browser/api/gpu_info_enumerator.h", + "shell/browser/api/gpuinfo_manager.cc", + "shell/browser/api/gpuinfo_manager.h", + "shell/browser/api/process_metric.cc", + "shell/browser/api/process_metric.h", + "shell/browser/api/save_page_handler.cc", + "shell/browser/api/save_page_handler.h", + "shell/browser/auto_updater.cc", + "shell/browser/auto_updater.h", + "shell/browser/auto_updater_mac.mm", + "shell/browser/atom_blob_reader.cc", + "shell/browser/atom_blob_reader.h", + "shell/browser/atom_browser_client.cc", + "shell/browser/atom_browser_client.h", + "shell/browser/atom_browser_context.cc", + "shell/browser/atom_browser_context.h", + "shell/browser/atom_download_manager_delegate.cc", + "shell/browser/atom_download_manager_delegate.h", + "shell/browser/atom_gpu_client.cc", + "shell/browser/atom_gpu_client.h", + "shell/browser/atom_browser_main_parts.cc", + "shell/browser/atom_browser_main_parts.h", + "shell/browser/atom_browser_main_parts_mac.mm", + "shell/browser/atom_browser_main_parts_posix.cc", + "shell/browser/atom_javascript_dialog_manager.cc", + "shell/browser/atom_javascript_dialog_manager.h", + "shell/browser/atom_navigation_throttle.h", + "shell/browser/atom_navigation_throttle.cc", + "shell/browser/atom_paths.h", + "shell/browser/atom_permission_manager.cc", + "shell/browser/atom_permission_manager.h", + "shell/browser/atom_quota_permission_context.cc", + "shell/browser/atom_quota_permission_context.h", + "shell/browser/atom_speech_recognition_manager_delegate.cc", + "shell/browser/atom_speech_recognition_manager_delegate.h", + "shell/browser/atom_web_ui_controller_factory.cc", + "shell/browser/atom_web_ui_controller_factory.h", + "shell/browser/browser.cc", + "shell/browser/browser.h", + "shell/browser/browser_linux.cc", + "shell/browser/browser_mac.mm", + "shell/browser/browser_win.cc", + "shell/browser/browser_observer.h", + "shell/browser/browser_process_impl.cc", + "shell/browser/browser_process_impl.h", + "shell/browser/child_web_contents_tracker.cc", + "shell/browser/child_web_contents_tracker.h", + "shell/browser/common_web_contents_delegate_mac.mm", + "shell/browser/common_web_contents_delegate_views.cc", + "shell/browser/common_web_contents_delegate.cc", + "shell/browser/common_web_contents_delegate.h", + "shell/browser/cookie_change_notifier.cc", + "shell/browser/cookie_change_notifier.h", + "shell/browser/io_thread.cc", + "shell/browser/io_thread.h", + "shell/browser/javascript_environment.cc", + "shell/browser/javascript_environment.h", + "shell/browser/lib/bluetooth_chooser.cc", + "shell/browser/lib/bluetooth_chooser.h", + "shell/browser/lib/power_observer.h", + "shell/browser/lib/power_observer_linux.h", + "shell/browser/lib/power_observer_linux.cc", + "shell/browser/loader/layered_resource_handler.cc", + "shell/browser/loader/layered_resource_handler.h", + "shell/browser/login_handler.cc", + "shell/browser/login_handler.h", + "shell/browser/mac/atom_application.h", + "shell/browser/mac/atom_application.mm", + "shell/browser/mac/atom_application_delegate.h", + "shell/browser/mac/atom_application_delegate.mm", + "shell/browser/mac/dict_util.h", + "shell/browser/mac/dict_util.mm", + "shell/browser/mac/in_app_purchase.h", + "shell/browser/mac/in_app_purchase.mm", + "shell/browser/mac/in_app_purchase_observer.h", + "shell/browser/mac/in_app_purchase_observer.mm", + "shell/browser/mac/in_app_purchase_product.h", + "shell/browser/mac/in_app_purchase_product.mm", + "shell/browser/microtasks_runner.cc", + "shell/browser/microtasks_runner.h", + "shell/browser/native_browser_view.cc", + "shell/browser/native_browser_view.h", + "shell/browser/native_browser_view_mac.h", + "shell/browser/native_browser_view_mac.mm", + "shell/browser/native_browser_view_views.h", + "shell/browser/native_browser_view_views.cc", + "shell/browser/native_window.cc", + "shell/browser/native_window.h", + "shell/browser/native_window_views_win.cc", + "shell/browser/native_window_views.cc", + "shell/browser/native_window_views.h", + "shell/browser/native_window_mac.h", + "shell/browser/native_window_mac.mm", + "shell/browser/native_window_observer.h", + "shell/browser/media/media_capture_devices_dispatcher.cc", + "shell/browser/media/media_capture_devices_dispatcher.h", + "shell/browser/media/media_device_id_salt.cc", + "shell/browser/media/media_device_id_salt.h", + "shell/browser/media/media_stream_devices_controller.cc", + "shell/browser/media/media_stream_devices_controller.h", + "shell/browser/net/about_protocol_handler.cc", + "shell/browser/net/about_protocol_handler.h", + "shell/browser/net/asar/asar_protocol_handler.cc", + "shell/browser/net/asar/asar_protocol_handler.h", + "shell/browser/net/asar/asar_url_loader.cc", + "shell/browser/net/asar/asar_url_loader.h", + "shell/browser/net/asar/url_request_asar_job.cc", + "shell/browser/net/asar/url_request_asar_job.h", + "shell/browser/net/atom_cert_verifier.cc", + "shell/browser/net/atom_cert_verifier.h", + "shell/browser/net/atom_network_delegate.cc", + "shell/browser/net/atom_network_delegate.h", + "shell/browser/net/atom_url_loader_factory.cc", + "shell/browser/net/atom_url_loader_factory.h", + "shell/browser/net/atom_url_request.cc", + "shell/browser/net/atom_url_request.h", + "shell/browser/net/atom_url_request_job_factory.cc", + "shell/browser/net/atom_url_request_job_factory.h", + "shell/browser/net/http_protocol_handler.cc", + "shell/browser/net/http_protocol_handler.h", + "shell/browser/net/proxying_url_loader_factory.cc", + "shell/browser/net/proxying_url_loader_factory.h", + "shell/browser/net/js_asker.cc", + "shell/browser/net/js_asker.h", + "shell/browser/net/network_context_service_factory.cc", + "shell/browser/net/network_context_service_factory.h", + "shell/browser/net/network_context_service.cc", + "shell/browser/net/network_context_service.h", + "shell/browser/net/node_stream_loader.cc", + "shell/browser/net/node_stream_loader.h", + "shell/browser/net/require_ct_delegate.cc", + "shell/browser/net/require_ct_delegate.h", + "shell/browser/net/resolve_proxy_helper.cc", + "shell/browser/net/resolve_proxy_helper.h", + "shell/browser/net/system_network_context_manager.cc", + "shell/browser/net/system_network_context_manager.h", + "shell/browser/net/url_pipe_loader.cc", + "shell/browser/net/url_pipe_loader.h", + "shell/browser/net/url_request_about_job.cc", + "shell/browser/net/url_request_about_job.h", + "shell/browser/net/url_request_async_asar_job.cc", + "shell/browser/net/url_request_async_asar_job.h", + "shell/browser/net/url_request_string_job.cc", + "shell/browser/net/url_request_string_job.h", + "shell/browser/net/url_request_buffer_job.cc", + "shell/browser/net/url_request_buffer_job.h", + "shell/browser/net/url_request_context_getter.cc", + "shell/browser/net/url_request_context_getter.h", + "shell/browser/net/url_request_fetch_job.cc", + "shell/browser/net/url_request_fetch_job.h", + "shell/browser/net/url_request_stream_job.cc", + "shell/browser/net/url_request_stream_job.h", + "shell/browser/notifications/linux/libnotify_notification.cc", + "shell/browser/notifications/linux/libnotify_notification.h", + "shell/browser/notifications/linux/notification_presenter_linux.cc", + "shell/browser/notifications/linux/notification_presenter_linux.h", + "shell/browser/notifications/mac/cocoa_notification.h", + "shell/browser/notifications/mac/cocoa_notification.mm", + "shell/browser/notifications/mac/notification_center_delegate.h", + "shell/browser/notifications/mac/notification_center_delegate.mm", + "shell/browser/notifications/mac/notification_presenter_mac.h", + "shell/browser/notifications/mac/notification_presenter_mac.mm", + "shell/browser/notifications/notification.cc", + "shell/browser/notifications/notification.h", + "shell/browser/notifications/notification_delegate.h", + "shell/browser/notifications/notification_presenter.cc", + "shell/browser/notifications/notification_presenter.h", + "shell/browser/notifications/platform_notification_service.cc", + "shell/browser/notifications/platform_notification_service.h", + "shell/browser/notifications/win/notification_presenter_win.cc", + "shell/browser/notifications/win/notification_presenter_win.h", + "shell/browser/notifications/win/notification_presenter_win7.cc", + "shell/browser/notifications/win/notification_presenter_win7.h", + "shell/browser/notifications/win/win32_desktop_notifications/common.h", + "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc", + "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h", + "shell/browser/notifications/win/win32_desktop_notifications/toast.cc", + "shell/browser/notifications/win/win32_desktop_notifications/toast.h", + "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc", + "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h", + "shell/browser/notifications/win/win32_notification.cc", + "shell/browser/notifications/win/win32_notification.h", + "shell/browser/notifications/win/windows_toast_notification.cc", + "shell/browser/notifications/win/windows_toast_notification.h", + "shell/browser/node_debugger.cc", + "shell/browser/node_debugger.h", + "shell/browser/pref_store_delegate.cc", + "shell/browser/pref_store_delegate.h", + "shell/browser/relauncher_linux.cc", + "shell/browser/relauncher_mac.cc", + "shell/browser/relauncher_win.cc", + "shell/browser/relauncher.cc", + "shell/browser/relauncher.h", + "shell/browser/session_preferences.cc", + "shell/browser/session_preferences.h", + "shell/browser/special_storage_policy.cc", + "shell/browser/special_storage_policy.h", + "shell/browser/ui/accelerator_util.cc", + "shell/browser/ui/accelerator_util.h", + "shell/browser/ui/atom_menu_model.cc", + "shell/browser/ui/atom_menu_model.h", + "shell/browser/ui/autofill_popup.cc", + "shell/browser/ui/autofill_popup.h", + "shell/browser/ui/certificate_trust.h", + "shell/browser/ui/certificate_trust_mac.mm", + "shell/browser/ui/certificate_trust_win.cc", + "shell/browser/ui/cocoa/atom_bundle_mover.h", + "shell/browser/ui/cocoa/atom_bundle_mover.mm", + "shell/browser/ui/cocoa/atom_menu_controller.h", + "shell/browser/ui/cocoa/atom_menu_controller.mm", + "shell/browser/ui/cocoa/atom_native_widget_mac.h", + "shell/browser/ui/cocoa/atom_native_widget_mac.mm", + "shell/browser/ui/cocoa/atom_ns_window.h", + "shell/browser/ui/cocoa/atom_ns_window.mm", + "shell/browser/ui/cocoa/atom_ns_window_delegate.h", + "shell/browser/ui/cocoa/atom_ns_window_delegate.mm", + "shell/browser/ui/cocoa/atom_preview_item.h", + "shell/browser/ui/cocoa/atom_preview_item.mm", + "shell/browser/ui/cocoa/atom_touch_bar.h", + "shell/browser/ui/cocoa/atom_touch_bar.mm", + "shell/browser/ui/cocoa/delayed_native_view_host.cc", + "shell/browser/ui/cocoa/delayed_native_view_host.h", + "shell/browser/ui/cocoa/views_delegate_mac.h", + "shell/browser/ui/cocoa/views_delegate_mac.mm", + "shell/browser/ui/cocoa/root_view_mac.mm", + "shell/browser/ui/cocoa/root_view_mac.h", + "shell/browser/ui/cocoa/touch_bar_forward_declarations.h", + "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h", + "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.mm", + "shell/browser/ui/cocoa/event_dispatching_window.h", + "shell/browser/ui/cocoa/event_dispatching_window.mm", + "shell/browser/ui/devtools_manager_delegate.cc", + "shell/browser/ui/devtools_manager_delegate.h", + "shell/browser/ui/devtools_ui.cc", + "shell/browser/ui/devtools_ui.h", + "shell/browser/ui/drag_util_mac.mm", + "shell/browser/ui/drag_util_views.cc", + "shell/browser/ui/drag_util.h", + "shell/browser/ui/file_dialog.h", + "shell/browser/ui/file_dialog_gtk.cc", + "shell/browser/ui/file_dialog_mac.mm", + "shell/browser/ui/file_dialog_win.cc", + "shell/browser/ui/inspectable_web_contents.cc", + "shell/browser/ui/inspectable_web_contents.h", + "shell/browser/ui/inspectable_web_contents_delegate.h", + "shell/browser/ui/inspectable_web_contents_impl.cc", + "shell/browser/ui/inspectable_web_contents_impl.h", + "shell/browser/ui/inspectable_web_contents_view.h", + "shell/browser/ui/inspectable_web_contents_view_delegate.cc", + "shell/browser/ui/inspectable_web_contents_view_delegate.h", + "shell/browser/ui/inspectable_web_contents_view_mac.h", + "shell/browser/ui/inspectable_web_contents_view_mac.mm", + "shell/browser/ui/message_box.h", + "shell/browser/ui/message_box_gtk.cc", + "shell/browser/ui/message_box_mac.mm", + "shell/browser/ui/message_box_win.cc", + "shell/browser/ui/cocoa/NSColor+Hex.mm", + "shell/browser/ui/cocoa/NSColor+Hex.h", + "shell/browser/ui/cocoa/NSString+ANSI.mm", + "shell/browser/ui/cocoa/NSString+ANSI.h", + "shell/browser/ui/tray_icon.cc", + "shell/browser/ui/tray_icon.h", + "shell/browser/ui/tray_icon_gtk.cc", + "shell/browser/ui/tray_icon_gtk.h", + "shell/browser/ui/tray_icon_cocoa.h", + "shell/browser/ui/tray_icon_cocoa.mm", + "shell/browser/ui/tray_icon_observer.h", + "shell/browser/ui/tray_icon_win.cc", + "shell/browser/ui/views/atom_views_delegate.cc", + "shell/browser/ui/views/atom_views_delegate.h", + "shell/browser/ui/views/autofill_popup_view.cc", + "shell/browser/ui/views/autofill_popup_view.h", + "shell/browser/ui/views/frameless_view.cc", + "shell/browser/ui/views/frameless_view.h", + "shell/browser/ui/views/global_menu_bar_x11.cc", + "shell/browser/ui/views/global_menu_bar_x11.h", + "shell/browser/ui/views/inspectable_web_contents_view_views.cc", + "shell/browser/ui/views/inspectable_web_contents_view_views.h", + "shell/browser/ui/views/menu_bar.cc", + "shell/browser/ui/views/menu_bar.h", + "shell/browser/ui/views/menu_delegate.cc", + "shell/browser/ui/views/menu_delegate.h", + "shell/browser/ui/views/menu_model_adapter.cc", + "shell/browser/ui/views/menu_model_adapter.h", + "shell/browser/ui/views/native_frame_view.cc", + "shell/browser/ui/views/native_frame_view.h", + "shell/browser/ui/views/root_view.cc", + "shell/browser/ui/views/root_view.h", + "shell/browser/ui/views/submenu_button.cc", + "shell/browser/ui/views/submenu_button.h", + "shell/browser/ui/views/win_frame_view.cc", + "shell/browser/ui/views/win_frame_view.h", + "shell/browser/ui/win/atom_desktop_native_widget_aura.cc", + "shell/browser/ui/win/atom_desktop_native_widget_aura.h", + "shell/browser/ui/win/atom_desktop_window_tree_host_win.cc", + "shell/browser/ui/win/atom_desktop_window_tree_host_win.h", + "shell/browser/ui/win/jump_list.cc", + "shell/browser/ui/win/jump_list.h", + "shell/browser/ui/win/notify_icon_host.cc", + "shell/browser/ui/win/notify_icon_host.h", + "shell/browser/ui/win/notify_icon.cc", + "shell/browser/ui/win/notify_icon.h", + "shell/browser/ui/win/taskbar_host.cc", + "shell/browser/ui/win/taskbar_host.h", + "shell/browser/ui/x/event_disabler.cc", + "shell/browser/ui/x/event_disabler.h", + "shell/browser/ui/x/window_state_watcher.cc", + "shell/browser/ui/x/window_state_watcher.h", + "shell/browser/ui/x/x_window_utils.cc", + "shell/browser/ui/x/x_window_utils.h", + "shell/browser/unresponsive_suppressor.cc", + "shell/browser/unresponsive_suppressor.h", + "shell/browser/win/scoped_hstring.cc", + "shell/browser/win/scoped_hstring.h", + "shell/browser/web_contents_permission_helper.cc", + "shell/browser/web_contents_permission_helper.h", + "shell/browser/web_contents_preferences.cc", + "shell/browser/web_contents_preferences.h", + "shell/browser/web_contents_zoom_controller.cc", + "shell/browser/web_contents_zoom_controller.h", + "shell/browser/web_dialog_helper.cc", + "shell/browser/web_dialog_helper.h", + "shell/browser/web_view_guest_delegate.cc", + "shell/browser/web_view_guest_delegate.h", + "shell/browser/web_view_manager.cc", + "shell/browser/web_view_manager.h", + "shell/browser/window_list.cc", + "shell/browser/window_list.h", + "shell/browser/window_list_observer.h", + "shell/browser/zoom_level_delegate.cc", + "shell/browser/zoom_level_delegate.h", + "shell/common/api/atom_api_asar.cc", + "shell/common/api/atom_api_clipboard.cc", + "shell/common/api/atom_api_clipboard.h", + "shell/common/api/atom_api_clipboard_mac.mm", + "shell/common/api/atom_api_command_line.cc", + "shell/common/api/atom_api_crash_reporter.cc", + "shell/common/api/atom_api_key_weak_map.h", + "shell/common/api/atom_api_native_image.cc", + "shell/common/api/atom_api_native_image.h", + "shell/common/api/atom_api_native_image_mac.mm", + "shell/common/api/atom_api_shell.cc", + "shell/common/api/atom_api_v8_util.cc", + "shell/common/api/electron_bindings.cc", + "shell/common/api/electron_bindings.h", + "shell/common/api/constructor.h", + "shell/common/api/event_emitter_caller.cc", + "shell/common/api/event_emitter_caller.h", + "shell/common/api/features.cc", + "shell/common/api/locker.cc", + "shell/common/api/locker.h", + "shell/common/api/object_life_monitor.cc", + "shell/common/api/object_life_monitor.h", + "shell/common/api/remote_callback_freer.cc", + "shell/common/api/remote_callback_freer.h", + "shell/common/api/remote_object_freer.cc", + "shell/common/api/remote_object_freer.h", + "shell/common/asar/archive.cc", + "shell/common/asar/archive.h", + "shell/common/asar/asar_util.cc", + "shell/common/asar/asar_util.h", + "shell/common/asar/scoped_temporary_file.cc", + "shell/common/asar/scoped_temporary_file.h", + "shell/common/application_info_linux.cc", + "shell/common/application_info_mac.mm", + "shell/common/application_info_win.cc", + "shell/common/application_info.cc", + "shell/common/application_info.h", + "shell/common/atom_command_line.cc", + "shell/common/atom_command_line.h", + "shell/common/atom_constants.cc", + "shell/common/atom_constants.h", + "shell/common/color_util.cc", + "shell/common/color_util.h", + "shell/common/crash_reporter/crash_reporter.cc", + "shell/common/crash_reporter/crash_reporter.h", + "shell/common/crash_reporter/crash_reporter_linux.cc", + "shell/common/crash_reporter/crash_reporter_linux.h", + "shell/common/crash_reporter/crash_reporter_mac.h", + "shell/common/crash_reporter/crash_reporter_mac.mm", + "shell/common/crash_reporter/crash_reporter_win.h", + "shell/common/crash_reporter/crash_reporter_win.cc", + "shell/common/crash_reporter/linux/crash_dump_handler.cc", + "shell/common/crash_reporter/linux/crash_dump_handler.h", + "shell/common/crash_reporter/win/crash_service_main.cc", + "shell/common/crash_reporter/win/crash_service_main.h", + "shell/common/gin_util.h", + "shell/common/heap_snapshot.cc", + "shell/common/heap_snapshot.h", + "shell/common/key_weak_map.h", + "shell/common/keyboard_util.cc", + "shell/common/keyboard_util.h", + "shell/common/deprecate_util.cc", + "shell/common/deprecate_util.h", + "shell/common/mouse_util.cc", + "shell/common/mouse_util.h", + "shell/common/mac/main_application_bundle.h", + "shell/common/mac/main_application_bundle.mm", + "shell/common/native_mate_converters/accelerator_converter.cc", + "shell/common/native_mate_converters/accelerator_converter.h", + "shell/common/native_mate_converters/blink_converter.cc", + "shell/common/native_mate_converters/blink_converter.h", + "shell/common/native_mate_converters/callback.cc", + "shell/common/native_mate_converters/callback.h", + "shell/common/native_mate_converters/content_converter.cc", + "shell/common/native_mate_converters/content_converter.h", + "shell/common/native_mate_converters/file_dialog_converter.cc", + "shell/common/native_mate_converters/file_dialog_converter.h", + "shell/common/native_mate_converters/message_box_converter.cc", + "shell/common/native_mate_converters/message_box_converter.h", + "shell/common/native_mate_converters/file_path_converter.h", + "shell/common/native_mate_converters/gfx_converter.cc", + "shell/common/native_mate_converters/gfx_converter.h", + "shell/common/native_mate_converters/gurl_converter.h", + "shell/common/native_mate_converters/image_converter.cc", + "shell/common/native_mate_converters/image_converter.h", + "shell/common/native_mate_converters/map_converter.h", + "shell/common/native_mate_converters/net_converter.cc", + "shell/common/native_mate_converters/net_converter.h", + "shell/common/native_mate_converters/network_converter.cc", + "shell/common/native_mate_converters/network_converter.h", + "shell/common/native_mate_converters/once_callback.h", + "shell/common/native_mate_converters/string16_converter.h", + "shell/common/native_mate_converters/ui_base_types_converter.h", + "shell/common/native_mate_converters/v8_value_converter.cc", + "shell/common/native_mate_converters/v8_value_converter.h", + "shell/common/native_mate_converters/value_converter.cc", + "shell/common/native_mate_converters/value_converter.h", + "shell/common/node_bindings.cc", + "shell/common/node_bindings.h", + "shell/common/node_bindings_linux.cc", + "shell/common/node_bindings_linux.h", + "shell/common/node_bindings_mac.cc", + "shell/common/node_bindings_mac.h", + "shell/common/node_bindings_win.cc", + "shell/common/node_bindings_win.h", + "shell/common/node_includes.h", + "shell/common/options_switches.cc", + "shell/common/options_switches.h", + "shell/common/platform_util.h", + "shell/common/platform_util_linux.cc", + "shell/common/platform_util_mac.mm", + "shell/common/platform_util_win.cc", + "shell/common/promise_util.h", + "shell/common/promise_util.cc", + "shell/renderer/api/atom_api_renderer_ipc.cc", + "shell/renderer/api/atom_api_spell_check_client.cc", + "shell/renderer/api/atom_api_spell_check_client.h", + "shell/renderer/api/atom_api_web_frame.cc", + "shell/renderer/atom_autofill_agent.cc", + "shell/renderer/atom_autofill_agent.h", + "shell/renderer/atom_render_frame_observer.cc", + "shell/renderer/atom_render_frame_observer.h", + "shell/renderer/atom_renderer_client.cc", + "shell/renderer/atom_renderer_client.h", + "shell/renderer/content_settings_observer.cc", + "shell/renderer/content_settings_observer.h", + "shell/renderer/electron_api_service_impl.cc", + "shell/renderer/electron_api_service_impl.h", + "shell/renderer/atom_sandboxed_renderer_client.cc", + "shell/renderer/atom_sandboxed_renderer_client.h", + "shell/renderer/guest_view_container.cc", + "shell/renderer/guest_view_container.h", + "shell/renderer/renderer_client_base.cc", + "shell/renderer/renderer_client_base.h", + "shell/renderer/web_worker_observer.cc", + "shell/renderer/web_worker_observer.h", + "shell/utility/atom_content_utility_client.cc", + "shell/utility/atom_content_utility_client.h", "chromium_src/chrome/browser/process_singleton_posix.cc", "chromium_src/chrome/browser/process_singleton_win.cc", "chromium_src/chrome/browser/process_singleton.h", @@ -601,14 +601,14 @@ filenames = { ] app_sources = [ - "atom/app/atom_main.cc", - "atom/app/atom_main.h", + "shell/app/atom_main.cc", + "shell/app/atom_main.h", ] framework_sources = [ - "atom/app/atom_library_main.h", - "atom/app/atom_library_main.mm", + "shell/app/atom_library_main.h", + "shell/app/atom_library_main.mm", ] - login_helper_sources = [ "atom/app/atom_login_helper.mm" ] + login_helper_sources = [ "shell/app/atom_login_helper.mm" ] } diff --git a/shell/app/atom_content_client.cc b/shell/app/atom_content_client.cc index 17effdfa07..d11636b73a 100644 --- a/shell/app/atom_content_client.cc +++ b/shell/app/atom_content_client.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/atom_content_client.h" +#include "shell/app/atom_content_client.h" #include #include -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/strings/string_split.h" @@ -17,6 +16,7 @@ #include "content/public/common/pepper_plugin_info.h" #include "electron/buildflags/buildflags.h" #include "ppapi/shared_impl/ppapi_permissions.h" +#include "shell/common/options_switches.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "url/url_constants.h" @@ -30,8 +30,8 @@ #endif // defined(WIDEVINE_CDM_AVAILABLE) #if BUILDFLAG(ENABLE_PDF_VIEWER) -#include "atom/common/atom_constants.h" #include "pdf/pdf.h" +#include "shell/common/atom_constants.h" #endif // BUILDFLAG(ENABLE_PDF_VIEWER) namespace atom { diff --git a/shell/app/atom_library_main.mm b/shell/app/atom_library_main.mm index 5f2974ee51..3474e95dbe 100644 --- a/shell/app/atom_library_main.mm +++ b/shell/app/atom_library_main.mm @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/atom_library_main.h" +#include "shell/app/atom_library_main.h" -#include "atom/app/atom_main_delegate.h" -#include "atom/app/node_main.h" -#include "atom/common/atom_command_line.h" -#include "atom/common/mac/main_application_bundle.h" #include "base/at_exit.h" #include "base/i18n/icu_util.h" #include "base/mac/bundle_locations.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "content/public/app/content_main.h" +#include "shell/app/atom_main_delegate.h" +#include "shell/app/node_main.h" +#include "shell/common/atom_command_line.h" +#include "shell/common/mac/main_application_bundle.h" int AtomMain(int argc, char* argv[]) { atom::AtomMainDelegate delegate; diff --git a/shell/app/atom_main.cc b/shell/app/atom_main.cc index beef50e64f..f294704f2e 100644 --- a/shell/app/atom_main.cc +++ b/shell/app/atom_main.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/atom_main.h" +#include "shell/app/atom_main.h" #include #include @@ -17,33 +17,33 @@ #include #include -#include "atom/app/atom_main_delegate.h" -#include "atom/app/command_line_args.h" -#include "atom/common/crash_reporter/win/crash_service_main.h" #include "base/environment.h" #include "base/process/launch.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" +#include "shell/app/atom_main_delegate.h" +#include "shell/app/command_line_args.h" +#include "shell/common/crash_reporter/win/crash_service_main.h" #elif defined(OS_LINUX) // defined(OS_WIN) #include #include -#include "atom/app/atom_main_delegate.h" // NOLINT #include "content/public/app/content_main.h" -#else // defined(OS_LINUX) +#include "shell/app/atom_main_delegate.h" // NOLINT +#else // defined(OS_LINUX) #include #include #include -#include "atom/app/atom_library_main.h" +#include "shell/app/atom_library_main.h" #endif // defined(OS_MACOSX) -#include "atom/app/node_main.h" -#include "atom/common/atom_command_line.h" -#include "atom/common/atom_constants.h" #include "base/at_exit.h" #include "base/i18n/icu_util.h" #include "electron/buildflags/buildflags.h" +#include "shell/app/node_main.h" +#include "shell/common/atom_command_line.h" +#include "shell/common/atom_constants.h" #if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD) #include "sandbox/mac/seatbelt_exec.h" // nogncheck diff --git a/shell/app/atom_main_delegate.cc b/shell/app/atom_main_delegate.cc index 95c655999a..1d5b224bc3 100644 --- a/shell/app/atom_main_delegate.cc +++ b/shell/app/atom_main_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/atom_main_delegate.h" +#include "shell/app/atom_main_delegate.h" #include #include @@ -12,15 +12,6 @@ #include // for g_setenv() #endif -#include "atom/app/atom_content_client.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_gpu_client.h" -#include "atom/browser/feature_list.h" -#include "atom/browser/relauncher.h" -#include "atom/common/options_switches.h" -#include "atom/renderer/atom_renderer_client.h" -#include "atom/renderer/atom_sandboxed_renderer_client.h" -#include "atom/utility/atom_content_utility_client.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" #include "base/environment.h" @@ -33,18 +24,27 @@ #include "ipc/ipc_buildflags.h" #include "services/service_manager/embedder/switches.h" #include "services/service_manager/sandbox/switches.h" +#include "shell/app/atom_content_client.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_gpu_client.h" +#include "shell/browser/feature_list.h" +#include "shell/browser/relauncher.h" +#include "shell/common/options_switches.h" +#include "shell/renderer/atom_renderer_client.h" +#include "shell/renderer/atom_sandboxed_renderer_client.h" +#include "shell/utility/atom_content_utility_client.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" #if defined(OS_MACOSX) -#include "atom/app/atom_main_delegate_mac.h" +#include "shell/app/atom_main_delegate_mac.h" #endif #if defined(OS_WIN) #include "base/win/win_util.h" #if defined(_WIN64) -#include "atom/common/crash_reporter/crash_reporter_win.h" +#include "shell/common/crash_reporter/crash_reporter_win.h" #endif #endif diff --git a/shell/app/atom_main_delegate_mac.mm b/shell/app/atom_main_delegate_mac.mm index 786c624b33..5c5be9e7c3 100644 --- a/shell/app/atom_main_delegate_mac.mm +++ b/shell/app/atom_main_delegate_mac.mm @@ -2,13 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/atom_main_delegate.h" +#include "shell/app/atom_main_delegate.h" #include -#include "atom/browser/mac/atom_application.h" -#include "atom/common/application_info.h" -#include "atom/common/mac/main_application_bundle.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/mac/bundle_locations.h" @@ -17,6 +14,9 @@ #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" #include "content/public/common/content_paths.h" +#include "shell/browser/mac/atom_application.h" +#include "shell/common/application_info.h" +#include "shell/common/mac/main_application_bundle.h" namespace atom { diff --git a/shell/app/command_line_args.cc b/shell/app/command_line_args.cc index 23e870cf4a..3a24af87e0 100644 --- a/shell/app/command_line_args.cc +++ b/shell/app/command_line_args.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/command_line_args.h" +#include "shell/app/command_line_args.h" namespace { diff --git a/shell/app/manifests.cc b/shell/app/manifests.cc index 112ff6ee0d..cb9b8d3494 100644 --- a/shell/app/manifests.cc +++ b/shell/app/manifests.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/manifests.h" +#include "shell/app/manifests.h" #include "base/no_destructor.h" #include "electron/atom/common/api/api.mojom.h" diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc index 91f4a6a61e..64be627ef0 100644 --- a/shell/app/node_main.cc +++ b/shell/app/node_main.cc @@ -2,19 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/app/node_main.h" +#include "shell/app/node_main.h" #include #include -#include "atom/app/uv_task_runner.h" -#include "atom/browser/javascript_environment.h" -#include "atom/browser/node_debugger.h" -#include "atom/common/api/electron_bindings.h" -#include "atom/common/crash_reporter/crash_reporter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_bindings.h" -#include "atom/common/node_includes.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/task/thread_pool/thread_pool.h" @@ -24,9 +16,17 @@ #include "gin/public/isolate_holder.h" #include "gin/v8_initializer.h" #include "native_mate/dictionary.h" +#include "shell/app/uv_task_runner.h" +#include "shell/browser/javascript_environment.h" +#include "shell/browser/node_debugger.h" +#include "shell/common/api/electron_bindings.h" +#include "shell/common/crash_reporter/crash_reporter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_bindings.h" +#include "shell/common/node_includes.h" #if defined(_WIN64) -#include "atom/common/crash_reporter/crash_reporter_win.h" +#include "shell/common/crash_reporter/crash_reporter_win.h" #endif namespace atom { diff --git a/shell/app/uv_task_runner.cc b/shell/app/uv_task_runner.cc index 60befc6db8..fdc10a8dfc 100644 --- a/shell/app/uv_task_runner.cc +++ b/shell/app/uv_task_runner.cc @@ -4,7 +4,7 @@ #include -#include "atom/app/uv_task_runner.h" +#include "shell/app/uv_task_runner.h" #include "base/stl_util.h" diff --git a/shell/browser/api/atom_api_app.cc b/shell/browser/api/atom_api_app.cc index a94da63eb1..bf0a2b0b2f 100644 --- a/shell/browser/api/atom_api_app.cc +++ b/shell/browser/api/atom_api_app.cc @@ -2,32 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_app.h" +#include "shell/browser/api/atom_api_app.h" #include #include -#include "atom/browser/api/atom_api_menu.h" -#include "atom/browser/api/atom_api_session.h" -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/api/gpuinfo_manager.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/atom_paths.h" -#include "atom/browser/login_handler.h" -#include "atom/browser/relauncher.h" -#include "atom/common/application_info.h" -#include "atom/common/atom_command_line.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/network_converter.h" -#include "atom/common/native_mate_converters/once_callback.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/environment.h" #include "base/files/file_path.h" @@ -51,17 +30,38 @@ #include "net/ssl/client_cert_identity.h" #include "net/ssl/ssl_cert_request_info.h" #include "services/service_manager/sandbox/switches.h" +#include "shell/browser/api/atom_api_menu.h" +#include "shell/browser/api/atom_api_session.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/api/gpuinfo_manager.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_paths.h" +#include "shell/browser/login_handler.h" +#include "shell/browser/relauncher.h" +#include "shell/common/application_info.h" +#include "shell/common/atom_command_line.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/network_converter.h" +#include "shell/common/native_mate_converters/once_callback.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" #if defined(OS_WIN) -#include "atom/browser/ui/win/jump_list.h" #include "base/strings/utf_string_conversions.h" +#include "shell/browser/ui/win/jump_list.h" #endif #if defined(OS_MACOSX) #include -#include "atom/browser/ui/cocoa/atom_bundle_mover.h" +#include "shell/browser/ui/cocoa/atom_bundle_mover.h" #endif using atom::Browser; diff --git a/shell/browser/api/atom_api_app.h b/shell/browser/api/atom_api_app.h index b4e3ec7f79..5fa556f03c 100644 --- a/shell/browser/api/atom_api_app.h +++ b/shell/browser/api/atom_api_app.h @@ -11,13 +11,6 @@ #include #include -#include "atom/browser/api/event_emitter.h" -#include "atom/browser/api/process_metric.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/browser.h" -#include "atom/browser/browser_observer.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/promise_util.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/process_singleton.h" @@ -29,6 +22,13 @@ #include "net/base/completion_once_callback.h" #include "net/base/completion_repeating_callback.h" #include "net/ssl/client_cert_identity.h" +#include "shell/browser/api/event_emitter.h" +#include "shell/browser/api/process_metric.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/browser.h" +#include "shell/browser/browser_observer.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/promise_util.h" #if defined(USE_NSS_CERTS) #include "chrome/browser/certificate_manager_model.h" diff --git a/shell/browser/api/atom_api_app_mac.mm b/shell/browser/api/atom_api_app_mac.mm index 46e5dc3457..69df58ebca 100644 --- a/shell/browser/api/atom_api_app_mac.mm +++ b/shell/browser/api/atom_api_app_mac.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_app.h" -#include "atom/browser/atom_paths.h" -#include "atom/common/native_mate_converters/file_path_converter.h" #include "base/path_service.h" +#include "shell/browser/api/atom_api_app.h" +#include "shell/browser/atom_paths.h" +#include "shell/common/native_mate_converters/file_path_converter.h" #import diff --git a/shell/browser/api/atom_api_app_mas.mm b/shell/browser/api/atom_api_app_mas.mm index 94c01b1d81..302f6c2254 100644 --- a/shell/browser/api/atom_api_app_mas.mm +++ b/shell/browser/api/atom_api_app_mas.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_app.h" +#include "shell/browser/api/atom_api_app.h" #include diff --git a/shell/browser/api/atom_api_auto_updater.cc b/shell/browser/api/atom_api_auto_updater.cc index fdfc1d0214..a3712286de 100644 --- a/shell/browser/api/atom_api_auto_updater.cc +++ b/shell/browser/api/atom_api_auto_updater.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_auto_updater.h" +#include "shell/browser/api/atom_api_auto_updater.h" -#include "atom/browser/browser.h" -#include "atom/browser/native_window.h" -#include "atom/browser/window_list.h" -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/node_includes.h" #include "base/time/time.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" +#include "shell/browser/browser.h" +#include "shell/browser/native_window.h" +#include "shell/browser/window_list.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/node_includes.h" namespace mate { diff --git a/shell/browser/api/atom_api_auto_updater.h b/shell/browser/api/atom_api_auto_updater.h index d8875ae0e3..6f3d337d17 100644 --- a/shell/browser/api/atom_api_auto_updater.h +++ b/shell/browser/api/atom_api_auto_updater.h @@ -7,11 +7,11 @@ #include -#include "atom/browser/api/event_emitter.h" -#include "atom/browser/auto_updater.h" -#include "atom/browser/window_list_observer.h" #include "native_mate/arguments.h" #include "native_mate/handle.h" +#include "shell/browser/api/event_emitter.h" +#include "shell/browser/auto_updater.h" +#include "shell/browser/window_list_observer.h" namespace atom { diff --git a/shell/browser/api/atom_api_browser_view.cc b/shell/browser/api/atom_api_browser_view.cc index a67b7fc89d..9c4d418126 100644 --- a/shell/browser/api/atom_api_browser_view.cc +++ b/shell/browser/api/atom_api_browser_view.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_browser_view.h" +#include "shell/browser/api/atom_api_browser_view.h" -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/browser.h" -#include "atom/browser/native_browser_view.h" -#include "atom/common/color_util.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "native_mate/constructor.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/browser.h" +#include "shell/browser/native_browser_view.h" +#include "shell/common/color_util.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #include "ui/gfx/geometry/rect.h" namespace mate { diff --git a/shell/browser/api/atom_api_browser_view.h b/shell/browser/api/atom_api_browser_view.h index 932ced6dfe..24fb992a18 100644 --- a/shell/browser/api/atom_api_browser_view.h +++ b/shell/browser/api/atom_api_browser_view.h @@ -8,10 +8,10 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/native_browser_view.h" #include "content/public/browser/web_contents_observer.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/native_browser_view.h" namespace gfx { class Rect; diff --git a/shell/browser/api/atom_api_browser_window.cc b/shell/browser/api/atom_api_browser_window.cc index 8a23fc0deb..856e697022 100644 --- a/shell/browser/api/atom_api_browser_window.cc +++ b/shell/browser/api/atom_api_browser_window.cc @@ -2,20 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_browser_window.h" +#include "shell/browser/api/atom_api_browser_window.h" #include -#include "atom/browser/browser.h" -#include "atom/browser/unresponsive_suppressor.h" -#include "atom/browser/web_contents_preferences.h" -#include "atom/browser/window_list.h" -#include "atom/common/api/constructor.h" -#include "atom/common/color_util.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "base/threading/thread_task_runner_handle.h" #include "content/browser/renderer_host/render_widget_host_impl.h" // nogncheck #include "content/browser/renderer_host/render_widget_host_owner_delegate.h" // nogncheck @@ -23,6 +13,16 @@ #include "content/public/browser/render_view_host.h" #include "gin/converter.h" #include "native_mate/dictionary.h" +#include "shell/browser/browser.h" +#include "shell/browser/unresponsive_suppressor.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/browser/window_list.h" +#include "shell/common/api/constructor.h" +#include "shell/common/color_util.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #include "ui/gl/gpu_switching_manager.h" namespace atom { diff --git a/shell/browser/api/atom_api_browser_window.h b/shell/browser/api/atom_api_browser_window.h index 2d0846969f..e61cf7b0d1 100644 --- a/shell/browser/api/atom_api_browser_window.h +++ b/shell/browser/api/atom_api_browser_window.h @@ -9,9 +9,9 @@ #include #include -#include "atom/browser/api/atom_api_top_level_window.h" -#include "atom/browser/api/atom_api_web_contents.h" #include "base/cancelable_callback.h" +#include "shell/browser/api/atom_api_top_level_window.h" +#include "shell/browser/api/atom_api_web_contents.h" namespace atom { diff --git a/shell/browser/api/atom_api_browser_window_mac.mm b/shell/browser/api/atom_api_browser_window_mac.mm index d5eb23660d..ec8e6f0f91 100644 --- a/shell/browser/api/atom_api_browser_window_mac.mm +++ b/shell/browser/api/atom_api_browser_window_mac.mm @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_browser_window.h" +#include "shell/browser/api/atom_api_browser_window.h" #include #include #import -#include "atom/browser/native_browser_view.h" -#include "atom/browser/native_window_mac.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" #include "base/mac/scoped_nsobject.h" +#include "shell/browser/native_browser_view.h" +#include "shell/browser/native_window_mac.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" @interface NSView (WebContentsView) - (void)setMouseDownCanMoveWindow:(BOOL)can_move; diff --git a/shell/browser/api/atom_api_browser_window_views.cc b/shell/browser/api/atom_api_browser_window_views.cc index 8094df0766..569d0704c2 100644 --- a/shell/browser/api/atom_api_browser_window_views.cc +++ b/shell/browser/api/atom_api_browser_window_views.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_browser_window.h" +#include "shell/browser/api/atom_api_browser_window.h" -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" namespace atom { diff --git a/shell/browser/api/atom_api_content_tracing.cc b/shell/browser/api/atom_api_content_tracing.cc index 3c4053ea9a..f3f376e572 100644 --- a/shell/browser/api/atom_api_content_tracing.cc +++ b/shell/browser/api/atom_api_content_tracing.cc @@ -6,17 +6,17 @@ #include #include -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/promise_util.h" #include "base/bind.h" #include "base/files/file_util.h" #include "base/optional.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/tracing_controller.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/promise_util.h" using content::TracingController; diff --git a/shell/browser/api/atom_api_cookies.cc b/shell/browser/api/atom_api_cookies.cc index bcdbceb31e..344df2cec1 100644 --- a/shell/browser/api/atom_api_cookies.cc +++ b/shell/browser/api/atom_api_cookies.cc @@ -2,16 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_cookies.h" +#include "shell/browser/api/atom_api_cookies.h" #include #include -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/cookie_change_notifier.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "base/time/time.h" #include "base/values.h" #include "content/public/browser/browser_context.h" @@ -25,6 +20,11 @@ #include "net/cookies/cookie_util.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/cookie_change_notifier.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" using content::BrowserThread; diff --git a/shell/browser/api/atom_api_cookies.h b/shell/browser/api/atom_api_cookies.h index 3b1366a9bc..ca31c8e0fa 100644 --- a/shell/browser/api/atom_api_cookies.h +++ b/shell/browser/api/atom_api_cookies.h @@ -8,12 +8,12 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/net/cookie_details.h" -#include "atom/common/promise_util.h" #include "base/callback_list.h" #include "gin/handle.h" #include "net/cookies/canonical_cookie.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/net/cookie_details.h" +#include "shell/common/promise_util.h" namespace base { class DictionaryValue; diff --git a/shell/browser/api/atom_api_debugger.cc b/shell/browser/api/atom_api_debugger.cc index 446a30ed29..285828f217 100644 --- a/shell/browser/api/atom_api_debugger.cc +++ b/shell/browser/api/atom_api_debugger.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_debugger.h" +#include "shell/browser/api/atom_api_debugger.h" #include #include #include -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/web_contents.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" using content::DevToolsAgentHost; diff --git a/shell/browser/api/atom_api_debugger.h b/shell/browser/api/atom_api_debugger.h index 291ecdc53b..1991b19c2b 100644 --- a/shell/browser/api/atom_api_debugger.h +++ b/shell/browser/api/atom_api_debugger.h @@ -8,13 +8,13 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/common/promise_util.h" #include "base/callback.h" #include "base/values.h" #include "content/public/browser/devtools_agent_host_client.h" #include "content/public/browser/web_contents_observer.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/common/promise_util.h" namespace content { class DevToolsAgentHost; diff --git a/shell/browser/api/atom_api_desktop_capturer.cc b/shell/browser/api/atom_api_desktop_capturer.cc index 1924f64a2f..88cef42884 100644 --- a/shell/browser/api/atom_api_desktop_capturer.cc +++ b/shell/browser/api/atom_api_desktop_capturer.cc @@ -2,15 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_desktop_capturer.h" +#include "shell/browser/api/atom_api_desktop_capturer.h" #include #include #include -#include "atom/common/api/atom_api_native_image.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/node_includes.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" @@ -18,6 +15,9 @@ #include "chrome/browser/media/webrtc/window_icon_util.h" #include "content/public/browser/desktop_capture.h" #include "native_mate/dictionary.h" +#include "shell/common/api/atom_api_native_image.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/node_includes.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" diff --git a/shell/browser/api/atom_api_desktop_capturer.h b/shell/browser/api/atom_api_desktop_capturer.h index 962a1cc699..a2e42ad33c 100644 --- a/shell/browser/api/atom_api_desktop_capturer.h +++ b/shell/browser/api/atom_api_desktop_capturer.h @@ -9,10 +9,10 @@ #include #include -#include "atom/browser/api/trackable_object.h" #include "chrome/browser/media/webrtc/desktop_media_list_observer.h" #include "chrome/browser/media/webrtc/native_desktop_media_list.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" namespace atom { diff --git a/shell/browser/api/atom_api_dialog.cc b/shell/browser/api/atom_api_dialog.cc index 5444f68e5e..b5bec17839 100644 --- a/shell/browser/api/atom_api_dialog.cc +++ b/shell/browser/api/atom_api_dialog.cc @@ -6,20 +6,20 @@ #include #include -#include "atom/browser/api/atom_api_browser_window.h" -#include "atom/browser/native_window.h" -#include "atom/browser/ui/certificate_trust.h" -#include "atom/browser/ui/file_dialog.h" -#include "atom/browser/ui/message_box.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_dialog_converter.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/message_box_converter.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/promise_util.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_browser_window.h" +#include "shell/browser/native_window.h" +#include "shell/browser/ui/certificate_trust.h" +#include "shell/browser/ui/file_dialog.h" +#include "shell/browser/ui/message_box.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_dialog_converter.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/message_box_converter.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/promise_util.h" namespace { diff --git a/shell/browser/api/atom_api_download_item.cc b/shell/browser/api/atom_api_download_item.cc index 0f73422411..2f19a08ca3 100644 --- a/shell/browser/api/atom_api_download_item.cc +++ b/shell/browser/api/atom_api_download_item.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_download_item.h" +#include "shell/browser/api/atom_api_download_item.h" #include -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_dialog_converter.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/node_includes.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_task_runner_handle.h" #include "native_mate/dictionary.h" #include "net/base/filename_util.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_dialog_converter.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/node_includes.h" namespace mate { diff --git a/shell/browser/api/atom_api_download_item.h b/shell/browser/api/atom_api_download_item.h index 9ab3050d94..41aa073435 100644 --- a/shell/browser/api/atom_api_download_item.h +++ b/shell/browser/api/atom_api_download_item.h @@ -8,11 +8,11 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/ui/file_dialog.h" #include "base/files/file_path.h" #include "components/download/public/common/download_item.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/ui/file_dialog.h" #include "url/gurl.h" namespace atom { diff --git a/shell/browser/api/atom_api_event.cc b/shell/browser/api/atom_api_event.cc index 0c213dcfe2..c2e8714386 100644 --- a/shell/browser/api/atom_api_event.cc +++ b/shell/browser/api/atom_api_event.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/event_emitter.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/event_emitter.h" +#include "shell/common/node_includes.h" namespace { diff --git a/shell/browser/api/atom_api_global_shortcut.cc b/shell/browser/api/atom_api_global_shortcut.cc index ac173b73a4..3c6ddc1934 100644 --- a/shell/browser/api/atom_api_global_shortcut.cc +++ b/shell/browser/api/atom_api_global_shortcut.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_global_shortcut.h" +#include "shell/browser/api/atom_api_global_shortcut.h" #include #include -#include "atom/browser/api/atom_api_system_preferences.h" -#include "atom/common/native_mate_converters/accelerator_converter.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/node_includes.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_system_preferences.h" +#include "shell/common/native_mate_converters/accelerator_converter.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/node_includes.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/shell/browser/api/atom_api_global_shortcut.h b/shell/browser/api/atom_api_global_shortcut.h index edcbad3db0..d780aca156 100644 --- a/shell/browser/api/atom_api_global_shortcut.h +++ b/shell/browser/api/atom_api_global_shortcut.h @@ -9,10 +9,10 @@ #include #include -#include "atom/browser/api/trackable_object.h" #include "base/callback.h" #include "chrome/browser/extensions/global_shortcut_listener.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" #include "ui/base/accelerators/accelerator.h" namespace atom { diff --git a/shell/browser/api/atom_api_in_app_purchase.cc b/shell/browser/api/atom_api_in_app_purchase.cc index e4aa7d534a..6c3c0b72f7 100644 --- a/shell/browser/api/atom_api_in_app_purchase.cc +++ b/shell/browser/api/atom_api_in_app_purchase.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_in_app_purchase.h" +#include "shell/browser/api/atom_api_in_app_purchase.h" #include #include #include -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/node_includes.h" namespace mate { diff --git a/shell/browser/api/atom_api_in_app_purchase.h b/shell/browser/api/atom_api_in_app_purchase.h index 24fb710d0a..a05b66dfe5 100644 --- a/shell/browser/api/atom_api_in_app_purchase.h +++ b/shell/browser/api/atom_api_in_app_purchase.h @@ -8,12 +8,12 @@ #include #include -#include "atom/browser/api/event_emitter.h" -#include "atom/browser/mac/in_app_purchase.h" -#include "atom/browser/mac/in_app_purchase_observer.h" -#include "atom/browser/mac/in_app_purchase_product.h" -#include "atom/common/promise_util.h" #include "native_mate/handle.h" +#include "shell/browser/api/event_emitter.h" +#include "shell/browser/mac/in_app_purchase.h" +#include "shell/browser/mac/in_app_purchase_observer.h" +#include "shell/browser/mac/in_app_purchase_product.h" +#include "shell/common/promise_util.h" namespace atom { diff --git a/shell/browser/api/atom_api_menu.cc b/shell/browser/api/atom_api_menu.cc index 0e22755c4a..8af1344100 100644 --- a/shell/browser/api/atom_api_menu.cc +++ b/shell/browser/api/atom_api_menu.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_menu.h" +#include "shell/browser/api/atom_api_menu.h" -#include "atom/browser/native_window.h" -#include "atom/common/native_mate_converters/accelerator_converter.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" #include "native_mate/constructor.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" +#include "shell/browser/native_window.h" +#include "shell/common/native_mate_converters/accelerator_converter.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/atom_api_menu.h b/shell/browser/api/atom_api_menu.h index 39e2724fc8..a41e3f3f38 100644 --- a/shell/browser/api/atom_api_menu.h +++ b/shell/browser/api/atom_api_menu.h @@ -8,10 +8,10 @@ #include #include -#include "atom/browser/api/atom_api_top_level_window.h" -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/ui/atom_menu_model.h" #include "base/callback.h" +#include "shell/browser/api/atom_api_top_level_window.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/ui/atom_menu_model.h" namespace atom { diff --git a/shell/browser/api/atom_api_menu_mac.h b/shell/browser/api/atom_api_menu_mac.h index 6ba895676c..82c93e0260 100644 --- a/shell/browser/api/atom_api_menu_mac.h +++ b/shell/browser/api/atom_api_menu_mac.h @@ -5,12 +5,12 @@ #ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_ #define ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_ -#include "atom/browser/api/atom_api_menu.h" +#include "shell/browser/api/atom_api_menu.h" #include #include -#import "atom/browser/ui/cocoa/atom_menu_controller.h" +#import "shell/browser/ui/cocoa/atom_menu_controller.h" using base::scoped_nsobject; diff --git a/shell/browser/api/atom_api_menu_mac.mm b/shell/browser/api/atom_api_menu_mac.mm index 74ecce1b3c..987de24143 100644 --- a/shell/browser/api/atom_api_menu_mac.mm +++ b/shell/browser/api/atom_api_menu_mac.mm @@ -2,14 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#import "atom/browser/api/atom_api_menu_mac.h" +#import "shell/browser/api/atom_api_menu_mac.h" #include #include -#include "atom/browser/native_window.h" -#include "atom/browser/unresponsive_suppressor.h" -#include "atom/common/node_includes.h" #include "base/mac/scoped_sending_event.h" #include "base/message_loop/message_loop.h" #include "base/strings/sys_string_conversions.h" @@ -17,6 +14,9 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "shell/browser/native_window.h" +#include "shell/browser/unresponsive_suppressor.h" +#include "shell/common/node_includes.h" using content::BrowserThread; diff --git a/shell/browser/api/atom_api_menu_views.cc b/shell/browser/api/atom_api_menu_views.cc index 904c763744..f9b89a3cde 100644 --- a/shell/browser/api/atom_api_menu_views.cc +++ b/shell/browser/api/atom_api_menu_views.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_menu_views.h" +#include "shell/browser/api/atom_api_menu_views.h" #include -#include "atom/browser/native_window_views.h" -#include "atom/browser/unresponsive_suppressor.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/unresponsive_suppressor.h" #include "ui/display/screen.h" using views::MenuRunner; diff --git a/shell/browser/api/atom_api_menu_views.h b/shell/browser/api/atom_api_menu_views.h index 85ae43dbba..e11bd6a838 100644 --- a/shell/browser/api/atom_api_menu_views.h +++ b/shell/browser/api/atom_api_menu_views.h @@ -8,8 +8,8 @@ #include #include -#include "atom/browser/api/atom_api_menu.h" #include "base/memory/weak_ptr.h" +#include "shell/browser/api/atom_api_menu.h" #include "ui/display/screen.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/shell/browser/api/atom_api_net.cc b/shell/browser/api/atom_api_net.cc index 890fa028b6..2b90711249 100644 --- a/shell/browser/api/atom_api_net.cc +++ b/shell/browser/api/atom_api_net.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_net.h" -#include "atom/browser/api/atom_api_url_request.h" -#include "atom/common/node_includes.h" +#include "shell/browser/api/atom_api_net.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_url_request.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/atom_api_net.h b/shell/browser/api/atom_api_net.h index 2a0fa4140c..7f44e16459 100644 --- a/shell/browser/api/atom_api_net.h +++ b/shell/browser/api/atom_api_net.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_API_ATOM_API_NET_H_ #define ATOM_BROWSER_API_ATOM_API_NET_H_ -#include "atom/browser/api/event_emitter.h" +#include "shell/browser/api/event_emitter.h" namespace atom { diff --git a/shell/browser/api/atom_api_net_log.cc b/shell/browser/api/atom_api_net_log.cc index cf89075e9c..d30a59c459 100644 --- a/shell/browser/api/atom_api_net_log.cc +++ b/shell/browser/api/atom_api_net_log.cc @@ -2,15 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_net_log.h" +#include "shell/browser/api/atom_api_net_log.h" #include -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/net/system_network_context_manager.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/node_includes.h" #include "base/command_line.h" #include "chrome/browser/browser_process.h" #include "components/net_log/chrome_net_log.h" @@ -19,6 +14,11 @@ #include "native_mate/dictionary.h" #include "native_mate/handle.h" #include "net/url_request/url_request_context_getter.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/net/system_network_context_manager.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/atom_api_net_log.h b/shell/browser/api/atom_api_net_log.h index 162b3f5df8..684edd40b3 100644 --- a/shell/browser/api/atom_api_net_log.h +++ b/shell/browser/api/atom_api_net_log.h @@ -9,13 +9,13 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/common/promise_util.h" #include "base/callback.h" #include "base/optional.h" #include "base/values.h" #include "native_mate/handle.h" #include "services/network/public/mojom/net_log.mojom.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/common/promise_util.h" namespace atom { diff --git a/shell/browser/api/atom_api_notification.cc b/shell/browser/api/atom_api_notification.cc index 023e6d06d8..75f72fe1ce 100644 --- a/shell/browser/api/atom_api_notification.cc +++ b/shell/browser/api/atom_api_notification.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_notification.h" +#include "shell/browser/api/atom_api_notification.h" -#include "atom/browser/api/atom_api_menu.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/browser.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" #include "native_mate/constructor.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" +#include "shell/browser/api/atom_api_menu.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/browser.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" #include "url/gurl.h" namespace mate { diff --git a/shell/browser/api/atom_api_notification.h b/shell/browser/api/atom_api_notification.h index 814ad04554..71969fb67a 100644 --- a/shell/browser/api/atom_api_notification.h +++ b/shell/browser/api/atom_api_notification.h @@ -9,12 +9,12 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/notifications/notification.h" -#include "atom/browser/notifications/notification_delegate.h" -#include "atom/browser/notifications/notification_presenter.h" #include "base/strings/utf_string_conversions.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/notifications/notification.h" +#include "shell/browser/notifications/notification_delegate.h" +#include "shell/browser/notifications/notification_presenter.h" #include "ui/gfx/image/image.h" namespace atom { diff --git a/shell/browser/api/atom_api_power_monitor.cc b/shell/browser/api/atom_api_power_monitor.cc index e6cd748940..1f5af9bd72 100644 --- a/shell/browser/api/atom_api_power_monitor.cc +++ b/shell/browser/api/atom_api_power_monitor.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_power_monitor.h" +#include "shell/browser/api/atom_api_power_monitor.h" -#include "atom/browser/browser.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/node_includes.h" #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor_device_source.h" #include "native_mate/dictionary.h" +#include "shell/browser/browser.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/node_includes.h" namespace mate { template <> diff --git a/shell/browser/api/atom_api_power_monitor.h b/shell/browser/api/atom_api_power_monitor.h index dda4391fbc..c551fede6f 100644 --- a/shell/browser/api/atom_api_power_monitor.h +++ b/shell/browser/api/atom_api_power_monitor.h @@ -5,10 +5,10 @@ #ifndef ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_ #define ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_ -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/lib/power_observer.h" #include "base/compiler_specific.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/lib/power_observer.h" #include "ui/base/idle/idle.h" namespace atom { diff --git a/shell/browser/api/atom_api_power_monitor_mac.mm b/shell/browser/api/atom_api_power_monitor_mac.mm index d84680680e..4b78756d20 100644 --- a/shell/browser/api/atom_api_power_monitor_mac.mm +++ b/shell/browser/api/atom_api_power_monitor_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_power_monitor.h" +#include "shell/browser/api/atom_api_power_monitor.h" #include diff --git a/shell/browser/api/atom_api_power_monitor_win.cc b/shell/browser/api/atom_api_power_monitor_win.cc index 54b95a9d16..264d620886 100644 --- a/shell/browser/api/atom_api_power_monitor_win.cc +++ b/shell/browser/api/atom_api_power_monitor_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_power_monitor.h" +#include "shell/browser/api/atom_api_power_monitor.h" #include #include diff --git a/shell/browser/api/atom_api_power_save_blocker.cc b/shell/browser/api/atom_api_power_save_blocker.cc index bf2f6c72cd..78286bc8ce 100644 --- a/shell/browser/api/atom_api_power_save_blocker.cc +++ b/shell/browser/api/atom_api_power_save_blocker.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_power_save_blocker.h" +#include "shell/browser/api/atom_api_power_save_blocker.h" #include -#include "atom/common/node_includes.h" #include "base/bind_helpers.h" #include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" @@ -16,6 +15,7 @@ #include "services/device/public/mojom/constants.mojom.h" #include "services/device/public/mojom/wake_lock_provider.mojom.h" #include "services/service_manager/public/cpp/connector.h" +#include "shell/common/node_includes.h" namespace gin { diff --git a/shell/browser/api/atom_api_protocol.cc b/shell/browser/api/atom_api_protocol.cc index 93030c8bc9..716b72fb5b 100644 --- a/shell/browser/api/atom_api_protocol.cc +++ b/shell/browser/api/atom_api_protocol.cc @@ -2,24 +2,24 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_protocol.h" +#include "shell/browser/api/atom_api_protocol.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/browser.h" -#include "atom/browser/net/url_request_async_asar_job.h" -#include "atom/browser/net/url_request_buffer_job.h" -#include "atom/browser/net/url_request_fetch_job.h" -#include "atom/browser/net/url_request_stream_job.h" -#include "atom/browser/net/url_request_string_job.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/strings/string_util.h" #include "content/public/browser/child_process_security_policy.h" #include "native_mate/dictionary.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/browser.h" +#include "shell/browser/net/url_request_async_asar_job.h" +#include "shell/browser/net/url_request_buffer_job.h" +#include "shell/browser/net/url_request_fetch_job.h" +#include "shell/browser/net/url_request_stream_job.h" +#include "shell/browser/net/url_request_string_job.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #include "url/url_util.h" using content::BrowserThread; diff --git a/shell/browser/api/atom_api_protocol.h b/shell/browser/api/atom_api_protocol.h index 4ae86dd53f..6ef33cbf1a 100644 --- a/shell/browser/api/atom_api_protocol.h +++ b/shell/browser/api/atom_api_protocol.h @@ -11,10 +11,6 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/net/atom_url_request_job_factory.h" -#include "atom/common/promise_util.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/post_task.h" @@ -24,6 +20,10 @@ #include "native_mate/dictionary.h" #include "native_mate/handle.h" #include "net/url_request/url_request_context.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/net/atom_url_request_job_factory.h" +#include "shell/common/promise_util.h" namespace base { class DictionaryValue; diff --git a/shell/browser/api/atom_api_protocol_ns.cc b/shell/browser/api/atom_api_protocol_ns.cc index 05febe2c61..74ef0ac698 100644 --- a/shell/browser/api/atom_api_protocol_ns.cc +++ b/shell/browser/api/atom_api_protocol_ns.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_protocol_ns.h" +#include "shell/browser/api/atom_api_protocol_ns.h" #include #include -#include "atom/browser/atom_browser_context.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/once_callback.h" -#include "atom/common/promise_util.h" #include "base/stl_util.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/once_callback.h" +#include "shell/common/promise_util.h" namespace atom { namespace api { diff --git a/shell/browser/api/atom_api_protocol_ns.h b/shell/browser/api/atom_api_protocol_ns.h index 603a60fc60..2eb683cdc0 100644 --- a/shell/browser/api/atom_api_protocol_ns.h +++ b/shell/browser/api/atom_api_protocol_ns.h @@ -7,11 +7,11 @@ #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/net/atom_url_loader_factory.h" #include "content/public/browser/content_browser_client.h" #include "native_mate/dictionary.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/net/atom_url_loader_factory.h" namespace atom { diff --git a/shell/browser/api/atom_api_screen.cc b/shell/browser/api/atom_api_screen.cc index 6a770f8e08..0f5833cfae 100644 --- a/shell/browser/api/atom_api_screen.cc +++ b/shell/browser/api/atom_api_screen.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_screen.h" +#include "shell/browser/api/atom_api_screen.h" #include #include -#include "atom/browser/api/atom_api_browser_window.h" -#include "atom/browser/browser.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/node_includes.h" #include "base/bind.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" +#include "shell/browser/api/atom_api_browser_window.h" +#include "shell/browser/browser.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/node_includes.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/gfx/geometry/point.h" diff --git a/shell/browser/api/atom_api_screen.h b/shell/browser/api/atom_api_screen.h index 33c322abf4..fff1942b9f 100644 --- a/shell/browser/api/atom_api_screen.h +++ b/shell/browser/api/atom_api_screen.h @@ -7,8 +7,8 @@ #include -#include "atom/browser/api/event_emitter.h" #include "native_mate/handle.h" +#include "shell/browser/api/event_emitter.h" #include "ui/display/display_observer.h" #include "ui/display/screen.h" diff --git a/shell/browser/api/atom_api_session.cc b/shell/browser/api/atom_api_session.cc index 97454ae5eb..8d34e3d253 100644 --- a/shell/browser/api/atom_api_session.cc +++ b/shell/browser/api/atom_api_session.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_session.h" +#include "shell/browser/api/atom_api_session.h" #include #include @@ -10,28 +10,6 @@ #include #include -#include "atom/browser/api/atom_api_cookies.h" -#include "atom/browser/api/atom_api_download_item.h" -#include "atom/browser/api/atom_api_net_log.h" -#include "atom/browser/api/atom_api_protocol.h" -#include "atom/browser/api/atom_api_protocol_ns.h" -#include "atom/browser/api/atom_api_web_request.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/atom_permission_manager.h" -#include "atom/browser/browser.h" -#include "atom/browser/media/media_device_id_salt.h" -#include "atom/browser/net/atom_cert_verifier.h" -#include "atom/browser/net/system_network_context_manager.h" -#include "atom/browser/session_preferences.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/content_converter.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "base/files/file_path.h" #include "base/guid.h" #include "base/strings/string_number_conversions.h" @@ -62,6 +40,28 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "services/network/public/cpp/features.h" +#include "shell/browser/api/atom_api_cookies.h" +#include "shell/browser/api/atom_api_download_item.h" +#include "shell/browser/api/atom_api_net_log.h" +#include "shell/browser/api/atom_api_protocol.h" +#include "shell/browser/api/atom_api_protocol_ns.h" +#include "shell/browser/api/atom_api_web_request.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_permission_manager.h" +#include "shell/browser/browser.h" +#include "shell/browser/media/media_device_id_salt.h" +#include "shell/browser/net/atom_cert_verifier.h" +#include "shell/browser/net/system_network_context_manager.h" +#include "shell/browser/session_preferences.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/content_converter.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/shell/browser/api/atom_api_session.h b/shell/browser/api/atom_api_session.h index 2f8d9721e4..ad89f52a31 100644 --- a/shell/browser/api/atom_api_session.h +++ b/shell/browser/api/atom_api_session.h @@ -8,13 +8,13 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/atom_blob_reader.h" -#include "atom/browser/net/resolve_proxy_helper.h" -#include "atom/common/promise_util.h" #include "base/values.h" #include "content/public/browser/download_manager.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/atom_blob_reader.h" +#include "shell/browser/net/resolve_proxy_helper.h" +#include "shell/common/promise_util.h" class GURL; diff --git a/shell/browser/api/atom_api_system_preferences.cc b/shell/browser/api/atom_api_system_preferences.cc index fa152ea638..23be4e02af 100644 --- a/shell/browser/api/atom_api_system_preferences.cc +++ b/shell/browser/api/atom_api_system_preferences.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_system_preferences.h" +#include "shell/browser/api/atom_api_system_preferences.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" #include "ui/gfx/animation/animation.h" #include "ui/gfx/color_utils.h" diff --git a/shell/browser/api/atom_api_system_preferences.h b/shell/browser/api/atom_api_system_preferences.h index 6465cb3bcc..519502621c 100644 --- a/shell/browser/api/atom_api_system_preferences.h +++ b/shell/browser/api/atom_api_system_preferences.h @@ -8,15 +8,15 @@ #include #include -#include "atom/browser/api/event_emitter.h" -#include "atom/common/promise_util.h" #include "base/callback.h" #include "base/values.h" #include "native_mate/handle.h" +#include "shell/browser/api/event_emitter.h" +#include "shell/common/promise_util.h" #if defined(OS_WIN) -#include "atom/browser/browser.h" -#include "atom/browser/browser_observer.h" +#include "shell/browser/browser.h" +#include "shell/browser/browser_observer.h" #include "ui/gfx/sys_color_change_listener.h" #endif diff --git a/shell/browser/api/atom_api_system_preferences_mac.mm b/shell/browser/api/atom_api_system_preferences_mac.mm index 9cee2a283f..e269940857 100644 --- a/shell/browser/api/atom_api_system_preferences_mac.mm +++ b/shell/browser/api/atom_api_system_preferences_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_system_preferences.h" +#include "shell/browser/api/atom_api_system_preferences.h" #include #include @@ -14,11 +14,6 @@ #import #import -#include "atom/browser/mac/atom_application.h" -#include "atom/browser/mac/dict_util.h" -#include "atom/browser/ui/cocoa/NSColor+Hex.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/sdk_forward_declarations.h" #include "base/sequenced_task_runner.h" @@ -28,6 +23,11 @@ #include "base/values.h" #include "native_mate/object_template_builder.h" #include "net/base/mac/url_conversions.h" +#include "shell/browser/mac/atom_application.h" +#include "shell/browser/mac/dict_util.h" +#include "shell/browser/ui/cocoa/NSColor+Hex.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" namespace mate { template <> diff --git a/shell/browser/api/atom_api_system_preferences_win.cc b/shell/browser/api/atom_api_system_preferences_win.cc index 424bf0d950..ed889c2e1e 100644 --- a/shell/browser/api/atom_api_system_preferences_win.cc +++ b/shell/browser/api/atom_api_system_preferences_win.cc @@ -5,10 +5,10 @@ #include #include -#include "atom/browser/api/atom_api_system_preferences.h" +#include "shell/browser/api/atom_api_system_preferences.h" -#include "atom/common/color_util.h" #include "base/win/wrapped_window_proc.h" +#include "shell/common/color_util.h" #include "ui/base/win/shell.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/shell/browser/api/atom_api_top_level_window.cc b/shell/browser/api/atom_api_top_level_window.cc index e6d6f62a3c..cc5a7548f9 100644 --- a/shell/browser/api/atom_api_top_level_window.cc +++ b/shell/browser/api/atom_api_top_level_window.cc @@ -2,35 +2,35 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_top_level_window.h" +#include "shell/browser/api/atom_api_top_level_window.h" #include #include -#include "atom/browser/api/atom_api_browser_view.h" -#include "atom/browser/api/atom_api_menu.h" -#include "atom/browser/api/atom_api_view.h" -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/common/color_util.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "electron/buildflags/buildflags.h" #include "gin/converter.h" #include "native_mate/handle.h" #include "native_mate/persistent_dictionary.h" +#include "shell/browser/api/atom_api_browser_view.h" +#include "shell/browser/api/atom_api_menu.h" +#include "shell/browser/api/atom_api_view.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/common/color_util.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #if defined(TOOLKIT_VIEWS) -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" #endif #if defined(OS_WIN) -#include "atom/browser/ui/win/taskbar_host.h" +#include "shell/browser/ui/win/taskbar_host.h" #include "ui/base/win/shell.h" #endif diff --git a/shell/browser/api/atom_api_top_level_window.h b/shell/browser/api/atom_api_top_level_window.h index 0192795ae3..665f1bd257 100644 --- a/shell/browser/api/atom_api_top_level_window.h +++ b/shell/browser/api/atom_api_top_level_window.h @@ -10,14 +10,14 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/native_window.h" -#include "atom/browser/native_window_observer.h" -#include "atom/common/api/atom_api_native_image.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/native_window.h" +#include "shell/browser/native_window_observer.h" +#include "shell/common/api/atom_api_native_image.h" namespace atom { diff --git a/shell/browser/api/atom_api_tray.cc b/shell/browser/api/atom_api_tray.cc index 2d7e3a132d..1b7828a7c7 100644 --- a/shell/browser/api/atom_api_tray.cc +++ b/shell/browser/api/atom_api_tray.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_tray.h" +#include "shell/browser/api/atom_api_tray.h" #include -#include "atom/browser/api/atom_api_menu.h" -#include "atom/browser/browser.h" -#include "atom/common/api/atom_api_native_image.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" #include "base/threading/thread_task_runner_handle.h" #include "native_mate/constructor.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_menu.h" +#include "shell/browser/browser.h" +#include "shell/common/api/atom_api_native_image.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" #include "ui/gfx/image/image.h" namespace mate { diff --git a/shell/browser/api/atom_api_tray.h b/shell/browser/api/atom_api_tray.h index b16b92f47b..52c2bcf3c7 100644 --- a/shell/browser/api/atom_api_tray.h +++ b/shell/browser/api/atom_api_tray.h @@ -9,10 +9,10 @@ #include #include -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/ui/tray_icon.h" -#include "atom/browser/ui/tray_icon_observer.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/ui/tray_icon.h" +#include "shell/browser/ui/tray_icon_observer.h" namespace gfx { class Image; diff --git a/shell/browser/api/atom_api_url_request.cc b/shell/browser/api/atom_api_url_request.cc index c47a74b541..63ca97927c 100644 --- a/shell/browser/api/atom_api_url_request.cc +++ b/shell/browser/api/atom_api_url_request.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_url_request.h" +#include "shell/browser/api/atom_api_url_request.h" #include -#include "atom/browser/api/atom_api_session.h" -#include "atom/browser/net/atom_url_request.h" -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/once_callback.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_session.h" +#include "shell/browser/net/atom_url_request.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/once_callback.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" namespace mate { diff --git a/shell/browser/api/atom_api_url_request.h b/shell/browser/api/atom_api_url_request.h index 44c863fbc2..020fe7ed07 100644 --- a/shell/browser/api/atom_api_url_request.h +++ b/shell/browser/api/atom_api_url_request.h @@ -8,8 +8,6 @@ #include #include -#include "atom/browser/api/event_emitter.h" -#include "atom/browser/api/trackable_object.h" #include "base/memory/weak_ptr.h" #include "native_mate/dictionary.h" #include "native_mate/handle.h" @@ -18,6 +16,8 @@ #include "net/base/io_buffer.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_context.h" +#include "shell/browser/api/event_emitter.h" +#include "shell/browser/api/trackable_object.h" namespace atom { diff --git a/shell/browser/api/atom_api_view.cc b/shell/browser/api/atom_api_view.cc index 44041c1e16..ce86dbe2a1 100644 --- a/shell/browser/api/atom_api_view.cc +++ b/shell/browser/api/atom_api_view.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_view.h" +#include "shell/browser/api/atom_api_view.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/atom_api_view.h b/shell/browser/api/atom_api_view.h index 30f2b5399b..d706274f1f 100644 --- a/shell/browser/api/atom_api_view.h +++ b/shell/browser/api/atom_api_view.h @@ -8,9 +8,9 @@ #include #include -#include "atom/browser/api/views/atom_api_layout_manager.h" #include "electron/buildflags/buildflags.h" #include "native_mate/handle.h" +#include "shell/browser/api/views/atom_api_layout_manager.h" #include "ui/views/view.h" namespace atom { diff --git a/shell/browser/api/atom_api_web_contents.cc b/shell/browser/api/atom_api_web_contents.cc index f48210a8b9..47eb0f2b9b 100644 --- a/shell/browser/api/atom_api_web_contents.cc +++ b/shell/browser/api/atom_api_web_contents.cc @@ -2,51 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_web_contents.h" +#include "shell/browser/api/atom_api_web_contents.h" #include #include #include #include -#include "atom/browser/api/atom_api_browser_window.h" -#include "atom/browser/api/atom_api_debugger.h" -#include "atom/browser/api/atom_api_session.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/atom_javascript_dialog_manager.h" -#include "atom/browser/atom_navigation_throttle.h" -#include "atom/browser/browser.h" -#include "atom/browser/child_web_contents_tracker.h" -#include "atom/browser/lib/bluetooth_chooser.h" -#include "atom/browser/native_window.h" -#include "atom/browser/net/atom_network_delegate.h" -#include "atom/browser/ui/drag_util.h" -#include "atom/browser/ui/inspectable_web_contents.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" -#include "atom/browser/web_contents_permission_helper.h" -#include "atom/browser/web_contents_preferences.h" -#include "atom/browser/web_contents_zoom_controller.h" -#include "atom/browser/web_view_guest_delegate.h" -#include "atom/common/api/atom_api_native_image.h" -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/color_util.h" -#include "atom/common/mouse_util.h" -#include "atom/common/native_mate_converters/blink_converter.h" -#include "atom/common/native_mate_converters/content_converter.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/map_converter.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/network_converter.h" -#include "atom/common/native_mate_converters/once_callback.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "base/message_loop/message_loop.h" #include "base/no_destructor.h" #include "base/optional.h" @@ -79,12 +41,50 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "mojo/public/cpp/system/platform_handle.h" #include "native_mate/converter.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "net/url_request/url_request_context.h" +#include "shell/browser/api/atom_api_browser_window.h" +#include "shell/browser/api/atom_api_debugger.h" +#include "shell/browser/api/atom_api_session.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_javascript_dialog_manager.h" +#include "shell/browser/atom_navigation_throttle.h" +#include "shell/browser/browser.h" +#include "shell/browser/child_web_contents_tracker.h" +#include "shell/browser/lib/bluetooth_chooser.h" +#include "shell/browser/native_window.h" +#include "shell/browser/net/atom_network_delegate.h" +#include "shell/browser/ui/drag_util.h" +#include "shell/browser/ui/inspectable_web_contents.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" +#include "shell/browser/web_contents_permission_helper.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/browser/web_contents_zoom_controller.h" +#include "shell/browser/web_view_guest_delegate.h" +#include "shell/common/api/atom_api_native_image.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/color_util.h" +#include "shell/common/mouse_util.h" +#include "shell/common/native_mate_converters/blink_converter.h" +#include "shell/common/native_mate_converters/content_converter.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/map_converter.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/network_converter.h" +#include "shell/common/native_mate_converters/once_callback.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h" #include "third_party/blink/public/platform/web_cursor_info.h" @@ -93,8 +93,8 @@ #include "ui/events/base_event_utils.h" #if BUILDFLAG(ENABLE_OSR) -#include "atom/browser/osr/osr_render_widget_host_view.h" -#include "atom/browser/osr/osr_web_contents_view.h" +#include "shell/browser/osr/osr_render_widget_host_view.h" +#include "shell/browser/osr/osr_web_contents_view.h" #endif #if !defined(OS_MACOSX) diff --git a/shell/browser/api/atom_api_web_contents.h b/shell/browser/api/atom_api_web_contents.h index 39a7fb9c73..7e0b3f3443 100644 --- a/shell/browser/api/atom_api_web_contents.h +++ b/shell/browser/api/atom_api_web_contents.h @@ -10,11 +10,6 @@ #include #include -#include "atom/browser/api/frame_subscriber.h" -#include "atom/browser/api/save_page_handler.h" -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/common_web_contents_delegate.h" -#include "atom/browser/ui/autofill_popup.h" #include "base/observer_list.h" #include "base/observer_list_types.h" #include "content/common/cursors/webcursor.h" @@ -23,16 +18,21 @@ #include "content/public/browser/web_contents_binding_set.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/favicon_url.h" -#include "electron/atom/common/api/api.mojom.h" #include "electron/buildflags/buildflags.h" +#include "electron/shell/common/api/api.mojom.h" #include "native_mate/handle.h" #include "printing/buildflags/buildflags.h" #include "services/service_manager/public/cpp/binder_registry.h" +#include "shell/browser/api/frame_subscriber.h" +#include "shell/browser/api/save_page_handler.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/common_web_contents_delegate.h" +#include "shell/browser/ui/autofill_popup.h" #include "ui/gfx/image/image.h" #if BUILDFLAG(ENABLE_PRINTING) -#include "atom/browser/printing/print_preview_message_handler.h" #include "printing/backend/print_backend.h" +#include "shell/browser/printing/print_preview_message_handler.h" #endif namespace blink { diff --git a/shell/browser/api/atom_api_web_contents_impl.cc b/shell/browser/api/atom_api_web_contents_impl.cc index 30448ff2d5..be9c0155d8 100644 --- a/shell/browser/api/atom_api_web_contents_impl.cc +++ b/shell/browser/api/atom_api_web_contents_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_web_contents.h" +#include "shell/browser/api/atom_api_web_contents.h" #include "content/browser/frame_host/frame_tree.h" // nogncheck #include "content/browser/frame_host/frame_tree_node.h" // nogncheck @@ -10,8 +10,8 @@ #include "content/public/browser/guest_mode.h" #if BUILDFLAG(ENABLE_OSR) -#include "atom/browser/osr/osr_render_widget_host_view.h" -#include "atom/browser/osr/osr_web_contents_view.h" +#include "shell/browser/osr/osr_render_widget_host_view.h" +#include "shell/browser/osr/osr_web_contents_view.h" #endif // Including both web_contents_impl.h and node.h would introduce a error, we diff --git a/shell/browser/api/atom_api_web_contents_mac.mm b/shell/browser/api/atom_api_web_contents_mac.mm index 4df01e182a..eaf4dac71a 100644 --- a/shell/browser/api/atom_api_web_contents_mac.mm +++ b/shell/browser/api/atom_api_web_contents_mac.mm @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_web_contents.h" #include "content/public/browser/render_widget_host_view.h" +#include "shell/browser/api/atom_api_web_contents.h" #import diff --git a/shell/browser/api/atom_api_web_contents_view.cc b/shell/browser/api/atom_api_web_contents_view.cc index 51a902defa..e8818c0de5 100644 --- a/shell/browser/api/atom_api_web_contents_view.cc +++ b/shell/browser/api/atom_api_web_contents_view.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_web_contents_view.h" +#include "shell/browser/api/atom_api_web_contents_view.h" -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/browser.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "content/public/browser/web_contents_user_data.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/browser.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" #if defined(OS_MACOSX) -#include "atom/browser/ui/cocoa/delayed_native_view_host.h" +#include "shell/browser/ui/cocoa/delayed_native_view_host.h" #endif namespace { diff --git a/shell/browser/api/atom_api_web_contents_view.h b/shell/browser/api/atom_api_web_contents_view.h index b4ec1b6d73..eebc0db3e1 100644 --- a/shell/browser/api/atom_api_web_contents_view.h +++ b/shell/browser/api/atom_api_web_contents_view.h @@ -5,9 +5,9 @@ #ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_ #define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_ -#include "atom/browser/api/atom_api_view.h" #include "content/public/browser/web_contents_observer.h" #include "native_mate/handle.h" +#include "shell/browser/api/atom_api_view.h" namespace atom { diff --git a/shell/browser/api/atom_api_web_request.cc b/shell/browser/api/atom_api_web_request.cc index 26e6bb205a..541cc1203c 100644 --- a/shell/browser/api/atom_api_web_request.cc +++ b/shell/browser/api/atom_api_web_request.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/atom_api_web_request.h" +#include "shell/browser/api/atom_api_web_request.h" #include #include -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/net/atom_network_delegate.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/once_callback.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/net/atom_network_delegate.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/once_callback.h" +#include "shell/common/native_mate_converters/value_converter.h" using content::BrowserThread; diff --git a/shell/browser/api/atom_api_web_request.h b/shell/browser/api/atom_api_web_request.h index 87fa088158..091ff75e4f 100644 --- a/shell/browser/api/atom_api_web_request.h +++ b/shell/browser/api/atom_api_web_request.h @@ -5,10 +5,10 @@ #ifndef ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_ #define ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_ -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/net/atom_network_delegate.h" #include "native_mate/arguments.h" #include "native_mate/handle.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/net/atom_network_delegate.h" namespace atom { diff --git a/shell/browser/api/atom_api_web_view_manager.cc b/shell/browser/api/atom_api_web_view_manager.cc index fae56492d7..d47838c24f 100644 --- a/shell/browser/api/atom_api_web_view_manager.cc +++ b/shell/browser/api/atom_api_web_view_manager.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/web_contents_preferences.h" -#include "atom/browser/web_contents_zoom_controller.h" -#include "atom/browser/web_view_manager.h" -#include "atom/common/native_mate_converters/content_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "content/public/browser/browser_context.h" #include "native_mate/dictionary.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/browser/web_contents_zoom_controller.h" +#include "shell/browser/web_view_manager.h" +#include "shell/common/native_mate_converters/content_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" using atom::WebContentsPreferences; diff --git a/shell/browser/api/event.cc b/shell/browser/api/event.cc index 05dc0d591b..b13b49b1d2 100644 --- a/shell/browser/api/event.cc +++ b/shell/browser/api/event.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/event.h" +#include "shell/browser/api/event.h" #include -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "native_mate/object_template_builder.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" namespace mate { diff --git a/shell/browser/api/event.h b/shell/browser/api/event.h index ac71a1e12b..be4bd8f03a 100644 --- a/shell/browser/api/event.h +++ b/shell/browser/api/event.h @@ -7,7 +7,7 @@ #include "base/optional.h" #include "content/public/browser/web_contents_observer.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "native_mate/handle.h" #include "native_mate/wrappable.h" diff --git a/shell/browser/api/event_emitter.cc b/shell/browser/api/event_emitter.cc index 0f8ee7c8bd..6794766c9d 100644 --- a/shell/browser/api/event_emitter.cc +++ b/shell/browser/api/event_emitter.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/event_emitter.h" +#include "shell/browser/api/event_emitter.h" #include -#include "atom/browser/api/event.h" -#include "atom/common/node_includes.h" #include "content/public/browser/render_frame_host.h" #include "native_mate/arguments.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" +#include "shell/browser/api/event.h" +#include "shell/common/node_includes.h" #include "ui/events/event_constants.h" namespace mate { diff --git a/shell/browser/api/event_emitter.h b/shell/browser/api/event_emitter.h index f89b86bbcf..9d326e14dd 100644 --- a/shell/browser/api/event_emitter.h +++ b/shell/browser/api/event_emitter.h @@ -8,11 +8,11 @@ #include #include -#include "atom/common/api/event_emitter_caller.h" #include "base/optional.h" #include "content/public/browser/browser_thread.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "native_mate/wrappable.h" +#include "shell/common/api/event_emitter_caller.h" namespace content { class RenderFrameHost; diff --git a/shell/browser/api/frame_subscriber.cc b/shell/browser/api/frame_subscriber.cc index 6b607259ad..f6908781f6 100644 --- a/shell/browser/api/frame_subscriber.cc +++ b/shell/browser/api/frame_subscriber.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/frame_subscriber.h" +#include "shell/browser/api/frame_subscriber.h" #include -#include "atom/common/native_mate_converters/gfx_converter.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" #include "media/capture/mojom/video_capture_types.mojom.h" +#include "shell/common/native_mate_converters/gfx_converter.h" #include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image.h" #include "ui/gfx/skbitmap_operations.h" diff --git a/shell/browser/api/gpu_info_enumerator.cc b/shell/browser/api/gpu_info_enumerator.cc index 044af0e0ea..b3907553ee 100644 --- a/shell/browser/api/gpu_info_enumerator.cc +++ b/shell/browser/api/gpu_info_enumerator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/gpu_info_enumerator.h" +#include "shell/browser/api/gpu_info_enumerator.h" #include diff --git a/shell/browser/api/gpuinfo_manager.cc b/shell/browser/api/gpuinfo_manager.cc index dbc52f84ac..28dafa90ce 100644 --- a/shell/browser/api/gpuinfo_manager.cc +++ b/shell/browser/api/gpuinfo_manager.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/gpuinfo_manager.h" +#include "shell/browser/api/gpuinfo_manager.h" #include -#include "atom/browser/api/gpu_info_enumerator.h" #include "base/memory/singleton.h" #include "base/threading/thread_task_runner_handle.h" #include "content/public/browser/browser_thread.h" #include "gpu/config/gpu_info_collector.h" +#include "shell/browser/api/gpu_info_enumerator.h" namespace atom { diff --git a/shell/browser/api/gpuinfo_manager.h b/shell/browser/api/gpuinfo_manager.h index 6fcb08a196..6b9ba08787 100644 --- a/shell/browser/api/gpuinfo_manager.h +++ b/shell/browser/api/gpuinfo_manager.h @@ -9,11 +9,11 @@ #include #include -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/promise_util.h" #include "content/browser/gpu/gpu_data_manager_impl.h" // nogncheck #include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/gpu_data_manager_observer.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/promise_util.h" namespace atom { diff --git a/shell/browser/api/process_metric.cc b/shell/browser/api/process_metric.cc index f97d599512..6293d15f24 100644 --- a/shell/browser/api/process_metric.cc +++ b/shell/browser/api/process_metric.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/process_metric.h" +#include "shell/browser/api/process_metric.h" #include #include diff --git a/shell/browser/api/save_page_handler.cc b/shell/browser/api/save_page_handler.cc index 654257681d..d3a7f5bd51 100644 --- a/shell/browser/api/save_page_handler.cc +++ b/shell/browser/api/save_page_handler.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/save_page_handler.h" +#include "shell/browser/api/save_page_handler.h" #include #include -#include "atom/browser/atom_browser_context.h" #include "base/callback.h" #include "base/files/file_path.h" #include "content/public/browser/web_contents.h" +#include "shell/browser/atom_browser_context.h" namespace atom { diff --git a/shell/browser/api/save_page_handler.h b/shell/browser/api/save_page_handler.h index 51ef4e5320..d87e62fc8b 100644 --- a/shell/browser/api/save_page_handler.h +++ b/shell/browser/api/save_page_handler.h @@ -7,10 +7,10 @@ #include -#include "atom/common/promise_util.h" #include "components/download/public/common/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/save_page_type.h" +#include "shell/common/promise_util.h" #include "v8/include/v8.h" namespace base { diff --git a/shell/browser/api/stream_subscriber.cc b/shell/browser/api/stream_subscriber.cc index 98f2f8e237..0bf0fd5f36 100644 --- a/shell/browser/api/stream_subscriber.cc +++ b/shell/browser/api/stream_subscriber.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/stream_subscriber.h" +#include "shell/browser/api/stream_subscriber.h" #include -#include "atom/browser/net/url_request_stream_job.h" -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/node_includes.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" +#include "shell/browser/net/url_request_stream_job.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/node_includes.h" namespace mate { diff --git a/shell/browser/api/trackable_object.cc b/shell/browser/api/trackable_object.cc index 40c9d40283..63c692814f 100644 --- a/shell/browser/api/trackable_object.cc +++ b/shell/browser/api/trackable_object.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/trackable_object.h" +#include "shell/browser/api/trackable_object.h" #include -#include "atom/browser/atom_browser_main_parts.h" #include "base/bind.h" #include "base/supports_user_data.h" +#include "shell/browser/atom_browser_main_parts.h" namespace mate { diff --git a/shell/browser/api/trackable_object.h b/shell/browser/api/trackable_object.h index f0fd86d344..28f22a76d5 100644 --- a/shell/browser/api/trackable_object.h +++ b/shell/browser/api/trackable_object.h @@ -7,11 +7,11 @@ #include -#include "atom/browser/api/event_emitter.h" -#include "atom/common/key_weak_map.h" #include "base/bind.h" #include "base/memory/weak_ptr.h" #include "native_mate/object_template_builder.h" +#include "shell/browser/api/event_emitter.h" +#include "shell/common/key_weak_map.h" namespace base { class SupportsUserData; diff --git a/shell/browser/api/views/atom_api_box_layout.cc b/shell/browser/api/views/atom_api_box_layout.cc index 32223912b6..93bed9d556 100644 --- a/shell/browser/api/views/atom_api_box_layout.cc +++ b/shell/browser/api/views/atom_api_box_layout.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/views/atom_api_box_layout.h" +#include "shell/browser/api/views/atom_api_box_layout.h" #include -#include "atom/browser/api/atom_api_view.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_view.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" namespace mate { diff --git a/shell/browser/api/views/atom_api_box_layout.h b/shell/browser/api/views/atom_api_box_layout.h index e9f26155a9..db95e13132 100644 --- a/shell/browser/api/views/atom_api_box_layout.h +++ b/shell/browser/api/views/atom_api_box_layout.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_ #define ATOM_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_ -#include "atom/browser/api/views/atom_api_layout_manager.h" #include "native_mate/handle.h" +#include "shell/browser/api/views/atom_api_layout_manager.h" #include "ui/views/layout/box_layout.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_button.cc b/shell/browser/api/views/atom_api_button.cc index b4c9f8c5ff..601a774295 100644 --- a/shell/browser/api/views/atom_api_button.cc +++ b/shell/browser/api/views/atom_api_button.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/views/atom_api_button.h" +#include "shell/browser/api/views/atom_api_button.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_button.h b/shell/browser/api/views/atom_api_button.h index 727f42d7b0..a0b5867fb7 100644 --- a/shell/browser/api/views/atom_api_button.h +++ b/shell/browser/api/views/atom_api_button.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_ #define ATOM_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_ -#include "atom/browser/api/atom_api_view.h" #include "native_mate/handle.h" +#include "shell/browser/api/atom_api_view.h" #include "ui/views/controls/button/button.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_label_button.cc b/shell/browser/api/views/atom_api_label_button.cc index 2e43b3d93a..0d100b7c1f 100644 --- a/shell/browser/api/views/atom_api_label_button.cc +++ b/shell/browser/api/views/atom_api_label_button.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/views/atom_api_label_button.h" +#include "shell/browser/api/views/atom_api_label_button.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "base/strings/utf_string_conversions.h" #include "native_mate/dictionary.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_label_button.h b/shell/browser/api/views/atom_api_label_button.h index 506ebb159a..ea92c420c9 100644 --- a/shell/browser/api/views/atom_api_label_button.h +++ b/shell/browser/api/views/atom_api_label_button.h @@ -7,7 +7,7 @@ #include -#include "atom/browser/api/views/atom_api_button.h" +#include "shell/browser/api/views/atom_api_button.h" #include "ui/views/controls/button/label_button.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_layout_manager.cc b/shell/browser/api/views/atom_api_layout_manager.cc index ef36145633..89fb3ce643 100644 --- a/shell/browser/api/views/atom_api_layout_manager.cc +++ b/shell/browser/api/views/atom_api_layout_manager.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/views/atom_api_layout_manager.h" +#include "shell/browser/api/views/atom_api_layout_manager.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_layout_manager.h b/shell/browser/api/views/atom_api_layout_manager.h index 0431f1a214..39c6da574d 100644 --- a/shell/browser/api/views/atom_api_layout_manager.h +++ b/shell/browser/api/views/atom_api_layout_manager.h @@ -7,7 +7,7 @@ #include -#include "atom/browser/api/trackable_object.h" +#include "shell/browser/api/trackable_object.h" #include "ui/views/layout/layout_manager.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_md_text_button.cc b/shell/browser/api/views/atom_api_md_text_button.cc index bb32b40e26..3aa055b924 100644 --- a/shell/browser/api/views/atom_api_md_text_button.cc +++ b/shell/browser/api/views/atom_api_md_text_button.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/views/atom_api_md_text_button.h" +#include "shell/browser/api/views/atom_api_md_text_button.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "base/strings/utf_string_conversions.h" #include "native_mate/dictionary.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_md_text_button.h b/shell/browser/api/views/atom_api_md_text_button.h index 027325b4dd..6b45638100 100644 --- a/shell/browser/api/views/atom_api_md_text_button.h +++ b/shell/browser/api/views/atom_api_md_text_button.h @@ -7,7 +7,7 @@ #include -#include "atom/browser/api/views/atom_api_label_button.h" +#include "shell/browser/api/views/atom_api_label_button.h" #include "ui/views/controls/button/md_text_button.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_resize_area.cc b/shell/browser/api/views/atom_api_resize_area.cc index 2d545dc246..6924e90319 100644 --- a/shell/browser/api/views/atom_api_resize_area.cc +++ b/shell/browser/api/views/atom_api_resize_area.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/views/atom_api_resize_area.h" +#include "shell/browser/api/views/atom_api_resize_area.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_resize_area.h b/shell/browser/api/views/atom_api_resize_area.h index 52f9f9bdd3..937efe8460 100644 --- a/shell/browser/api/views/atom_api_resize_area.h +++ b/shell/browser/api/views/atom_api_resize_area.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_ #define ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_ -#include "atom/browser/api/atom_api_view.h" #include "native_mate/handle.h" +#include "shell/browser/api/atom_api_view.h" #include "ui/views/controls/resize_area.h" #include "ui/views/controls/resize_area_delegate.h" diff --git a/shell/browser/api/views/atom_api_text_field.cc b/shell/browser/api/views/atom_api_text_field.cc index 555d6c76cb..53d17db09a 100644 --- a/shell/browser/api/views/atom_api_text_field.cc +++ b/shell/browser/api/views/atom_api_text_field.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/api/views/atom_api_text_field.h" +#include "shell/browser/api/views/atom_api_text_field.h" -#include "atom/common/api/constructor.h" -#include "atom/common/node_includes.h" #include "native_mate/dictionary.h" +#include "shell/common/api/constructor.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/api/views/atom_api_text_field.h b/shell/browser/api/views/atom_api_text_field.h index 474b5d4a9e..95afa055ac 100644 --- a/shell/browser/api/views/atom_api_text_field.h +++ b/shell/browser/api/views/atom_api_text_field.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_ #define ATOM_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_ -#include "atom/browser/api/atom_api_view.h" #include "native_mate/handle.h" +#include "shell/browser/api/atom_api_view.h" #include "ui/views/controls/textfield/textfield.h" namespace atom { diff --git a/shell/browser/atom_blob_reader.cc b/shell/browser/atom_blob_reader.cc index 3e7a2701bc..22974f60d2 100644 --- a/shell/browser/atom_blob_reader.cc +++ b/shell/browser/atom_blob_reader.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_blob_reader.h" +#include "shell/browser/atom_blob_reader.h" #include -#include "atom/common/node_includes.h" #include "base/task/post_task.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" // nogncheck #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" +#include "shell/common/node_includes.h" #include "storage/browser/blob/blob_data_handle.h" #include "storage/browser/blob/blob_reader.h" #include "storage/browser/blob/blob_storage_context.h" diff --git a/shell/browser/atom_blob_reader.h b/shell/browser/atom_blob_reader.h index ebc1ca47ee..7afdda5d26 100644 --- a/shell/browser/atom_blob_reader.h +++ b/shell/browser/atom_blob_reader.h @@ -8,8 +8,8 @@ #include #include -#include "atom/common/promise_util.h" #include "base/callback.h" +#include "shell/common/promise_util.h" namespace content { class ChromeBlobStorageContext; diff --git a/shell/browser/atom_browser_client.cc b/shell/browser/atom_browser_client.cc index 736b0d6d69..4669d72378 100644 --- a/shell/browser/atom_browser_client.cc +++ b/shell/browser/atom_browser_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_client.h" #if defined(OS_WIN) #include @@ -11,35 +11,6 @@ #include #include -#include "atom/app/manifests.h" -#include "atom/browser/api/atom_api_app.h" -#include "atom/browser/api/atom_api_protocol.h" -#include "atom/browser/api/atom_api_protocol_ns.h" -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/atom_navigation_throttle.h" -#include "atom/browser/atom_paths.h" -#include "atom/browser/atom_quota_permission_context.h" -#include "atom/browser/atom_speech_recognition_manager_delegate.h" -#include "atom/browser/child_web_contents_tracker.h" -#include "atom/browser/font_defaults.h" -#include "atom/browser/io_thread.h" -#include "atom/browser/media/media_capture_devices_dispatcher.h" -#include "atom/browser/native_window.h" -#include "atom/browser/net/network_context_service.h" -#include "atom/browser/net/network_context_service_factory.h" -#include "atom/browser/net/proxying_url_loader_factory.h" -#include "atom/browser/notifications/notification_presenter.h" -#include "atom/browser/notifications/platform_notification_service.h" -#include "atom/browser/session_preferences.h" -#include "atom/browser/ui/devtools_manager_delegate.h" -#include "atom/browser/web_contents_permission_helper.h" -#include "atom/browser/web_contents_preferences.h" -#include "atom/browser/window_list.h" -#include "atom/common/application_info.h" -#include "atom/common/options_switches.h" -#include "atom/common/platform_util.h" #include "base/command_line.h" #include "base/environment.h" #include "base/files/file_util.h" @@ -77,6 +48,35 @@ #include "services/device/public/cpp/geolocation/location_provider.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/resource_request_body.h" +#include "shell/app/manifests.h" +#include "shell/browser/api/atom_api_app.h" +#include "shell/browser/api/atom_api_protocol.h" +#include "shell/browser/api/atom_api_protocol_ns.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_navigation_throttle.h" +#include "shell/browser/atom_paths.h" +#include "shell/browser/atom_quota_permission_context.h" +#include "shell/browser/atom_speech_recognition_manager_delegate.h" +#include "shell/browser/child_web_contents_tracker.h" +#include "shell/browser/font_defaults.h" +#include "shell/browser/io_thread.h" +#include "shell/browser/media/media_capture_devices_dispatcher.h" +#include "shell/browser/native_window.h" +#include "shell/browser/net/network_context_service.h" +#include "shell/browser/net/network_context_service_factory.h" +#include "shell/browser/net/proxying_url_loader_factory.h" +#include "shell/browser/notifications/notification_presenter.h" +#include "shell/browser/notifications/platform_notification_service.h" +#include "shell/browser/session_preferences.h" +#include "shell/browser/ui/devtools_manager_delegate.h" +#include "shell/browser/web_contents_permission_helper.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/browser/window_list.h" +#include "shell/common/application_info.h" +#include "shell/common/options_switches.h" +#include "shell/common/platform_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" @@ -102,7 +102,7 @@ #endif // BUILDFLAG(ENABLE_PEPPER_FLASH) #if BUILDFLAG(OVERRIDE_LOCATION_PROVIDER) -#include "atom/browser/fake_location_provider.h" +#include "shell/browser/fake_location_provider.h" #endif // BUILDFLAG(OVERRIDE_LOCATION_PROVIDER) #if BUILDFLAG(ENABLE_TTS) diff --git a/shell/browser/atom_browser_context.cc b/shell/browser/atom_browser_context.cc index 98cdcb0115..bd2c5d736e 100644 --- a/shell/browser/atom_browser_context.cc +++ b/shell/browser/atom_browser_context.cc @@ -2,25 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_browser_context.h" +#include "shell/browser/atom_browser_context.h" #include -#include "atom/browser/atom_blob_reader.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/atom_download_manager_delegate.h" -#include "atom/browser/atom_paths.h" -#include "atom/browser/atom_permission_manager.h" -#include "atom/browser/cookie_change_notifier.h" -#include "atom/browser/net/resolve_proxy_helper.h" -#include "atom/browser/pref_store_delegate.h" -#include "atom/browser/special_storage_policy.h" -#include "atom/browser/ui/inspectable_web_contents_impl.h" -#include "atom/browser/web_view_manager.h" -#include "atom/browser/zoom_level_delegate.h" -#include "atom/common/application_info.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/path_service.h" @@ -42,6 +27,21 @@ #include "content/public/browser/storage_partition.h" #include "net/base/escape.h" #include "services/network/public/cpp/features.h" +#include "shell/browser/atom_blob_reader.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_download_manager_delegate.h" +#include "shell/browser/atom_paths.h" +#include "shell/browser/atom_permission_manager.h" +#include "shell/browser/cookie_change_notifier.h" +#include "shell/browser/net/resolve_proxy_helper.h" +#include "shell/browser/pref_store_delegate.h" +#include "shell/browser/special_storage_policy.h" +#include "shell/browser/ui/inspectable_web_contents_impl.h" +#include "shell/browser/web_view_manager.h" +#include "shell/browser/zoom_level_delegate.h" +#include "shell/common/application_info.h" +#include "shell/common/options_switches.h" using content::BrowserThread; diff --git a/shell/browser/atom_browser_context.h b/shell/browser/atom_browser_context.h index 9376640850..76db20d83f 100644 --- a/shell/browser/atom_browser_context.h +++ b/shell/browser/atom_browser_context.h @@ -10,13 +10,13 @@ #include #include -#include "atom/browser/media/media_device_id_salt.h" -#include "atom/browser/net/url_request_context_getter.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/net/proxy_config_monitor.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/resource_context.h" +#include "shell/browser/media/media_device_id_salt.h" +#include "shell/browser/net/url_request_context_getter.h" class PrefRegistrySimple; class PrefService; diff --git a/shell/browser/atom_browser_main_parts.cc b/shell/browser/atom_browser_main_parts.cc index fb0ebc77c0..d92f130fe7 100644 --- a/shell/browser/atom_browser_main_parts.cc +++ b/shell/browser/atom_browser_main_parts.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_browser_main_parts.h" #include @@ -10,25 +10,6 @@ #include // for g_setenv() #endif -#include "atom/app/atom_main_delegate.h" -#include "atom/browser/api/atom_api_app.h" -#include "atom/browser/api/trackable_object.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/atom_paths.h" -#include "atom/browser/atom_web_ui_controller_factory.h" -#include "atom/browser/browser.h" -#include "atom/browser/browser_process_impl.h" -#include "atom/browser/feature_list.h" -#include "atom/browser/javascript_environment.h" -#include "atom/browser/media/media_capture_devices_dispatcher.h" -#include "atom/browser/node_debugger.h" -#include "atom/browser/ui/devtools_manager_delegate.h" -#include "atom/common/api/electron_bindings.h" -#include "atom/common/application_info.h" -#include "atom/common/asar/asar_util.h" -#include "atom/common/node_bindings.h" -#include "atom/common/node_includes.h" #include "base/base_switches.h" #include "base/command_line.h" #include "base/feature_list.h" @@ -49,6 +30,25 @@ #include "services/device/public/mojom/constants.mojom.h" #include "services/network/public/cpp/features.h" #include "services/service_manager/public/cpp/connector.h" +#include "shell/app/atom_main_delegate.h" +#include "shell/browser/api/atom_api_app.h" +#include "shell/browser/api/trackable_object.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/atom_paths.h" +#include "shell/browser/atom_web_ui_controller_factory.h" +#include "shell/browser/browser.h" +#include "shell/browser/browser_process_impl.h" +#include "shell/browser/feature_list.h" +#include "shell/browser/javascript_environment.h" +#include "shell/browser/media/media_capture_devices_dispatcher.h" +#include "shell/browser/node_debugger.h" +#include "shell/browser/ui/devtools_manager_delegate.h" +#include "shell/common/api/electron_bindings.h" +#include "shell/common/application_info.h" +#include "shell/common/asar/asar_util.h" +#include "shell/common/node_bindings.h" +#include "shell/common/node_includes.h" #include "ui/base/idle/idle.h" #include "ui/base/material_design/material_design_controller.h" #include "ui/base/ui_base_switches.h" @@ -82,9 +82,9 @@ #endif #if defined(OS_MACOSX) -#include "atom/browser/ui/cocoa/views_delegate_mac.h" +#include "shell/browser/ui/cocoa/views_delegate_mac.h" #else -#include "atom/browser/ui/views/atom_views_delegate.h" +#include "shell/browser/ui/views/atom_views_delegate.h" #endif #if defined(OS_LINUX) diff --git a/shell/browser/atom_browser_main_parts_mac.mm b/shell/browser/atom_browser_main_parts_mac.mm index 9b62751919..21bd991815 100644 --- a/shell/browser/atom_browser_main_parts_mac.mm +++ b/shell/browser/atom_browser_main_parts_mac.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_browser_main_parts.h" -#include "atom/browser/atom_paths.h" -#include "atom/browser/mac/atom_application_delegate.h" +#include "shell/browser/atom_paths.h" +#include "shell/browser/mac/atom_application_delegate.h" namespace atom { diff --git a/shell/browser/atom_browser_main_parts_posix.cc b/shell/browser/atom_browser_main_parts_posix.cc index f35ab6748e..183d556497 100644 --- a/shell/browser/atom_browser_main_parts_posix.cc +++ b/shell/browser/atom_browser_main_parts_posix.cc @@ -4,7 +4,7 @@ // Most code came from: chrome/browser/chrome_browser_main_posix.cc. -#include "atom/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_browser_main_parts.h" #include #include @@ -13,11 +13,11 @@ #include #include -#include "atom/browser/browser.h" #include "base/posix/eintr_wrapper.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#include "shell/browser/browser.h" using content::BrowserThread; diff --git a/shell/browser/atom_download_manager_delegate.cc b/shell/browser/atom_download_manager_delegate.cc index 0e23b978cb..cf50b6b021 100644 --- a/shell/browser/atom_download_manager_delegate.cc +++ b/shell/browser/atom_download_manager_delegate.cc @@ -2,18 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_download_manager_delegate.h" +#include "shell/browser/atom_download_manager_delegate.h" #include #include -#include "atom/browser/api/atom_api_download_item.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/native_window.h" -#include "atom/browser/ui/file_dialog.h" -#include "atom/browser/web_contents_preferences.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/options_switches.h" #include "base/bind.h" #include "base/files/file_util.h" #include "base/task/post_task.h" @@ -25,6 +18,13 @@ #include "content/public/browser/download_item_utils.h" #include "content/public/browser/download_manager.h" #include "net/base/filename_util.h" +#include "shell/browser/api/atom_api_download_item.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/native_window.h" +#include "shell/browser/ui/file_dialog.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/options_switches.h" namespace atom { diff --git a/shell/browser/atom_download_manager_delegate.h b/shell/browser/atom_download_manager_delegate.h index e8a86daadc..d9905ea8fb 100644 --- a/shell/browser/atom_download_manager_delegate.h +++ b/shell/browser/atom_download_manager_delegate.h @@ -7,9 +7,9 @@ #include -#include "atom/browser/ui/file_dialog.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/download_manager_delegate.h" +#include "shell/browser/ui/file_dialog.h" namespace content { class DownloadManager; diff --git a/shell/browser/atom_gpu_client.cc b/shell/browser/atom_gpu_client.cc index faa6bd9a38..28fba07f42 100644 --- a/shell/browser/atom_gpu_client.cc +++ b/shell/browser/atom_gpu_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_gpu_client.h" +#include "shell/browser/atom_gpu_client.h" #include "base/environment.h" diff --git a/shell/browser/atom_javascript_dialog_manager.cc b/shell/browser/atom_javascript_dialog_manager.cc index a0b1f3009d..1edba554b4 100644 --- a/shell/browser/atom_javascript_dialog_manager.cc +++ b/shell/browser/atom_javascript_dialog_manager.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_javascript_dialog_manager.h" +#include "shell/browser/atom_javascript_dialog_manager.h" #include #include #include -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/native_window.h" -#include "atom/browser/ui/message_box.h" -#include "atom/browser/web_contents_preferences.h" -#include "atom/common/options_switches.h" #include "base/bind.h" #include "base/strings/utf_string_conversions.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/native_window.h" +#include "shell/browser/ui/message_box.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/common/options_switches.h" #include "ui/gfx/image/image_skia.h" using content::JavaScriptDialogType; diff --git a/shell/browser/atom_navigation_throttle.cc b/shell/browser/atom_navigation_throttle.cc index 714bf32e4c..c3268210cd 100644 --- a/shell/browser/atom_navigation_throttle.cc +++ b/shell/browser/atom_navigation_throttle.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_navigation_throttle.h" +#include "shell/browser/atom_navigation_throttle.h" -#include "atom/browser/api/atom_api_web_contents.h" #include "content/public/browser/navigation_handle.h" +#include "shell/browser/api/atom_api_web_contents.h" namespace atom { diff --git a/shell/browser/atom_permission_manager.cc b/shell/browser/atom_permission_manager.cc index 7f83be377d..9e6f8ba03a 100644 --- a/shell/browser/atom_permission_manager.cc +++ b/shell/browser/atom_permission_manager.cc @@ -2,15 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_permission_manager.h" +#include "shell/browser/atom_permission_manager.h" #include #include #include -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/web_contents_preferences.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/permission_controller.h" #include "content/public/browser/permission_type.h" @@ -18,6 +15,9 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/web_contents_preferences.h" namespace atom { diff --git a/shell/browser/atom_quota_permission_context.cc b/shell/browser/atom_quota_permission_context.cc index b8bf9d53f5..81c0258597 100644 --- a/shell/browser/atom_quota_permission_context.cc +++ b/shell/browser/atom_quota_permission_context.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_quota_permission_context.h" +#include "shell/browser/atom_quota_permission_context.h" namespace atom { diff --git a/shell/browser/atom_speech_recognition_manager_delegate.cc b/shell/browser/atom_speech_recognition_manager_delegate.cc index ad74a469bc..7cf130537b 100644 --- a/shell/browser/atom_speech_recognition_manager_delegate.cc +++ b/shell/browser/atom_speech_recognition_manager_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_speech_recognition_manager_delegate.h" +#include "shell/browser/atom_speech_recognition_manager_delegate.h" #include #include diff --git a/shell/browser/atom_web_ui_controller_factory.cc b/shell/browser/atom_web_ui_controller_factory.cc index dab0176e43..b8255ee443 100644 --- a/shell/browser/atom_web_ui_controller_factory.cc +++ b/shell/browser/atom_web_ui_controller_factory.cc @@ -2,22 +2,22 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/atom_web_ui_controller_factory.h" +#include "shell/browser/atom_web_ui_controller_factory.h" #include #include "electron/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_PDF_VIEWER) -#include "atom/browser/ui/webui/pdf_viewer_ui.h" -#include "atom/common/atom_constants.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "net/base/escape.h" +#include "shell/browser/ui/webui/pdf_viewer_ui.h" +#include "shell/common/atom_constants.h" #endif // BUILDFLAG(ENABLE_PDF_VIEWER) -#include "atom/browser/ui/devtools_ui.h" #include "content/public/browser/web_contents.h" +#include "shell/browser/ui/devtools_ui.h" namespace atom { diff --git a/shell/browser/auto_updater.cc b/shell/browser/auto_updater.cc index 90ff157477..f1b4f4b68d 100644 --- a/shell/browser/auto_updater.cc +++ b/shell/browser/auto_updater.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/auto_updater.h" +#include "shell/browser/auto_updater.h" namespace auto_updater { diff --git a/shell/browser/auto_updater_mac.mm b/shell/browser/auto_updater_mac.mm index bd26e568fe..fa46614deb 100644 --- a/shell/browser/auto_updater_mac.mm +++ b/shell/browser/auto_updater_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/auto_updater.h" +#include "shell/browser/auto_updater.h" #include @@ -11,13 +11,13 @@ #import #import -#include "atom/browser/browser.h" -#include "atom/common/native_mate_converters/map_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "base/bind.h" #include "base/strings/sys_string_conversions.h" #include "base/time/time.h" #include "native_mate/dictionary.h" +#include "shell/browser/browser.h" +#include "shell/common/native_mate_converters/map_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" namespace auto_updater { diff --git a/shell/browser/browser.cc b/shell/browser/browser.cc index 8e5b304308..5473b4c6d1 100644 --- a/shell/browser/browser.cc +++ b/shell/browser/browser.cc @@ -2,19 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/browser.h" +#include "shell/browser/browser.h" #include #include #include -#include "atom/browser/atom_browser_main_parts.h" -#include "atom/browser/atom_paths.h" -#include "atom/browser/browser_observer.h" -#include "atom/browser/login_handler.h" -#include "atom/browser/native_window.h" -#include "atom/browser/window_list.h" -#include "atom/common/application_info.h" #include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/no_destructor.h" @@ -22,6 +15,13 @@ #include "base/run_loop.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "shell/browser/atom_browser_main_parts.h" +#include "shell/browser/atom_paths.h" +#include "shell/browser/browser_observer.h" +#include "shell/browser/login_handler.h" +#include "shell/browser/native_window.h" +#include "shell/browser/window_list.h" +#include "shell/common/application_info.h" namespace atom { diff --git a/shell/browser/browser.h b/shell/browser/browser.h index 9e1d78096a..7f30c8a283 100644 --- a/shell/browser/browser.h +++ b/shell/browser/browser.h @@ -9,15 +9,15 @@ #include #include -#include "atom/browser/browser_observer.h" -#include "atom/browser/window_list_observer.h" -#include "atom/common/promise_util.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" #include "base/strings/string16.h" #include "base/values.h" #include "native_mate/arguments.h" +#include "shell/browser/browser_observer.h" +#include "shell/browser/window_list_observer.h" +#include "shell/common/promise_util.h" #if defined(OS_WIN) #include diff --git a/shell/browser/browser_linux.cc b/shell/browser/browser_linux.cc index 935248d60d..cb2a1a3611 100644 --- a/shell/browser/browser_linux.cc +++ b/shell/browser/browser_linux.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/browser.h" +#include "shell/browser/browser.h" #include #include -#include "atom/browser/native_window.h" -#include "atom/browser/window_list.h" -#include "atom/common/application_info.h" #include "base/command_line.h" #include "base/environment.h" #include "base/process/launch.h" #include "electron/electron_version.h" +#include "shell/browser/native_window.h" +#include "shell/browser/window_list.h" +#include "shell/common/application_info.h" #if defined(USE_X11) #include "chrome/browser/ui/libgtkui/gtk_util.h" diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm index a8d1f8c727..708bbf4ee2 100644 --- a/shell/browser/browser_mac.mm +++ b/shell/browser/browser_mac.mm @@ -2,19 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/browser.h" +#include "shell/browser/browser.h" #include #include -#include "atom/browser/mac/atom_application.h" -#include "atom/browser/mac/atom_application_delegate.h" -#include "atom/browser/mac/dict_util.h" -#include "atom/browser/native_window.h" -#include "atom/browser/window_list.h" -#include "atom/common/application_info.h" -#include "atom/common/platform_util.h" -#include "atom/common/promise_util.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" @@ -22,6 +14,14 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" #include "net/base/mac/url_conversions.h" +#include "shell/browser/mac/atom_application.h" +#include "shell/browser/mac/atom_application_delegate.h" +#include "shell/browser/mac/dict_util.h" +#include "shell/browser/native_window.h" +#include "shell/browser/window_list.h" +#include "shell/common/application_info.h" +#include "shell/common/platform_util.h" +#include "shell/common/promise_util.h" #include "ui/gfx/image/image.h" #include "url/gurl.h" diff --git a/shell/browser/browser_observer.h b/shell/browser/browser_observer.h index 023d26f589..01bd23af70 100644 --- a/shell/browser/browser_observer.h +++ b/shell/browser/browser_observer.h @@ -7,10 +7,10 @@ #include -#include "atom/browser/login_handler.h" #include "base/memory/scoped_refptr.h" #include "base/observer_list_types.h" #include "build/build_config.h" +#include "shell/browser/login_handler.h" namespace base { class DictionaryValue; diff --git a/shell/browser/browser_process_impl.cc b/shell/browser/browser_process_impl.cc index e2cfa026eb..1d182f986a 100644 --- a/shell/browser/browser_process_impl.cc +++ b/shell/browser/browser_process_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "atom/browser/browser_process_impl.h" +#include "shell/browser/browser_process_impl.h" #include diff --git a/shell/browser/browser_process_impl.h b/shell/browser/browser_process_impl.h index 8bdde78ee8..64967d46d0 100644 --- a/shell/browser/browser_process_impl.h +++ b/shell/browser/browser_process_impl.h @@ -13,8 +13,6 @@ #include #include -#include "atom/browser/io_thread.h" -#include "atom/browser/net/system_network_context_manager.h" #include "base/command_line.h" #include "base/macros.h" #include "chrome/browser/browser_process.h" @@ -22,6 +20,8 @@ #include "components/prefs/value_map_pref_store.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/shared_url_loader_factory.h" +#include "shell/browser/io_thread.h" +#include "shell/browser/net/system_network_context_manager.h" namespace net_log { class ChromeNetLog; diff --git a/shell/browser/browser_win.cc b/shell/browser/browser_win.cc index 75903f2792..c39772b658 100644 --- a/shell/browser/browser_win.cc +++ b/shell/browser/browser_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/browser.h" +#include "shell/browser/browser.h" #include // windows.h must be included first @@ -10,9 +10,6 @@ #include #include -#include "atom/browser/ui/win/jump_list.h" -#include "atom/common/application_info.h" -#include "atom/common/native_mate_converters/string16_converter.h" #include "base/base_paths.h" #include "base/file_version_info.h" #include "base/files/file_path.h" @@ -25,6 +22,9 @@ #include "base/win/win_util.h" #include "base/win/windows_version.h" #include "electron/electron_version.h" +#include "shell/browser/ui/win/jump_list.h" +#include "shell/common/application_info.h" +#include "shell/common/native_mate_converters/string16_converter.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" namespace atom { diff --git a/shell/browser/child_web_contents_tracker.cc b/shell/browser/child_web_contents_tracker.cc index dd6c4b2a0e..70efe0147c 100644 --- a/shell/browser/child_web_contents_tracker.cc +++ b/shell/browser/child_web_contents_tracker.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/child_web_contents_tracker.h" +#include "shell/browser/child_web_contents_tracker.h" namespace atom { diff --git a/shell/browser/common_web_contents_delegate.cc b/shell/browser/common_web_contents_delegate.cc index 9cbc07cee5..45104cd260 100644 --- a/shell/browser/common_web_contents_delegate.cc +++ b/shell/browser/common_web_contents_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/common_web_contents_delegate.h" +#include "shell/browser/common_web_contents_delegate.h" #include #include @@ -10,14 +10,6 @@ #include #include -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/native_window.h" -#include "atom/browser/ui/file_dialog.h" -#include "atom/browser/web_contents_preferences.h" -#include "atom/browser/web_dialog_helper.h" -#include "atom/common/atom_constants.h" -#include "atom/common/options_switches.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/task/post_task.h" @@ -39,6 +31,14 @@ #include "content/public/browser/security_style_explanation.h" #include "content/public/browser/security_style_explanations.h" #include "printing/buildflags/buildflags.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/native_window.h" +#include "shell/browser/ui/file_dialog.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/browser/web_dialog_helper.h" +#include "shell/common/atom_constants.h" +#include "shell/common/options_switches.h" #include "storage/browser/fileapi/isolated_context.h" #if BUILDFLAG(ENABLE_COLOR_CHOOSER) @@ -46,13 +46,13 @@ #endif #if BUILDFLAG(ENABLE_OSR) -#include "atom/browser/osr/osr_web_contents_view.h" +#include "shell/browser/osr/osr_web_contents_view.h" #endif #if BUILDFLAG(ENABLE_PRINTING) -#include "atom/browser/printing/print_preview_message_handler.h" #include "chrome/browser/printing/print_view_manager_basic.h" #include "components/printing/browser/print_manager_utils.h" +#include "shell/browser/printing/print_preview_message_handler.h" #endif using content::BrowserThread; diff --git a/shell/browser/common_web_contents_delegate.h b/shell/browser/common_web_contents_delegate.h index a9ac315066..7347d1dbdf 100644 --- a/shell/browser/common_web_contents_delegate.h +++ b/shell/browser/common_web_contents_delegate.h @@ -10,16 +10,16 @@ #include #include -#include "atom/browser/ui/inspectable_web_contents_delegate.h" -#include "atom/browser/ui/inspectable_web_contents_impl.h" -#include "atom/browser/ui/inspectable_web_contents_view_delegate.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/devtools/devtools_file_system_indexer.h" #include "content/public/browser/web_contents_delegate.h" #include "electron/buildflags/buildflags.h" +#include "shell/browser/ui/inspectable_web_contents_delegate.h" +#include "shell/browser/ui/inspectable_web_contents_impl.h" +#include "shell/browser/ui/inspectable_web_contents_view_delegate.h" #if defined(TOOLKIT_VIEWS) -#include "atom/browser/ui/autofill_popup.h" +#include "shell/browser/ui/autofill_popup.h" #endif namespace base { diff --git a/shell/browser/common_web_contents_delegate_mac.mm b/shell/browser/common_web_contents_delegate_mac.mm index a1d7b3e5ed..075cebd733 100644 --- a/shell/browser/common_web_contents_delegate_mac.mm +++ b/shell/browser/common_web_contents_delegate_mac.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/common_web_contents_delegate.h" +#include "shell/browser/common_web_contents_delegate.h" #import -#include "atom/browser/ui/cocoa/event_dispatching_window.h" -#include "atom/browser/web_contents_preferences.h" #include "content/public/browser/native_web_keyboard_event.h" +#include "shell/browser/ui/cocoa/event_dispatching_window.h" +#include "shell/browser/web_contents_preferences.h" #include "ui/events/keycodes/keyboard_codes.h" @interface NSWindow (EventDispatchingWindow) diff --git a/shell/browser/common_web_contents_delegate_views.cc b/shell/browser/common_web_contents_delegate_views.cc index f416e3ee42..b8ad1c0d1e 100644 --- a/shell/browser/common_web_contents_delegate_views.cc +++ b/shell/browser/common_web_contents_delegate_views.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/common_web_contents_delegate.h" +#include "shell/browser/common_web_contents_delegate.h" -#include "atom/browser/api/atom_api_web_contents_view.h" -#include "atom/browser/native_window_views.h" -#include "atom/browser/web_contents_preferences.h" #include "base/strings/string_util.h" #include "content/public/browser/native_web_keyboard_event.h" +#include "shell/browser/api/atom_api_web_contents_view.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/web_contents_preferences.h" #include "ui/events/keycodes/keyboard_codes.h" #if defined(USE_X11) -#include "atom/browser/browser.h" +#include "shell/browser/browser.h" #endif namespace atom { diff --git a/shell/browser/cookie_change_notifier.cc b/shell/browser/cookie_change_notifier.cc index a0f99d2779..f1792dbb3e 100644 --- a/shell/browser/cookie_change_notifier.cc +++ b/shell/browser/cookie_change_notifier.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/cookie_change_notifier.h" +#include "shell/browser/cookie_change_notifier.h" #include -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/net/cookie_details.h" #include "base/bind.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "net/cookies/canonical_cookie.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/net/cookie_details.h" using content::BrowserThread; diff --git a/shell/browser/fake_location_provider.cc b/shell/browser/fake_location_provider.cc index 76536a949c..c4973f6b70 100644 --- a/shell/browser/fake_location_provider.cc +++ b/shell/browser/fake_location_provider.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/fake_location_provider.h" +#include "shell/browser/fake_location_provider.h" #include "base/callback.h" #include "base/time/time.h" diff --git a/shell/browser/feature_list.cc b/shell/browser/feature_list.cc index 35fb8699e0..14dfc8e242 100644 --- a/shell/browser/feature_list.cc +++ b/shell/browser/feature_list.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "electron/atom/browser/feature_list.h" +#include "electron/shell/browser/feature_list.h" #include diff --git a/shell/browser/font_defaults.cc b/shell/browser/font_defaults.cc index 0eb75a0c2b..bd0e73bfef 100644 --- a/shell/browser/font_defaults.cc +++ b/shell/browser/font_defaults.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/font_defaults.h" +#include "shell/browser/font_defaults.h" #include #include diff --git a/shell/browser/io_thread.cc b/shell/browser/io_thread.cc index 6595609158..7e3f2a7bb6 100644 --- a/shell/browser/io_thread.cc +++ b/shell/browser/io_thread.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/io_thread.h" +#include "shell/browser/io_thread.h" #include -#include "atom/browser/net/url_request_context_getter.h" #include "components/net_log/chrome_net_log.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_service_instance.h" @@ -19,6 +18,7 @@ #include "services/network/network_service.h" #include "services/network/public/cpp/features.h" #include "services/network/url_request_context_builder_mojo.h" +#include "shell/browser/net/url_request_context_getter.h" using content::BrowserThread; diff --git a/shell/browser/io_thread.h b/shell/browser/io_thread.h index 6b62ec103f..c5baca3e32 100644 --- a/shell/browser/io_thread.h +++ b/shell/browser/io_thread.h @@ -8,11 +8,11 @@ #include #include -#include "atom/browser/net/system_network_context_manager.h" #include "base/macros.h" #include "base/synchronization/lock.h" #include "content/public/browser/browser_thread_delegate.h" #include "services/network/public/mojom/network_service.mojom.h" +#include "shell/browser/net/system_network_context_manager.h" namespace atom { class URLRequestContextGetter; diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc index d6de7001b0..76e5abe450 100644 --- a/shell/browser/javascript_environment.cc +++ b/shell/browser/javascript_environment.cc @@ -2,12 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/javascript_environment.h" +#include "shell/browser/javascript_environment.h" #include -#include "atom/browser/microtasks_runner.h" -#include "atom/common/node_includes.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" #include "base/task/thread_pool/initialization_util.h" @@ -15,6 +13,8 @@ #include "content/public/common/content_switches.h" #include "gin/array_buffer.h" #include "gin/v8_initializer.h" +#include "shell/browser/microtasks_runner.h" +#include "shell/common/node_includes.h" #include "tracing/trace_event.h" namespace atom { diff --git a/shell/browser/lib/bluetooth_chooser.cc b/shell/browser/lib/bluetooth_chooser.cc index 827479226c..81af9a8307 100644 --- a/shell/browser/lib/bluetooth_chooser.cc +++ b/shell/browser/lib/bluetooth_chooser.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/lib/bluetooth_chooser.h" -#include "atom/common/native_mate_converters/once_callback.h" -#include "atom/common/native_mate_converters/string16_converter.h" +#include "shell/browser/lib/bluetooth_chooser.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/once_callback.h" +#include "shell/common/native_mate_converters/string16_converter.h" namespace mate { diff --git a/shell/browser/lib/bluetooth_chooser.h b/shell/browser/lib/bluetooth_chooser.h index e304caa589..50ce671624 100644 --- a/shell/browser/lib/bluetooth_chooser.h +++ b/shell/browser/lib/bluetooth_chooser.h @@ -9,8 +9,8 @@ #include #include -#include "atom/browser/api/atom_api_web_contents.h" #include "content/public/browser/bluetooth_chooser.h" +#include "shell/browser/api/atom_api_web_contents.h" namespace atom { diff --git a/shell/browser/lib/power_observer.h b/shell/browser/lib/power_observer.h index 0935b221e3..2409e1fc9b 100644 --- a/shell/browser/lib/power_observer.h +++ b/shell/browser/lib/power_observer.h @@ -8,7 +8,7 @@ #include "base/macros.h" #if defined(OS_LINUX) -#include "atom/browser/lib/power_observer_linux.h" +#include "shell/browser/lib/power_observer_linux.h" #else #include "base/power_monitor/power_observer.h" #endif // defined(OS_LINUX) diff --git a/shell/browser/lib/power_observer_linux.cc b/shell/browser/lib/power_observer_linux.cc index ddaa19c116..7273600c23 100644 --- a/shell/browser/lib/power_observer_linux.cc +++ b/shell/browser/lib/power_observer_linux.cc @@ -1,7 +1,7 @@ // Copyright (c) 2017 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/lib/power_observer_linux.h" +#include "shell/browser/lib/power_observer_linux.h" #include #include diff --git a/shell/browser/loader/layered_resource_handler.cc b/shell/browser/loader/layered_resource_handler.cc index 60dbcbccff..9dbfb71922 100644 --- a/shell/browser/loader/layered_resource_handler.cc +++ b/shell/browser/loader/layered_resource_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/loader/layered_resource_handler.h" +#include "shell/browser/loader/layered_resource_handler.h" #include #include diff --git a/shell/browser/login_handler.cc b/shell/browser/login_handler.cc index 25103cc528..8429d2987a 100644 --- a/shell/browser/login_handler.cc +++ b/shell/browser/login_handler.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/login_handler.h" +#include "shell/browser/login_handler.h" #include #include -#include "atom/browser/browser.h" -#include "atom/common/native_mate_converters/net_converter.h" #include "base/task/post_task.h" #include "base/values.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "net/base/auth.h" +#include "shell/browser/browser.h" +#include "shell/common/native_mate_converters/net_converter.h" using content::BrowserThread; diff --git a/shell/browser/mac/atom_application.mm b/shell/browser/mac/atom_application.mm index 4bcd4fc70d..3914c1ef64 100644 --- a/shell/browser/mac/atom_application.mm +++ b/shell/browser/mac/atom_application.mm @@ -2,21 +2,21 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#import "atom/browser/mac/atom_application.h" +#import "shell/browser/mac/atom_application.h" #include #include #include -#include "atom/browser/browser.h" -#import "atom/browser/mac/atom_application_delegate.h" -#include "atom/browser/mac/dict_util.h" #include "base/auto_reset.h" #include "base/observer_list.h" #include "base/strings/sys_string_conversions.h" #include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/native_event_processor_mac.h" #include "content/public/browser/native_event_processor_observer_mac.h" +#include "shell/browser/browser.h" +#import "shell/browser/mac/atom_application_delegate.h" +#include "shell/browser/mac/dict_util.h" namespace { diff --git a/shell/browser/mac/atom_application_delegate.h b/shell/browser/mac/atom_application_delegate.h index 835b63f830..5573dd734a 100644 --- a/shell/browser/mac/atom_application_delegate.h +++ b/shell/browser/mac/atom_application_delegate.h @@ -4,7 +4,7 @@ #import -#import "atom/browser/ui/cocoa/atom_menu_controller.h" +#import "shell/browser/ui/cocoa/atom_menu_controller.h" @interface AtomApplicationDelegate : NSObject { @private diff --git a/shell/browser/mac/atom_application_delegate.mm b/shell/browser/mac/atom_application_delegate.mm index 4cca2133f8..33a0d3feea 100644 --- a/shell/browser/mac/atom_application_delegate.mm +++ b/shell/browser/mac/atom_application_delegate.mm @@ -2,20 +2,20 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#import "atom/browser/mac/atom_application_delegate.h" +#import "shell/browser/mac/atom_application_delegate.h" #include #include -#include "atom/browser/browser.h" -#import "atom/browser/mac/atom_application.h" -#include "atom/browser/mac/dict_util.h" #include "base/allocator/allocator_shim.h" #include "base/allocator/buildflags.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_objc_class_swizzler.h" #include "base/strings/sys_string_conversions.h" #include "base/values.h" +#include "shell/browser/browser.h" +#import "shell/browser/mac/atom_application.h" +#include "shell/browser/mac/dict_util.h" #if BUILDFLAG(USE_ALLOCATOR_SHIM) // On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer, diff --git a/shell/browser/mac/dict_util.mm b/shell/browser/mac/dict_util.mm index 5803009864..9e6e1120d7 100644 --- a/shell/browser/mac/dict_util.mm +++ b/shell/browser/mac/dict_util.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/mac/dict_util.h" +#include "shell/browser/mac/dict_util.h" #include #include diff --git a/shell/browser/mac/in_app_purchase.mm b/shell/browser/mac/in_app_purchase.mm index 878cf8f551..77c8a5bcd4 100644 --- a/shell/browser/mac/in_app_purchase.mm +++ b/shell/browser/mac/in_app_purchase.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/mac/in_app_purchase.h" +#include "shell/browser/mac/in_app_purchase.h" #include #include diff --git a/shell/browser/mac/in_app_purchase_observer.mm b/shell/browser/mac/in_app_purchase_observer.mm index c109725dfd..ba46679349 100644 --- a/shell/browser/mac/in_app_purchase_observer.mm +++ b/shell/browser/mac/in_app_purchase_observer.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/mac/in_app_purchase_observer.h" +#include "shell/browser/mac/in_app_purchase_observer.h" #include diff --git a/shell/browser/mac/in_app_purchase_product.mm b/shell/browser/mac/in_app_purchase_product.mm index bb56d83401..355487a0f4 100644 --- a/shell/browser/mac/in_app_purchase_product.mm +++ b/shell/browser/mac/in_app_purchase_product.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/mac/in_app_purchase_product.h" +#include "shell/browser/mac/in_app_purchase_product.h" #include #include diff --git a/shell/browser/media/media_capture_devices_dispatcher.cc b/shell/browser/media/media_capture_devices_dispatcher.cc index 95dc3a6757..143cd7f7dc 100644 --- a/shell/browser/media/media_capture_devices_dispatcher.cc +++ b/shell/browser/media/media_capture_devices_dispatcher.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/media/media_capture_devices_dispatcher.h" +#include "shell/browser/media/media_capture_devices_dispatcher.h" #include "base/logging.h" #include "content/public/browser/browser_thread.h" diff --git a/shell/browser/media/media_device_id_salt.cc b/shell/browser/media/media_device_id_salt.cc index f7fb66d158..981ba40be2 100644 --- a/shell/browser/media/media_device_id_salt.cc +++ b/shell/browser/media/media_device_id_salt.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "atom/browser/media/media_device_id_salt.h" +#include "shell/browser/media/media_device_id_salt.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" diff --git a/shell/browser/media/media_stream_devices_controller.cc b/shell/browser/media/media_stream_devices_controller.cc index a5ab283b84..dcb74ad1df 100644 --- a/shell/browser/media/media_stream_devices_controller.cc +++ b/shell/browser/media/media_stream_devices_controller.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/media/media_stream_devices_controller.h" +#include "shell/browser/media/media_stream_devices_controller.h" #include #include -#include "atom/browser/media/media_capture_devices_dispatcher.h" #include "content/public/browser/desktop_media_id.h" #include "content/public/browser/media_stream_request.h" +#include "shell/browser/media/media_capture_devices_dispatcher.h" namespace atom { diff --git a/shell/browser/microtasks_runner.cc b/shell/browser/microtasks_runner.cc index 451eb8ff06..66f3b68658 100644 --- a/shell/browser/microtasks_runner.cc +++ b/shell/browser/microtasks_runner.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/microtasks_runner.h" +#include "shell/browser/microtasks_runner.h" #include "v8/include/v8.h" namespace atom { diff --git a/shell/browser/native_browser_view.cc b/shell/browser/native_browser_view.cc index c5d81e42b9..6c323d5f50 100644 --- a/shell/browser/native_browser_view.cc +++ b/shell/browser/native_browser_view.cc @@ -4,10 +4,10 @@ #include -#include "atom/browser/native_browser_view.h" +#include "shell/browser/native_browser_view.h" -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/ui/inspectable_web_contents.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/ui/inspectable_web_contents.h" namespace atom { diff --git a/shell/browser/native_browser_view_mac.h b/shell/browser/native_browser_view_mac.h index 7d16e2c334..bc93f9c59f 100644 --- a/shell/browser/native_browser_view_mac.h +++ b/shell/browser/native_browser_view_mac.h @@ -8,8 +8,8 @@ #import #include -#include "atom/browser/native_browser_view.h" #include "base/mac/scoped_nsobject.h" +#include "shell/browser/native_browser_view.h" namespace atom { diff --git a/shell/browser/native_browser_view_mac.mm b/shell/browser/native_browser_view_mac.mm index e9db5ab830..5528d723ae 100644 --- a/shell/browser/native_browser_view_mac.mm +++ b/shell/browser/native_browser_view_mac.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/native_browser_view_mac.h" +#include "shell/browser/native_browser_view_mac.h" #include -#include "atom/browser/ui/inspectable_web_contents.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" +#include "shell/browser/ui/inspectable_web_contents.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" #include "skia/ext/skia_utils_mac.h" #include "ui/gfx/geometry/rect.h" diff --git a/shell/browser/native_browser_view_views.cc b/shell/browser/native_browser_view_views.cc index 2ee325ad39..b54b957d77 100644 --- a/shell/browser/native_browser_view_views.cc +++ b/shell/browser/native_browser_view_views.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/native_browser_view_views.h" +#include "shell/browser/native_browser_view_views.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/background.h" #include "ui/views/view.h" diff --git a/shell/browser/native_browser_view_views.h b/shell/browser/native_browser_view_views.h index 65b2f9aff9..6f02ff2ddf 100644 --- a/shell/browser/native_browser_view_views.h +++ b/shell/browser/native_browser_view_views.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_ #define ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_ -#include "atom/browser/native_browser_view.h" +#include "shell/browser/native_browser_view.h" namespace atom { diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc index 88228a1753..0df60167bd 100644 --- a/shell/browser/native_window.cc +++ b/shell/browser/native_window.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/native_window.h" +#include "shell/browser/native_window.h" #include #include #include #include -#include "atom/browser/browser.h" -#include "atom/browser/window_list.h" -#include "atom/common/color_util.h" -#include "atom/common/options_switches.h" #include "native_mate/dictionary.h" +#include "shell/browser/browser.h" +#include "shell/browser/window_list.h" +#include "shell/common/color_util.h" +#include "shell/common/options_switches.h" #include "ui/views/widget/widget.h" #if defined(OS_WIN) diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h index e609de8537..53b3c80ae6 100644 --- a/shell/browser/native_window.h +++ b/shell/browser/native_window.h @@ -12,12 +12,12 @@ #include #include -#include "atom/browser/native_window_observer.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/supports_user_data.h" #include "content/public/browser/web_contents_user_data.h" #include "extensions/browser/app_window/size_constraints.h" +#include "shell/browser/native_window_observer.h" #include "ui/views/widget/widget_delegate.h" class SkRegion; diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h index bb98fa1da2..cc9dddb3b6 100644 --- a/shell/browser/native_window_mac.h +++ b/shell/browser/native_window_mac.h @@ -12,8 +12,8 @@ #include #include -#include "atom/browser/native_window.h" #include "base/mac/scoped_nsobject.h" +#include "shell/browser/native_window.h" #include "ui/views/controls/native/native_view_host.h" @class AtomNSWindow; diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm index daa8d6345b..5a8198b395 100644 --- a/shell/browser/native_window_mac.mm +++ b/shell/browser/native_window_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/native_window_mac.h" +#include "shell/browser/native_window_mac.h" #include #include @@ -10,23 +10,23 @@ #include #include -#include "atom/browser/native_browser_view_mac.h" -#include "atom/browser/ui/cocoa/atom_native_widget_mac.h" -#include "atom/browser/ui/cocoa/atom_ns_window.h" -#include "atom/browser/ui/cocoa/atom_ns_window_delegate.h" -#include "atom/browser/ui/cocoa/atom_preview_item.h" -#include "atom/browser/ui/cocoa/atom_touch_bar.h" -#include "atom/browser/ui/cocoa/root_view_mac.h" -#include "atom/browser/ui/inspectable_web_contents.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" -#include "atom/browser/window_list.h" -#include "atom/common/options_switches.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/strings/sys_string_conversions.h" #include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h" #include "content/public/browser/browser_accessibility_state.h" #include "native_mate/dictionary.h" +#include "shell/browser/native_browser_view_mac.h" +#include "shell/browser/ui/cocoa/atom_native_widget_mac.h" +#include "shell/browser/ui/cocoa/atom_ns_window.h" +#include "shell/browser/ui/cocoa/atom_ns_window_delegate.h" +#include "shell/browser/ui/cocoa/atom_preview_item.h" +#include "shell/browser/ui/cocoa/atom_touch_bar.h" +#include "shell/browser/ui/cocoa/root_view_mac.h" +#include "shell/browser/ui/inspectable_web_contents.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" +#include "shell/browser/window_list.h" +#include "shell/common/options_switches.h" #include "skia/ext/skia_utils_mac.h" #include "ui/gfx/skia_util.h" #include "ui/gl/gpu_switching_manager.h" diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc index 0ec744fc62..005c699cd3 100644 --- a/shell/browser/native_window_views.cc +++ b/shell/browser/native_window_views.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" #if defined(OS_WIN) #include @@ -13,20 +13,20 @@ #include #include -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/native_browser_view_views.h" -#include "atom/browser/ui/inspectable_web_contents.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" -#include "atom/browser/ui/views/root_view.h" -#include "atom/browser/web_contents_preferences.h" -#include "atom/browser/web_view_manager.h" -#include "atom/browser/window_list.h" -#include "atom/common/atom_constants.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/options_switches.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/native_browser_view_views.h" +#include "shell/browser/ui/inspectable_web_contents.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" +#include "shell/browser/ui/views/root_view.h" +#include "shell/browser/web_contents_preferences.h" +#include "shell/browser/web_view_manager.h" +#include "shell/browser/window_list.h" +#include "shell/common/atom_constants.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/options_switches.h" #include "ui/aura/window_tree_host.h" #include "ui/base/hit_test.h" #include "ui/gfx/image/image.h" @@ -41,22 +41,22 @@ #include "ui/wm/core/window_util.h" #if defined(USE_X11) -#include "atom/browser/browser.h" -#include "atom/browser/ui/views/frameless_view.h" -#include "atom/browser/ui/views/global_menu_bar_x11.h" -#include "atom/browser/ui/views/native_frame_view.h" -#include "atom/browser/ui/x/event_disabler.h" -#include "atom/browser/ui/x/window_state_watcher.h" -#include "atom/browser/ui/x/x_window_utils.h" #include "base/strings/string_util.h" #include "chrome/browser/ui/libgtkui/unity_service.h" +#include "shell/browser/browser.h" +#include "shell/browser/ui/views/frameless_view.h" +#include "shell/browser/ui/views/global_menu_bar_x11.h" +#include "shell/browser/ui/views/native_frame_view.h" +#include "shell/browser/ui/x/event_disabler.h" +#include "shell/browser/ui/x/window_state_watcher.h" +#include "shell/browser/ui/x/x_window_utils.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/x/x11_types.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #include "ui/views/window/native_frame_view.h" #elif defined(OS_WIN) -#include "atom/browser/ui/views/win_frame_view.h" -#include "atom/browser/ui/win/atom_desktop_native_widget_aura.h" +#include "shell/browser/ui/views/win_frame_view.h" +#include "shell/browser/ui/win/atom_desktop_native_widget_aura.h" #include "skia/ext/skia_utils_win.h" #include "ui/base/win/shell.h" #include "ui/display/screen.h" diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h index 353a6f230d..f2de967a52 100644 --- a/shell/browser/native_window_views.h +++ b/shell/browser/native_window_views.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_ #define ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_ -#include "atom/browser/native_window.h" +#include "shell/browser/native_window.h" #include #include @@ -15,8 +15,8 @@ #include "ui/views/widget/widget_observer.h" #if defined(OS_WIN) -#include "atom/browser/ui/win/taskbar_host.h" #include "base/win/scoped_gdi_object.h" +#include "shell/browser/ui/win/taskbar_host.h" #endif namespace views { diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc index d6fd2ae581..28d7d3c0a2 100644 --- a/shell/browser/native_window_views_win.cc +++ b/shell/browser/native_window_views_win.cc @@ -5,11 +5,11 @@ #include #include -#include "atom/browser/browser.h" -#include "atom/browser/native_window_views.h" -#include "atom/browser/ui/views/root_view.h" -#include "atom/common/atom_constants.h" #include "content/public/browser/browser_accessibility_state.h" +#include "shell/browser/browser.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/ui/views/root_view.h" +#include "shell/common/atom_constants.h" #include "ui/base/win/accessibility_misc_utils.h" #include "ui/display/display.h" #include "ui/display/win/screen_win.h" diff --git a/shell/browser/net/about_protocol_handler.cc b/shell/browser/net/about_protocol_handler.cc index 12ce78ae28..712b57c271 100644 --- a/shell/browser/net/about_protocol_handler.cc +++ b/shell/browser/net/about_protocol_handler.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/about_protocol_handler.h" +#include "shell/browser/net/about_protocol_handler.h" -#include "atom/browser/net/url_request_about_job.h" +#include "shell/browser/net/url_request_about_job.h" namespace atom { diff --git a/shell/browser/net/asar/asar_protocol_handler.cc b/shell/browser/net/asar/asar_protocol_handler.cc index 8ff9b475ae..c37be5a388 100644 --- a/shell/browser/net/asar/asar_protocol_handler.cc +++ b/shell/browser/net/asar/asar_protocol_handler.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/asar/asar_protocol_handler.h" +#include "shell/browser/net/asar/asar_protocol_handler.h" -#include "atom/browser/net/asar/url_request_asar_job.h" #include "base/task_runner.h" #include "net/base/filename_util.h" #include "net/base/net_errors.h" +#include "shell/browser/net/asar/url_request_asar_job.h" namespace asar { diff --git a/shell/browser/net/asar/asar_url_loader.cc b/shell/browser/net/asar/asar_url_loader.cc index 9dba6becdd..309fa646d4 100644 --- a/shell/browser/net/asar/asar_url_loader.cc +++ b/shell/browser/net/asar/asar_url_loader.cc @@ -2,15 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/asar/asar_url_loader.h" +#include "shell/browser/net/asar/asar_url_loader.h" #include #include #include #include -#include "atom/common/asar/archive.h" -#include "atom/common/asar/asar_util.h" #include "base/strings/stringprintf.h" #include "base/task/post_task.h" #include "content/public/browser/file_url_loader.h" @@ -20,6 +18,8 @@ #include "net/base/mime_util.h" #include "net/http/http_byte_range.h" #include "net/http/http_util.h" +#include "shell/common/asar/archive.h" +#include "shell/common/asar/asar_util.h" namespace asar { diff --git a/shell/browser/net/asar/url_request_asar_job.cc b/shell/browser/net/asar/url_request_asar_job.cc index 2f6c289235..a2e5556b69 100644 --- a/shell/browser/net/asar/url_request_asar_job.cc +++ b/shell/browser/net/asar/url_request_asar_job.cc @@ -2,15 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/asar/url_request_asar_job.h" +#include "shell/browser/net/asar/url_request_asar_job.h" #include #include #include -#include "atom/common/asar/archive.h" -#include "atom/common/asar/asar_util.h" -#include "atom/common/atom_constants.h" #include "base/bind.h" #include "base/files/file_util.h" #include "base/strings/string_util.h" @@ -26,6 +23,9 @@ #include "net/filter/gzip_source_stream.h" #include "net/http/http_util.h" #include "net/url_request/url_request_status.h" +#include "shell/common/asar/archive.h" +#include "shell/common/asar/asar_util.h" +#include "shell/common/atom_constants.h" #if defined(OS_WIN) #include "base/win/shortcut.h" diff --git a/shell/browser/net/asar/url_request_asar_job.h b/shell/browser/net/asar/url_request_asar_job.h index 131d72eda7..c73ee68ac2 100644 --- a/shell/browser/net/asar/url_request_asar_job.h +++ b/shell/browser/net/asar/url_request_asar_job.h @@ -8,13 +8,13 @@ #include #include -#include "atom/browser/net/js_asker.h" -#include "atom/common/asar/archive.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "net/http/http_byte_range.h" #include "net/url_request/url_request_job.h" +#include "shell/browser/net/js_asker.h" +#include "shell/common/asar/archive.h" namespace base { class TaskRunner; diff --git a/shell/browser/net/atom_cert_verifier.cc b/shell/browser/net/atom_cert_verifier.cc index 299f2ac0a8..5a5d5232fe 100644 --- a/shell/browser/net/atom_cert_verifier.cc +++ b/shell/browser/net/atom_cert_verifier.cc @@ -2,13 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/atom_cert_verifier.h" +#include "shell/browser/net/atom_cert_verifier.h" #include -#include "atom/browser/browser.h" -#include "atom/browser/net/require_ct_delegate.h" -#include "atom/common/native_mate_converters/net_converter.h" #include "base/containers/linked_list.h" #include "base/memory/weak_ptr.h" #include "base/task/post_task.h" @@ -17,6 +14,9 @@ #include "net/base/net_errors.h" #include "net/cert/cert_verify_result.h" #include "net/cert/x509_certificate.h" +#include "shell/browser/browser.h" +#include "shell/browser/net/require_ct_delegate.h" +#include "shell/common/native_mate_converters/net_converter.h" using content::BrowserThread; diff --git a/shell/browser/net/atom_network_delegate.cc b/shell/browser/net/atom_network_delegate.cc index 945832e42a..0c00ada9b2 100644 --- a/shell/browser/net/atom_network_delegate.cc +++ b/shell/browser/net/atom_network_delegate.cc @@ -2,15 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/atom_network_delegate.h" +#include "shell/browser/net/atom_network_delegate.h" #include #include -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/login_handler.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/stl_util.h" #include "base/strings/string_util.h" @@ -22,6 +18,10 @@ #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/login_handler.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/options_switches.h" using content::BrowserThread; diff --git a/shell/browser/net/atom_url_loader_factory.cc b/shell/browser/net/atom_url_loader_factory.cc index 331b82914c..266d241f85 100644 --- a/shell/browser/net/atom_url_loader_factory.cc +++ b/shell/browser/net/atom_url_loader_factory.cc @@ -2,22 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/atom_url_loader_factory.h" +#include "shell/browser/net/atom_url_loader_factory.h" #include #include #include -#include "atom/browser/api/atom_api_session.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/net/asar/asar_url_loader.h" -#include "atom/browser/net/node_stream_loader.h" -#include "atom/browser/net/url_pipe_loader.h" -#include "atom/common/atom_constants.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "base/guid.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" @@ -26,8 +16,18 @@ #include "net/http/http_status_code.h" #include "services/network/public/cpp/url_loader_completion_status.h" #include "services/network/public/mojom/url_loader_factory.mojom.h" +#include "shell/browser/api/atom_api_session.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/net/asar/asar_url_loader.h" +#include "shell/browser/net/node_stream_loader.h" +#include "shell/browser/net/url_pipe_loader.h" +#include "shell/common/atom_constants.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" +#include "shell/common/node_includes.h" using content::BrowserThread; diff --git a/shell/browser/net/atom_url_request.cc b/shell/browser/net/atom_url_request.cc index 8152b70960..4a63b0e845 100644 --- a/shell/browser/net/atom_url_request.cc +++ b/shell/browser/net/atom_url_request.cc @@ -3,15 +3,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/atom_url_request.h" +#include "shell/browser/net/atom_url_request.h" #include #include #include -#include "atom/browser/api/atom_api_url_request.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/net/atom_url_request_job_factory.h" #include "base/callback.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" @@ -21,6 +18,9 @@ #include "net/base/load_flags.h" #include "net/base/upload_bytes_element_reader.h" #include "net/url_request/redirect_info.h" +#include "shell/browser/api/atom_api_url_request.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/net/atom_url_request_job_factory.h" namespace { const int kBufferSize = 4096; diff --git a/shell/browser/net/atom_url_request.h b/shell/browser/net/atom_url_request.h index dbf8ec330a..2ae4b808d9 100644 --- a/shell/browser/net/atom_url_request.h +++ b/shell/browser/net/atom_url_request.h @@ -10,8 +10,6 @@ #include #include -#include "atom/browser/api/atom_api_url_request.h" -#include "atom/browser/atom_browser_context.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "net/base/auth.h" @@ -21,6 +19,8 @@ #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context_getter_observer.h" +#include "shell/browser/api/atom_api_url_request.h" +#include "shell/browser/atom_browser_context.h" namespace atom { diff --git a/shell/browser/net/atom_url_request_job_factory.cc b/shell/browser/net/atom_url_request_job_factory.cc index fd4f3a8377..b906cb3438 100644 --- a/shell/browser/net/atom_url_request_job_factory.cc +++ b/shell/browser/net/atom_url_request_job_factory.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/atom_url_request_job_factory.h" +#include "shell/browser/net/atom_url_request_job_factory.h" #include diff --git a/shell/browser/net/http_protocol_handler.cc b/shell/browser/net/http_protocol_handler.cc index 7c5cc365b7..3e86261dca 100644 --- a/shell/browser/net/http_protocol_handler.cc +++ b/shell/browser/net/http_protocol_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/http_protocol_handler.h" +#include "shell/browser/net/http_protocol_handler.h" #include "net/url_request/url_request_http_job.h" diff --git a/shell/browser/net/js_asker.cc b/shell/browser/net/js_asker.cc index 808aa789bf..4f1647517e 100644 --- a/shell/browser/net/js_asker.cc +++ b/shell/browser/net/js_asker.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/js_asker.h" +#include "shell/browser/net/js_asker.h" #include -#include "atom/common/native_mate_converters/once_callback.h" #include "content/public/browser/browser_thread.h" +#include "shell/common/native_mate_converters/once_callback.h" namespace atom { diff --git a/shell/browser/net/network_context_service.cc b/shell/browser/net/network_context_service.cc index d4d4d80e15..0c1a3598af 100644 --- a/shell/browser/net/network_context_service.cc +++ b/shell/browser/net/network_context_service.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/network_context_service.h" +#include "shell/browser/net/network_context_service.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/browser_process_impl.h" -#include "atom/browser/net/system_network_context_manager.h" #include "chrome/common/chrome_constants.h" #include "content/public/browser/network_service_instance.h" #include "services/network/network_service.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/browser_process_impl.h" +#include "shell/browser/net/system_network_context_manager.h" namespace atom { diff --git a/shell/browser/net/network_context_service.h b/shell/browser/net/network_context_service.h index 6dd2c4922b..304d047c45 100644 --- a/shell/browser/net/network_context_service.h +++ b/shell/browser/net/network_context_service.h @@ -5,11 +5,11 @@ #ifndef ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_ #define ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_ -#include "atom/browser/atom_browser_context.h" #include "base/files/file_path.h" #include "chrome/browser/net/proxy_config_monitor.h" #include "components/keyed_service/core/keyed_service.h" #include "services/network/public/mojom/network_context.mojom.h" +#include "shell/browser/atom_browser_context.h" namespace atom { diff --git a/shell/browser/net/network_context_service_factory.cc b/shell/browser/net/network_context_service_factory.cc index 0bdc0ef6a5..4ee9c0ea53 100644 --- a/shell/browser/net/network_context_service_factory.cc +++ b/shell/browser/net/network_context_service_factory.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/network_context_service_factory.h" +#include "shell/browser/net/network_context_service_factory.h" -#include "atom/browser/net/network_context_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "shell/browser/net/network_context_service.h" namespace atom { diff --git a/shell/browser/net/node_stream_loader.cc b/shell/browser/net/node_stream_loader.cc index 67552e0237..ec056f59c0 100644 --- a/shell/browser/net/node_stream_loader.cc +++ b/shell/browser/net/node_stream_loader.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/node_stream_loader.h" +#include "shell/browser/net/node_stream_loader.h" #include -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/native_mate_converters/callback.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/native_mate_converters/callback.h" -#include "atom/common/node_includes.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc index 4bb5480fc7..43e01a117f 100644 --- a/shell/browser/net/proxying_url_loader_factory.cc +++ b/shell/browser/net/proxying_url_loader_factory.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/proxying_url_loader_factory.h" +#include "shell/browser/net/proxying_url_loader_factory.h" #include -#include "atom/browser/net/asar/asar_url_loader.h" #include "mojo/public/cpp/bindings/binding.h" #include "services/network/public/mojom/url_loader.mojom.h" +#include "shell/browser/net/asar/asar_url_loader.h" namespace atom { diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h index 6b662935fc..c311d09ec1 100644 --- a/shell/browser/net/proxying_url_loader_factory.h +++ b/shell/browser/net/proxying_url_loader_factory.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_ #define ATOM_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_ -#include "atom/browser/net/atom_url_loader_factory.h" +#include "shell/browser/net/atom_url_loader_factory.h" namespace atom { diff --git a/shell/browser/net/require_ct_delegate.cc b/shell/browser/net/require_ct_delegate.cc index 1cca0decda..c09defbbe4 100644 --- a/shell/browser/net/require_ct_delegate.cc +++ b/shell/browser/net/require_ct_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/require_ct_delegate.h" +#include "shell/browser/net/require_ct_delegate.h" #include "content/public/browser/browser_thread.h" diff --git a/shell/browser/net/resolve_proxy_helper.cc b/shell/browser/net/resolve_proxy_helper.cc index d8d9c7db56..3df1abcdce 100644 --- a/shell/browser/net/resolve_proxy_helper.cc +++ b/shell/browser/net/resolve_proxy_helper.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/resolve_proxy_helper.h" +#include "shell/browser/net/resolve_proxy_helper.h" #include -#include "atom/browser/atom_browser_context.h" #include "base/bind.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "net/proxy_resolution/proxy_info.h" #include "services/network/public/mojom/network_context.mojom.h" +#include "shell/browser/atom_browser_context.h" using content::BrowserThread; diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc index becd339dc6..394de07cb6 100644 --- a/shell/browser/net/system_network_context_manager.cc +++ b/shell/browser/net/system_network_context_manager.cc @@ -2,15 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/system_network_context_manager.h" +#include "shell/browser/net/system_network_context_manager.h" #include #include -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/io_thread.h" -#include "atom/common/application_info.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h" @@ -25,6 +21,10 @@ #include "services/network/public/cpp/cross_thread_shared_url_loader_factory_info.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/shared_url_loader_factory.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/io_thread.h" +#include "shell/common/application_info.h" +#include "shell/common/options_switches.h" #include "url/gurl.h" namespace { diff --git a/shell/browser/net/url_pipe_loader.cc b/shell/browser/net/url_pipe_loader.cc index c3f0f3f367..ffac1923ed 100644 --- a/shell/browser/net/url_pipe_loader.cc +++ b/shell/browser/net/url_pipe_loader.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_pipe_loader.h" +#include "shell/browser/net/url_pipe_loader.h" #include diff --git a/shell/browser/net/url_request_about_job.cc b/shell/browser/net/url_request_about_job.cc index 36cde08267..a556fa2eab 100644 --- a/shell/browser/net/url_request_about_job.cc +++ b/shell/browser/net/url_request_about_job.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_request_about_job.h" +#include "shell/browser/net/url_request_about_job.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/shell/browser/net/url_request_async_asar_job.cc b/shell/browser/net/url_request_async_asar_job.cc index 80b8559dde..a99db5538a 100644 --- a/shell/browser/net/url_request_async_asar_job.cc +++ b/shell/browser/net/url_request_async_asar_job.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_request_async_asar_job.h" +#include "shell/browser/net/url_request_async_asar_job.h" #include #include #include -#include "atom/common/atom_constants.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/v8_value_converter.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#include "shell/common/atom_constants.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/v8_value_converter.h" namespace atom { diff --git a/shell/browser/net/url_request_async_asar_job.h b/shell/browser/net/url_request_async_asar_job.h index 9c9cbb69cb..bc4dda13c6 100644 --- a/shell/browser/net/url_request_async_asar_job.h +++ b/shell/browser/net/url_request_async_asar_job.h @@ -7,8 +7,8 @@ #include -#include "atom/browser/net/asar/url_request_asar_job.h" -#include "atom/browser/net/js_asker.h" +#include "shell/browser/net/asar/url_request_asar_job.h" +#include "shell/browser/net/js_asker.h" namespace atom { diff --git a/shell/browser/net/url_request_buffer_job.cc b/shell/browser/net/url_request_buffer_job.cc index def955e5cc..a5973b16c1 100644 --- a/shell/browser/net/url_request_buffer_job.cc +++ b/shell/browser/net/url_request_buffer_job.cc @@ -2,15 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_request_buffer_job.h" +#include "shell/browser/net/url_request_buffer_job.h" #include #include #include -#include "atom/common/atom_constants.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/v8_value_converter.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" @@ -18,6 +15,9 @@ #include "content/public/browser/browser_thread.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" +#include "shell/common/atom_constants.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/v8_value_converter.h" namespace atom { diff --git a/shell/browser/net/url_request_buffer_job.h b/shell/browser/net/url_request_buffer_job.h index afebdcf888..99a83e7802 100644 --- a/shell/browser/net/url_request_buffer_job.h +++ b/shell/browser/net/url_request_buffer_job.h @@ -8,10 +8,10 @@ #include #include -#include "atom/browser/net/js_asker.h" #include "base/memory/ref_counted_memory.h" #include "net/http/http_status_code.h" #include "net/url_request/url_request_simple_job.h" +#include "shell/browser/net/js_asker.h" namespace atom { diff --git a/shell/browser/net/url_request_context_getter.cc b/shell/browser/net/url_request_context_getter.cc index 29e94cba60..cd18a8bf27 100644 --- a/shell/browser/net/url_request_context_getter.cc +++ b/shell/browser/net/url_request_context_getter.cc @@ -2,24 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_request_context_getter.h" +#include "shell/browser/net/url_request_context_getter.h" #include #include #include -#include "atom/browser/api/atom_api_protocol.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/browser_process_impl.h" -#include "atom/browser/net/about_protocol_handler.h" -#include "atom/browser/net/asar/asar_protocol_handler.h" -#include "atom/browser/net/atom_cert_verifier.h" -#include "atom/browser/net/atom_network_delegate.h" -#include "atom/browser/net/atom_url_request_job_factory.h" -#include "atom/browser/net/http_protocol_handler.h" -#include "atom/browser/net/require_ct_delegate.h" -#include "atom/browser/net/system_network_context_manager.h" #include "base/command_line.h" #include "base/strings/string_util.h" #include "base/task/post_task.h" @@ -50,6 +38,18 @@ #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" #include "services/network/url_request_context_builder_mojo.h" +#include "shell/browser/api/atom_api_protocol.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/browser_process_impl.h" +#include "shell/browser/net/about_protocol_handler.h" +#include "shell/browser/net/asar/asar_protocol_handler.h" +#include "shell/browser/net/atom_cert_verifier.h" +#include "shell/browser/net/atom_network_delegate.h" +#include "shell/browser/net/atom_url_request_job_factory.h" +#include "shell/browser/net/http_protocol_handler.h" +#include "shell/browser/net/require_ct_delegate.h" +#include "shell/browser/net/system_network_context_manager.h" #include "url/url_constants.h" #if !BUILDFLAG(DISABLE_FTP_SUPPORT) diff --git a/shell/browser/net/url_request_fetch_job.cc b/shell/browser/net/url_request_fetch_job.cc index 9806eef46a..822855b054 100644 --- a/shell/browser/net/url_request_fetch_job.cc +++ b/shell/browser/net/url_request_fetch_job.cc @@ -2,17 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_request_fetch_job.h" +#include "shell/browser/net/url_request_fetch_job.h" #include #include #include #include -#include "atom/browser/api/atom_api_session.h" -#include "atom/browser/atom_browser_context.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/v8_value_converter.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" @@ -25,6 +21,10 @@ #include "net/http/http_response_headers.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_response_writer.h" +#include "shell/browser/api/atom_api_session.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/v8_value_converter.h" using content::BrowserThread; diff --git a/shell/browser/net/url_request_fetch_job.h b/shell/browser/net/url_request_fetch_job.h index cbeb6ed322..8879f33ba6 100644 --- a/shell/browser/net/url_request_fetch_job.h +++ b/shell/browser/net/url_request_fetch_job.h @@ -8,11 +8,11 @@ #include #include -#include "atom/browser/net/js_asker.h" #include "base/memory/weak_ptr.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_job.h" +#include "shell/browser/net/js_asker.h" namespace atom { diff --git a/shell/browser/net/url_request_stream_job.cc b/shell/browser/net/url_request_stream_job.cc index 86112a31ee..c47cf0b9a6 100644 --- a/shell/browser/net/url_request_stream_job.cc +++ b/shell/browser/net/url_request_stream_job.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_request_stream_job.h" +#include "shell/browser/net/url_request_stream_job.h" #include #include @@ -10,10 +10,6 @@ #include #include -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/atom_constants.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/node_includes.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/task/post_task.h" @@ -23,6 +19,10 @@ #include "native_mate/dictionary.h" #include "net/base/net_errors.h" #include "net/filter/gzip_source_stream.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/atom_constants.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/net/url_request_stream_job.h b/shell/browser/net/url_request_stream_job.h index 950fd9ce22..b82b1442f9 100644 --- a/shell/browser/net/url_request_stream_job.h +++ b/shell/browser/net/url_request_stream_job.h @@ -9,12 +9,12 @@ #include #include -#include "atom/browser/api/stream_subscriber.h" -#include "atom/browser/net/js_asker.h" #include "base/memory/scoped_refptr.h" #include "net/base/io_buffer.h" #include "net/http/http_status_code.h" #include "net/url_request/url_request_job.h" +#include "shell/browser/api/stream_subscriber.h" +#include "shell/browser/net/js_asker.h" namespace atom { diff --git a/shell/browser/net/url_request_string_job.cc b/shell/browser/net/url_request_string_job.cc index e22b901b44..17478df6d0 100644 --- a/shell/browser/net/url_request_string_job.cc +++ b/shell/browser/net/url_request_string_job.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/net/url_request_string_job.h" +#include "shell/browser/net/url_request_string_job.h" #include #include #include -#include "atom/common/atom_constants.h" -#include "atom/common/native_mate_converters/net_converter.h" -#include "atom/common/native_mate_converters/v8_value_converter.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h" +#include "shell/common/atom_constants.h" +#include "shell/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/v8_value_converter.h" namespace atom { diff --git a/shell/browser/net/url_request_string_job.h b/shell/browser/net/url_request_string_job.h index 48bc9c3fa7..3aab55e8d6 100644 --- a/shell/browser/net/url_request_string_job.h +++ b/shell/browser/net/url_request_string_job.h @@ -8,8 +8,8 @@ #include #include -#include "atom/browser/net/js_asker.h" #include "net/url_request/url_request_simple_job.h" +#include "shell/browser/net/js_asker.h" namespace atom { diff --git a/shell/browser/node_debugger.cc b/shell/browser/node_debugger.cc index 71a0614049..9569bb90fc 100644 --- a/shell/browser/node_debugger.cc +++ b/shell/browser/node_debugger.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/node_debugger.h" +#include "shell/browser/node_debugger.h" #include #include #include -#include "atom/common/node_includes.h" #include "base/command_line.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "libplatform/libplatform.h" #include "native_mate/dictionary.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/browser/notifications/linux/libnotify_notification.cc b/shell/browser/notifications/linux/libnotify_notification.cc index 553057f039..f9c0f1d00c 100644 --- a/shell/browser/notifications/linux/libnotify_notification.cc +++ b/shell/browser/notifications/linux/libnotify_notification.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/linux/libnotify_notification.h" +#include "shell/browser/notifications/linux/libnotify_notification.h" #include #include #include -#include "atom/browser/notifications/notification_delegate.h" -#include "atom/common/application_info.h" -#include "atom/common/platform_util.h" #include "base/files/file_enumerator.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/libgtkui/gtk_util.h" #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h" +#include "shell/browser/notifications/notification_delegate.h" +#include "shell/common/application_info.h" +#include "shell/common/platform_util.h" #include "third_party/skia/include/core/SkBitmap.h" namespace atom { diff --git a/shell/browser/notifications/linux/libnotify_notification.h b/shell/browser/notifications/linux/libnotify_notification.h index 6c518353e6..bda2a78590 100644 --- a/shell/browser/notifications/linux/libnotify_notification.h +++ b/shell/browser/notifications/linux/libnotify_notification.h @@ -8,8 +8,8 @@ #include #include -#include "atom/browser/notifications/notification.h" #include "library_loaders/libnotify_loader.h" +#include "shell/browser/notifications/notification.h" #include "ui/base/glib/glib_signal.h" namespace atom { diff --git a/shell/browser/notifications/linux/notification_presenter_linux.cc b/shell/browser/notifications/linux/notification_presenter_linux.cc index 5726c83ede..f4a256f99c 100644 --- a/shell/browser/notifications/linux/notification_presenter_linux.cc +++ b/shell/browser/notifications/linux/notification_presenter_linux.cc @@ -3,9 +3,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/notifications/linux/notification_presenter_linux.h" +#include "shell/browser/notifications/linux/notification_presenter_linux.h" -#include "atom/browser/notifications/linux/libnotify_notification.h" +#include "shell/browser/notifications/linux/libnotify_notification.h" namespace atom { diff --git a/shell/browser/notifications/linux/notification_presenter_linux.h b/shell/browser/notifications/linux/notification_presenter_linux.h index 32fcdda3ef..01d6127ed1 100644 --- a/shell/browser/notifications/linux/notification_presenter_linux.h +++ b/shell/browser/notifications/linux/notification_presenter_linux.h @@ -6,7 +6,7 @@ #ifndef ATOM_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_ #define ATOM_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_ -#include "atom/browser/notifications/notification_presenter.h" +#include "shell/browser/notifications/notification_presenter.h" namespace atom { diff --git a/shell/browser/notifications/mac/cocoa_notification.h b/shell/browser/notifications/mac/cocoa_notification.h index 4960930e38..98f657b164 100644 --- a/shell/browser/notifications/mac/cocoa_notification.h +++ b/shell/browser/notifications/mac/cocoa_notification.h @@ -11,8 +11,8 @@ #include #include -#include "atom/browser/notifications/notification.h" #include "base/mac/scoped_nsobject.h" +#include "shell/browser/notifications/notification.h" namespace atom { diff --git a/shell/browser/notifications/mac/cocoa_notification.mm b/shell/browser/notifications/mac/cocoa_notification.mm index 4da4d1a1c3..e991985922 100644 --- a/shell/browser/notifications/mac/cocoa_notification.mm +++ b/shell/browser/notifications/mac/cocoa_notification.mm @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/mac/cocoa_notification.h" +#include "shell/browser/notifications/mac/cocoa_notification.h" #include #include -#include "atom/browser/notifications/notification_delegate.h" -#include "atom/browser/notifications/notification_presenter.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" namespace atom { diff --git a/shell/browser/notifications/mac/notification_center_delegate.mm b/shell/browser/notifications/mac/notification_center_delegate.mm index ce2a15fbc3..b79e72f147 100644 --- a/shell/browser/notifications/mac/notification_center_delegate.mm +++ b/shell/browser/notifications/mac/notification_center_delegate.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/mac/notification_center_delegate.h" +#include "shell/browser/notifications/mac/notification_center_delegate.h" #include -#include "atom/browser/notifications/mac/cocoa_notification.h" -#include "atom/browser/notifications/mac/notification_presenter_mac.h" +#include "shell/browser/notifications/mac/cocoa_notification.h" +#include "shell/browser/notifications/mac/notification_presenter_mac.h" @implementation NotificationCenterDelegate diff --git a/shell/browser/notifications/mac/notification_presenter_mac.h b/shell/browser/notifications/mac/notification_presenter_mac.h index b951d59af3..5d8d1c9c4f 100644 --- a/shell/browser/notifications/mac/notification_presenter_mac.h +++ b/shell/browser/notifications/mac/notification_presenter_mac.h @@ -6,9 +6,9 @@ #ifndef ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_ #define ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_ -#include "atom/browser/notifications/mac/notification_center_delegate.h" -#include "atom/browser/notifications/notification_presenter.h" #include "base/mac/scoped_nsobject.h" +#include "shell/browser/notifications/mac/notification_center_delegate.h" +#include "shell/browser/notifications/notification_presenter.h" namespace atom { diff --git a/shell/browser/notifications/mac/notification_presenter_mac.mm b/shell/browser/notifications/mac/notification_presenter_mac.mm index 63af7051c2..d7fd88faab 100644 --- a/shell/browser/notifications/mac/notification_presenter_mac.mm +++ b/shell/browser/notifications/mac/notification_presenter_mac.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/mac/notification_presenter_mac.h" +#include "shell/browser/notifications/mac/notification_presenter_mac.h" -#include "atom/browser/notifications/mac/cocoa_notification.h" -#include "atom/browser/notifications/mac/notification_center_delegate.h" +#include "shell/browser/notifications/mac/cocoa_notification.h" +#include "shell/browser/notifications/mac/notification_center_delegate.h" namespace atom { diff --git a/shell/browser/notifications/notification.cc b/shell/browser/notifications/notification.cc index b51c9eb3e0..0fb6b469a8 100644 --- a/shell/browser/notifications/notification.cc +++ b/shell/browser/notifications/notification.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/notification.h" +#include "shell/browser/notifications/notification.h" -#include "atom/browser/notifications/notification_delegate.h" -#include "atom/browser/notifications/notification_presenter.h" +#include "shell/browser/notifications/notification_delegate.h" +#include "shell/browser/notifications/notification_presenter.h" namespace atom { diff --git a/shell/browser/notifications/notification_presenter.cc b/shell/browser/notifications/notification_presenter.cc index d8be278b01..c55cfe4b8e 100644 --- a/shell/browser/notifications/notification_presenter.cc +++ b/shell/browser/notifications/notification_presenter.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/notification_presenter.h" +#include "shell/browser/notifications/notification_presenter.h" #include -#include "atom/browser/notifications/notification.h" +#include "shell/browser/notifications/notification.h" namespace atom { diff --git a/shell/browser/notifications/platform_notification_service.cc b/shell/browser/notifications/platform_notification_service.cc index 75ff049130..1c88406ae8 100644 --- a/shell/browser/notifications/platform_notification_service.cc +++ b/shell/browser/notifications/platform_notification_service.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/notifications/platform_notification_service.h" +#include "shell/browser/notifications/platform_notification_service.h" -#include "atom/browser/atom_browser_client.h" -#include "atom/browser/notifications/notification.h" -#include "atom/browser/notifications/notification_delegate.h" -#include "atom/browser/notifications/notification_presenter.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/notification_event_dispatcher.h" #include "content/public/browser/render_process_host.h" +#include "shell/browser/atom_browser_client.h" +#include "shell/browser/notifications/notification.h" +#include "shell/browser/notifications/notification_delegate.h" +#include "shell/browser/notifications/notification_presenter.h" #include "third_party/blink/public/common/notifications/notification_resources.h" #include "third_party/blink/public/common/notifications/platform_notification_data.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/shell/browser/notifications/win/notification_presenter_win.cc b/shell/browser/notifications/win/notification_presenter_win.cc index 818ca8ba30..b3cc436f6a 100644 --- a/shell/browser/notifications/win/notification_presenter_win.cc +++ b/shell/browser/notifications/win/notification_presenter_win.cc @@ -4,14 +4,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/notifications/win/notification_presenter_win.h" +#include "shell/browser/notifications/win/notification_presenter_win.h" #include #include #include -#include "atom/browser/notifications/win/notification_presenter_win7.h" -#include "atom/browser/notifications/win/windows_toast_notification.h" #include "base/environment.h" #include "base/files/file_util.h" #include "base/hash/md5.h" @@ -19,6 +17,8 @@ #include "base/threading/thread_restrictions.h" #include "base/time/time.h" #include "base/win/windows_version.h" +#include "shell/browser/notifications/win/notification_presenter_win7.h" +#include "shell/browser/notifications/win/windows_toast_notification.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/shell/browser/notifications/win/notification_presenter_win.h b/shell/browser/notifications/win/notification_presenter_win.h index 874a9d0cb2..de154f6cb5 100644 --- a/shell/browser/notifications/win/notification_presenter_win.h +++ b/shell/browser/notifications/win/notification_presenter_win.h @@ -23,9 +23,9 @@ #ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_ #define ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_ -#include "atom/browser/notifications/notification_presenter.h" #include "base/files/scoped_temp_dir.h" #include "base/strings/string16.h" +#include "shell/browser/notifications/notification_presenter.h" class GURL; class SkBitmap; diff --git a/shell/browser/notifications/win/notification_presenter_win7.cc b/shell/browser/notifications/win/notification_presenter_win7.cc index e4d11ead2d..dff0b35056 100644 --- a/shell/browser/notifications/win/notification_presenter_win7.cc +++ b/shell/browser/notifications/win/notification_presenter_win7.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/win/notification_presenter_win7.h" +#include "shell/browser/notifications/win/notification_presenter_win7.h" #include -#include "atom/browser/notifications/win/win32_notification.h" +#include "shell/browser/notifications/win/win32_notification.h" namespace atom { diff --git a/shell/browser/notifications/win/notification_presenter_win7.h b/shell/browser/notifications/win/notification_presenter_win7.h index 0f8992beca..9b77c6ca06 100644 --- a/shell/browser/notifications/win/notification_presenter_win7.h +++ b/shell/browser/notifications/win/notification_presenter_win7.h @@ -7,8 +7,8 @@ #include -#include "atom/browser/notifications/notification_presenter.h" -#include "atom/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h" +#include "shell/browser/notifications/notification_presenter.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h" namespace atom { diff --git a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc index 6810d0fb5c..75af3f6168 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc +++ b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc @@ -10,15 +10,15 @@ #define WIN32_LEAN_AND_MEAN #endif -#include "atom/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h" #include #include #include #include -#include "atom/browser/notifications/win/win32_desktop_notifications/common.h" -#include "atom/browser/notifications/win/win32_desktop_notifications/toast.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/common.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/toast.h" using std::make_shared; using std::shared_ptr; diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast.cc b/shell/browser/notifications/win/win32_desktop_notifications/toast.cc index 1ee159a97e..50726ca80c 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/toast.cc +++ b/shell/browser/notifications/win/win32_desktop_notifications/toast.cc @@ -5,7 +5,7 @@ #ifndef NOMINMAX #define NOMINMAX #endif -#include "atom/browser/notifications/win/win32_desktop_notifications/toast.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/toast.h" #include @@ -16,9 +16,9 @@ #include #include -#include "atom/browser/notifications/win/win32_desktop_notifications/common.h" -#include "atom/browser/notifications/win/win32_desktop_notifications/toast_uia.h" #include "base/logging.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/common.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h" #pragma comment(lib, "msimg32.lib") #pragma comment(lib, "uxtheme.lib") diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast.h b/shell/browser/notifications/win/win32_desktop_notifications/toast.h index 9748af7601..0a1f7cd33d 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/toast.h +++ b/shell/browser/notifications/win/win32_desktop_notifications/toast.h @@ -7,7 +7,7 @@ #include -#include "atom/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h" #include "base/logging.h" diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc index 860aaf5420..1b091d74af 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc +++ b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/notifications/win/win32_desktop_notifications/toast_uia.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h" #include -#include "atom/browser/notifications/win/win32_desktop_notifications/common.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/common.h" #pragma comment(lib, "uiautomationcore.lib") diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h index e814674840..41cc44ab80 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h +++ b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_ #define ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_ -#include "atom/browser/notifications/win/win32_desktop_notifications/toast.h" +#include "shell/browser/notifications/win/win32_desktop_notifications/toast.h" #include diff --git a/shell/browser/notifications/win/win32_notification.cc b/shell/browser/notifications/win/win32_notification.cc index b7a48317d8..d9895e6a6f 100644 --- a/shell/browser/notifications/win/win32_notification.cc +++ b/shell/browser/notifications/win/win32_notification.cc @@ -6,7 +6,7 @@ #define WIN32_LEAN_AND_MEAN #endif -#include "atom/browser/notifications/win/win32_notification.h" +#include "shell/browser/notifications/win/win32_notification.h" #include #include diff --git a/shell/browser/notifications/win/win32_notification.h b/shell/browser/notifications/win/win32_notification.h index 0b128877e8..43388f4585 100644 --- a/shell/browser/notifications/win/win32_notification.h +++ b/shell/browser/notifications/win/win32_notification.h @@ -7,8 +7,8 @@ #include -#include "atom/browser/notifications/notification.h" -#include "atom/browser/notifications/win/notification_presenter_win7.h" +#include "shell/browser/notifications/notification.h" +#include "shell/browser/notifications/win/notification_presenter_win7.h" namespace atom { diff --git a/shell/browser/notifications/win/windows_toast_notification.cc b/shell/browser/notifications/win/windows_toast_notification.cc index bac401c7f9..9269b2e8bd 100644 --- a/shell/browser/notifications/win/windows_toast_notification.cc +++ b/shell/browser/notifications/win/windows_toast_notification.cc @@ -6,20 +6,20 @@ // this code // and released it as MIT to the world. -#include "atom/browser/notifications/win/windows_toast_notification.h" +#include "shell/browser/notifications/win/windows_toast_notification.h" #include #include -#include "atom/browser/notifications/notification_delegate.h" -#include "atom/browser/notifications/win/notification_presenter_win.h" -#include "atom/browser/win/scoped_hstring.h" -#include "atom/common/application_info.h" #include "base/environment.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#include "shell/browser/notifications/notification_delegate.h" +#include "shell/browser/notifications/win/notification_presenter_win.h" +#include "shell/browser/win/scoped_hstring.h" +#include "shell/common/application_info.h" using ABI::Windows::Data::Xml::Dom::IXmlAttribute; using ABI::Windows::Data::Xml::Dom::IXmlDocument; diff --git a/shell/browser/notifications/win/windows_toast_notification.h b/shell/browser/notifications/win/windows_toast_notification.h index f1d3807f4f..0e90c8df48 100644 --- a/shell/browser/notifications/win/windows_toast_notification.h +++ b/shell/browser/notifications/win/windows_toast_notification.h @@ -15,7 +15,7 @@ #include #include -#include "atom/browser/notifications/notification.h" +#include "shell/browser/notifications/notification.h" using Microsoft::WRL::ClassicCom; using Microsoft::WRL::ComPtr; diff --git a/shell/browser/osr/osr_host_display_client.cc b/shell/browser/osr/osr_host_display_client.cc index 1cb7982429..9173206dc3 100644 --- a/shell/browser/osr/osr_host_display_client.cc +++ b/shell/browser/osr/osr_host_display_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/osr/osr_host_display_client.h" +#include "shell/browser/osr/osr_host_display_client.h" #include diff --git a/shell/browser/osr/osr_host_display_client_mac.mm b/shell/browser/osr/osr_host_display_client_mac.mm index 0e1bea2763..b65cebcf53 100644 --- a/shell/browser/osr/osr_host_display_client_mac.mm +++ b/shell/browser/osr/osr_host_display_client_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/osr/osr_host_display_client.h" +#include "shell/browser/osr/osr_host_display_client.h" #include diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc index 9ba2cca7c7..0be6e61a99 100644 --- a/shell/browser/osr/osr_render_widget_host_view.cc +++ b/shell/browser/osr/osr_render_widget_host_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/osr/osr_render_widget_host_view.h" +#include "shell/browser/osr/osr_render_widget_host_view.h" #include #include diff --git a/shell/browser/osr/osr_render_widget_host_view.h b/shell/browser/osr/osr_render_widget_host_view.h index c94baffca7..ea865690e4 100644 --- a/shell/browser/osr/osr_render_widget_host_view.h +++ b/shell/browser/osr/osr_render_widget_host_view.h @@ -14,9 +14,6 @@ #include #endif -#include "atom/browser/osr/osr_host_display_client.h" -#include "atom/browser/osr/osr_video_consumer.h" -#include "atom/browser/osr/osr_view_proxy.h" #include "base/process/kill.h" #include "base/threading/thread.h" #include "base/time/time.h" @@ -30,6 +27,9 @@ #include "content/browser/renderer_host/render_widget_host_impl.h" // nogncheck #include "content/browser/renderer_host/render_widget_host_view_base.h" // nogncheck #include "content/browser/web_contents/web_contents_view.h" // nogncheck +#include "shell/browser/osr/osr_host_display_client.h" +#include "shell/browser/osr/osr_video_consumer.h" +#include "shell/browser/osr/osr_view_proxy.h" #include "third_party/blink/public/platform/web_vector.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/ime/text_input_client.h" diff --git a/shell/browser/osr/osr_video_consumer.cc b/shell/browser/osr/osr_video_consumer.cc index aa265a1222..c3f2c64447 100644 --- a/shell/browser/osr/osr_video_consumer.cc +++ b/shell/browser/osr/osr_video_consumer.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/osr/osr_video_consumer.h" +#include "shell/browser/osr/osr_video_consumer.h" #include -#include "atom/browser/osr/osr_render_widget_host_view.h" #include "media/base/video_frame_metadata.h" #include "media/capture/mojom/video_capture_types.mojom.h" +#include "shell/browser/osr/osr_render_widget_host_view.h" #include "ui/gfx/skbitmap_operations.h" namespace atom { diff --git a/shell/browser/osr/osr_view_proxy.cc b/shell/browser/osr/osr_view_proxy.cc index 485e6193f7..40b101fe42 100644 --- a/shell/browser/osr/osr_view_proxy.cc +++ b/shell/browser/osr/osr_view_proxy.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/osr/osr_view_proxy.h" +#include "shell/browser/osr/osr_view_proxy.h" namespace atom { diff --git a/shell/browser/osr/osr_web_contents_view.cc b/shell/browser/osr/osr_web_contents_view.cc index 02041eaa3c..0d21a7abaf 100644 --- a/shell/browser/osr/osr_web_contents_view.cc +++ b/shell/browser/osr/osr_web_contents_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/osr/osr_web_contents_view.h" +#include "shell/browser/osr/osr_web_contents_view.h" #include "content/browser/web_contents/web_contents_impl.h" // nogncheck #include "content/public/browser/render_view_host.h" diff --git a/shell/browser/osr/osr_web_contents_view.h b/shell/browser/osr/osr_web_contents_view.h index 7509e5b968..2bf7f1b411 100644 --- a/shell/browser/osr/osr_web_contents_view.h +++ b/shell/browser/osr/osr_web_contents_view.h @@ -5,13 +5,13 @@ #ifndef ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_ #define ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_ -#include "atom/browser/native_window.h" -#include "atom/browser/native_window_observer.h" +#include "shell/browser/native_window.h" +#include "shell/browser/native_window_observer.h" -#include "atom/browser/osr/osr_render_widget_host_view.h" #include "content/browser/renderer_host/render_view_host_delegate_view.h" // nogncheck #include "content/browser/web_contents/web_contents_view.h" // nogncheck #include "content/public/browser/web_contents.h" +#include "shell/browser/osr/osr_render_widget_host_view.h" #if defined(OS_MACOSX) #ifdef __OBJC__ diff --git a/shell/browser/osr/osr_web_contents_view_mac.mm b/shell/browser/osr/osr_web_contents_view_mac.mm index 19560fdb11..487e9ee07d 100644 --- a/shell/browser/osr/osr_web_contents_view_mac.mm +++ b/shell/browser/osr/osr_web_contents_view_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/osr/osr_web_contents_view.h" +#include "shell/browser/osr/osr_web_contents_view.h" #import diff --git a/shell/browser/pref_store_delegate.cc b/shell/browser/pref_store_delegate.cc index a577fde0d2..5f34176e42 100644 --- a/shell/browser/pref_store_delegate.cc +++ b/shell/browser/pref_store_delegate.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/pref_store_delegate.h" +#include "shell/browser/pref_store_delegate.h" #include -#include "atom/browser/atom_browser_context.h" #include "components/prefs/value_map_pref_store.h" +#include "shell/browser/atom_browser_context.h" namespace atom { diff --git a/shell/browser/printing/print_preview_message_handler.cc b/shell/browser/printing/print_preview_message_handler.cc index a3b249f7db..0e99a9fcd8 100644 --- a/shell/browser/printing/print_preview_message_handler.cc +++ b/shell/browser/printing/print_preview_message_handler.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/printing/print_preview_message_handler.h" +#include "shell/browser/printing/print_preview_message_handler.h" #include #include -#include "atom/common/node_includes.h" #include "base/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted.h" @@ -24,6 +23,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" +#include "shell/common/node_includes.h" using content::BrowserThread; diff --git a/shell/browser/printing/print_preview_message_handler.h b/shell/browser/printing/print_preview_message_handler.h index dfd96d5d57..bad539686d 100644 --- a/shell/browser/printing/print_preview_message_handler.h +++ b/shell/browser/printing/print_preview_message_handler.h @@ -7,12 +7,12 @@ #include -#include "atom/common/promise_util.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" +#include "shell/common/promise_util.h" #include "v8/include/v8.h" struct PrintHostMsg_DidPreviewDocument_Params; diff --git a/shell/browser/relauncher.cc b/shell/browser/relauncher.cc index eacf457b23..9506f5dd7d 100644 --- a/shell/browser/relauncher.cc +++ b/shell/browser/relauncher.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/relauncher.h" +#include "shell/browser/relauncher.h" #include #include #include -#include "atom/common/atom_command_line.h" #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" @@ -16,6 +15,7 @@ #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" +#include "shell/common/atom_command_line.h" #if defined(OS_POSIX) #include "base/posix/eintr_wrapper.h" diff --git a/shell/browser/relauncher_linux.cc b/shell/browser/relauncher_linux.cc index 6c9115cab7..ba9a45c2b0 100644 --- a/shell/browser/relauncher_linux.cc +++ b/shell/browser/relauncher_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/relauncher.h" +#include "shell/browser/relauncher.h" #include #include diff --git a/shell/browser/relauncher_mac.cc b/shell/browser/relauncher_mac.cc index 54b3b58a17..38294618d8 100644 --- a/shell/browser/relauncher_mac.cc +++ b/shell/browser/relauncher_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/relauncher.h" +#include "shell/browser/relauncher.h" #include #include diff --git a/shell/browser/relauncher_win.cc b/shell/browser/relauncher_win.cc index 3092edb7b5..b0cc2e03b6 100644 --- a/shell/browser/relauncher_win.cc +++ b/shell/browser/relauncher_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/relauncher.h" +#include "shell/browser/relauncher.h" #include diff --git a/shell/browser/session_preferences.cc b/shell/browser/session_preferences.cc index e9b2115464..add75f69ce 100644 --- a/shell/browser/session_preferences.cc +++ b/shell/browser/session_preferences.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/session_preferences.h" +#include "shell/browser/session_preferences.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" +#include "shell/common/options_switches.h" namespace atom { diff --git a/shell/browser/special_storage_policy.cc b/shell/browser/special_storage_policy.cc index 9012de7be2..74b190fb06 100644 --- a/shell/browser/special_storage_policy.cc +++ b/shell/browser/special_storage_policy.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "atom/browser/special_storage_policy.h" +#include "shell/browser/special_storage_policy.h" #include "base/bind.h" #include "base/callback.h" diff --git a/shell/browser/ui/accelerator_util.cc b/shell/browser/ui/accelerator_util.cc index 21d08dfba1..29da5c056a 100644 --- a/shell/browser/ui/accelerator_util.cc +++ b/shell/browser/ui/accelerator_util.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/accelerator_util.h" +#include "shell/browser/ui/accelerator_util.h" #include #include #include -#include "atom/common/keyboard_util.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "shell/common/keyboard_util.h" namespace accelerator_util { diff --git a/shell/browser/ui/accelerator_util.h b/shell/browser/ui/accelerator_util.h index f498e0240a..c8ca60afbb 100644 --- a/shell/browser/ui/accelerator_util.h +++ b/shell/browser/ui/accelerator_util.h @@ -8,7 +8,7 @@ #include #include -#include "atom/browser/ui/atom_menu_model.h" +#include "shell/browser/ui/atom_menu_model.h" #include "ui/base/accelerators/accelerator.h" namespace accelerator_util { diff --git a/shell/browser/ui/atom_menu_model.cc b/shell/browser/ui/atom_menu_model.cc index 714fa60ce4..f1ca8b9aa6 100644 --- a/shell/browser/ui/atom_menu_model.cc +++ b/shell/browser/ui/atom_menu_model.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/atom_menu_model.h" +#include "shell/browser/ui/atom_menu_model.h" #include "base/stl_util.h" diff --git a/shell/browser/ui/autofill_popup.cc b/shell/browser/ui/autofill_popup.cc index 20105772ea..dc65d353f4 100644 --- a/shell/browser/ui/autofill_popup.cc +++ b/shell/browser/ui/autofill_popup.cc @@ -6,12 +6,12 @@ #include #include -#include "atom/browser/native_window_views.h" -#include "atom/browser/ui/autofill_popup.h" -#include "atom/common/api/api.mojom.h" #include "base/i18n/rtl.h" #include "chrome/browser/ui/autofill/popup_view_common.h" #include "electron/buildflags/buildflags.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/ui/autofill_popup.h" +#include "shell/common/api/api.mojom.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "ui/display/display.h" #include "ui/display/screen.h" @@ -22,8 +22,8 @@ #include "ui/gfx/text_utils.h" #if BUILDFLAG(ENABLE_OSR) -#include "atom/browser/osr/osr_render_widget_host_view.h" -#include "atom/browser/osr/osr_view_proxy.h" +#include "shell/browser/osr/osr_render_widget_host_view.h" +#include "shell/browser/osr/osr_view_proxy.h" #endif namespace atom { diff --git a/shell/browser/ui/autofill_popup.h b/shell/browser/ui/autofill_popup.h index fe1b91760d..a1f94e9535 100644 --- a/shell/browser/ui/autofill_popup.h +++ b/shell/browser/ui/autofill_popup.h @@ -7,8 +7,8 @@ #include -#include "atom/browser/ui/views/autofill_popup_view.h" #include "content/public/browser/render_frame_host.h" +#include "shell/browser/ui/views/autofill_popup_view.h" #include "ui/gfx/font_list.h" #include "ui/native_theme/native_theme.h" #include "ui/views/view.h" diff --git a/shell/browser/ui/certificate_trust.h b/shell/browser/ui/certificate_trust.h index f05a22cdf6..a968c34bfe 100644 --- a/shell/browser/ui/certificate_trust.h +++ b/shell/browser/ui/certificate_trust.h @@ -7,9 +7,9 @@ #include -#include "atom/common/promise_util.h" #include "base/memory/ref_counted.h" #include "net/cert/x509_certificate.h" +#include "shell/common/promise_util.h" namespace atom { class NativeWindow; diff --git a/shell/browser/ui/certificate_trust_mac.mm b/shell/browser/ui/certificate_trust_mac.mm index 161e10c093..7dec1a836c 100644 --- a/shell/browser/ui/certificate_trust_mac.mm +++ b/shell/browser/ui/certificate_trust_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/certificate_trust.h" +#include "shell/browser/ui/certificate_trust.h" #include #include @@ -11,11 +11,11 @@ #import #import -#include "atom/browser/native_window.h" #include "base/strings/sys_string_conversions.h" #include "net/cert/cert_database.h" #include "net/cert/x509_util_ios_and_mac.h" #include "net/cert/x509_util_mac.h" +#include "shell/browser/native_window.h" @interface TrustDelegate : NSObject { @private diff --git a/shell/browser/ui/certificate_trust_win.cc b/shell/browser/ui/certificate_trust_win.cc index 40f62283df..02c33cf7ca 100644 --- a/shell/browser/ui/certificate_trust_win.cc +++ b/shell/browser/ui/certificate_trust_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/certificate_trust.h" +#include "shell/browser/ui/certificate_trust.h" #include // windows.h must be included first diff --git a/shell/browser/ui/cocoa/NSColor+Hex.mm b/shell/browser/ui/cocoa/NSColor+Hex.mm index 46ad597d96..b1def16071 100644 --- a/shell/browser/ui/cocoa/NSColor+Hex.mm +++ b/shell/browser/ui/cocoa/NSColor+Hex.mm @@ -4,7 +4,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/NSColor+Hex.h" +#include "shell/browser/ui/cocoa/NSColor+Hex.h" @implementation NSColor (Hex) diff --git a/shell/browser/ui/cocoa/NSString+ANSI.mm b/shell/browser/ui/cocoa/NSString+ANSI.mm index 699883a4a4..a8232063f1 100644 --- a/shell/browser/ui/cocoa/NSString+ANSI.mm +++ b/shell/browser/ui/cocoa/NSString+ANSI.mm @@ -4,9 +4,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/NSColor+Hex.h" -#include "atom/browser/ui/cocoa/NSString+ANSI.h" #include "base/mac/scoped_nsobject.h" +#include "shell/browser/ui/cocoa/NSColor+Hex.h" +#include "shell/browser/ui/cocoa/NSString+ANSI.h" @implementation NSMutableDictionary (ANSI) diff --git a/shell/browser/ui/cocoa/atom_bundle_mover.mm b/shell/browser/ui/cocoa/atom_bundle_mover.mm index 73a4aeaed9..d19065be05 100644 --- a/shell/browser/ui/cocoa/atom_bundle_mover.mm +++ b/shell/browser/ui/cocoa/atom_bundle_mover.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#import "atom/browser/ui/cocoa/atom_bundle_mover.h" +#import "shell/browser/ui/cocoa/atom_bundle_mover.h" #include @@ -13,7 +13,7 @@ #import #import -#import "atom/browser/browser.h" +#import "shell/browser/browser.h" namespace atom { diff --git a/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.mm b/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.mm index 9189470d89..64d01a76de 100644 --- a/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.mm +++ b/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/cocoa/atom_inspectable_web_contents_view.h" +#include "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h" -#include "atom/browser/ui/cocoa/event_dispatching_window.h" -#include "atom/browser/ui/inspectable_web_contents_impl.h" -#include "atom/browser/ui/inspectable_web_contents_view_delegate.h" -#include "atom/browser/ui/inspectable_web_contents_view_mac.h" #include "content/public/browser/render_widget_host_view.h" +#include "shell/browser/ui/cocoa/event_dispatching_window.h" +#include "shell/browser/ui/inspectable_web_contents_impl.h" +#include "shell/browser/ui/inspectable_web_contents_view_delegate.h" +#include "shell/browser/ui/inspectable_web_contents_view_mac.h" #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h" @implementation AtomInspectableWebContentsView diff --git a/shell/browser/ui/cocoa/atom_menu_controller.mm b/shell/browser/ui/cocoa/atom_menu_controller.mm index 403ed7a189..39291e9d3a 100644 --- a/shell/browser/ui/cocoa/atom_menu_controller.mm +++ b/shell/browser/ui/cocoa/atom_menu_controller.mm @@ -3,16 +3,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#import "atom/browser/ui/cocoa/atom_menu_controller.h" +#import "shell/browser/ui/cocoa/atom_menu_controller.h" -#include "atom/browser/mac/atom_application.h" -#include "atom/browser/ui/atom_menu_model.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#include "shell/browser/mac/atom_application.h" +#include "shell/browser/ui/atom_menu_model.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/platform_accelerator_cocoa.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/shell/browser/ui/cocoa/atom_native_widget_mac.mm b/shell/browser/ui/cocoa/atom_native_widget_mac.mm index 62db672a23..a6f90e5092 100644 --- a/shell/browser/ui/cocoa/atom_native_widget_mac.mm +++ b/shell/browser/ui/cocoa/atom_native_widget_mac.mm @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/atom_native_widget_mac.h" +#include "shell/browser/ui/cocoa/atom_native_widget_mac.h" -#include "atom/browser/ui/cocoa/atom_ns_window.h" +#include "shell/browser/ui/cocoa/atom_ns_window.h" namespace atom { diff --git a/shell/browser/ui/cocoa/atom_ns_window.h b/shell/browser/ui/cocoa/atom_ns_window.h index 55daccb077..ce8cb661b8 100644 --- a/shell/browser/ui/cocoa/atom_ns_window.h +++ b/shell/browser/ui/cocoa/atom_ns_window.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_ #define ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_ -#include "atom/browser/ui/cocoa/event_dispatching_window.h" #include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h" +#include "shell/browser/ui/cocoa/event_dispatching_window.h" #include "ui/views/widget/native_widget_mac.h" namespace atom { diff --git a/shell/browser/ui/cocoa/atom_ns_window.mm b/shell/browser/ui/cocoa/atom_ns_window.mm index 5d8d8925c9..f3d800881e 100644 --- a/shell/browser/ui/cocoa/atom_ns_window.mm +++ b/shell/browser/ui/cocoa/atom_ns_window.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/atom_ns_window.h" +#include "shell/browser/ui/cocoa/atom_ns_window.h" -#include "atom/browser/native_window_mac.h" -#include "atom/browser/ui/cocoa/atom_preview_item.h" -#include "atom/browser/ui/cocoa/atom_touch_bar.h" -#include "atom/browser/ui/cocoa/root_view_mac.h" #include "base/strings/sys_string_conversions.h" +#include "shell/browser/native_window_mac.h" +#include "shell/browser/ui/cocoa/atom_preview_item.h" +#include "shell/browser/ui/cocoa/atom_touch_bar.h" +#include "shell/browser/ui/cocoa/root_view_mac.h" #include "ui/base/cocoa/window_size_constants.h" namespace atom { diff --git a/shell/browser/ui/cocoa/atom_ns_window_delegate.mm b/shell/browser/ui/cocoa/atom_ns_window_delegate.mm index 0a9b0e5041..df8ba71cee 100644 --- a/shell/browser/ui/cocoa/atom_ns_window_delegate.mm +++ b/shell/browser/ui/cocoa/atom_ns_window_delegate.mm @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/atom_ns_window_delegate.h" +#include "shell/browser/ui/cocoa/atom_ns_window_delegate.h" #include -#include "atom/browser/browser.h" -#include "atom/browser/native_window_mac.h" -#include "atom/browser/ui/cocoa/atom_preview_item.h" -#include "atom/browser/ui/cocoa/atom_touch_bar.h" #include "base/mac/mac_util.h" #include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h" +#include "shell/browser/browser.h" +#include "shell/browser/native_window_mac.h" +#include "shell/browser/ui/cocoa/atom_preview_item.h" +#include "shell/browser/ui/cocoa/atom_touch_bar.h" #include "ui/views/cocoa/native_widget_mac_ns_window_host.h" #include "ui/views/widget/native_widget_mac.h" diff --git a/shell/browser/ui/cocoa/atom_preview_item.mm b/shell/browser/ui/cocoa/atom_preview_item.mm index 2bd273d444..42920f6250 100644 --- a/shell/browser/ui/cocoa/atom_preview_item.mm +++ b/shell/browser/ui/cocoa/atom_preview_item.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/atom_preview_item.h" +#include "shell/browser/ui/cocoa/atom_preview_item.h" @implementation AtomPreviewItem diff --git a/shell/browser/ui/cocoa/atom_touch_bar.h b/shell/browser/ui/cocoa/atom_touch_bar.h index fd6bb0cdc4..a032a5b72a 100644 --- a/shell/browser/ui/cocoa/atom_touch_bar.h +++ b/shell/browser/ui/cocoa/atom_touch_bar.h @@ -11,11 +11,11 @@ #include #include -#include "atom/browser/native_window.h" -#include "atom/browser/ui/cocoa/touch_bar_forward_declarations.h" #include "base/mac/scoped_nsobject.h" #include "native_mate/constructor.h" #include "native_mate/persistent_dictionary.h" +#include "shell/browser/native_window.h" +#include "shell/browser/ui/cocoa/touch_bar_forward_declarations.h" @interface AtomTouchBar : NSObject #include -#include "atom/common/color_util.h" -#include "atom/common/native_mate_converters/image_converter.h" #include "base/strings/sys_string_conversions.h" +#include "shell/common/color_util.h" +#include "shell/common/native_mate_converters/image_converter.h" #include "skia/ext/skia_utils_mac.h" #include "ui/gfx/image/image.h" diff --git a/shell/browser/ui/cocoa/delayed_native_view_host.cc b/shell/browser/ui/cocoa/delayed_native_view_host.cc index 4a68701862..5056646f7d 100644 --- a/shell/browser/ui/cocoa/delayed_native_view_host.cc +++ b/shell/browser/ui/cocoa/delayed_native_view_host.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/delayed_native_view_host.h" +#include "shell/browser/ui/cocoa/delayed_native_view_host.h" namespace atom { diff --git a/shell/browser/ui/cocoa/event_dispatching_window.mm b/shell/browser/ui/cocoa/event_dispatching_window.mm index 4b90ae924b..b98e547730 100644 --- a/shell/browser/ui/cocoa/event_dispatching_window.mm +++ b/shell/browser/ui/cocoa/event_dispatching_window.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/event_dispatching_window.h" +#include "shell/browser/ui/cocoa/event_dispatching_window.h" @implementation EventDispatchingWindow diff --git a/shell/browser/ui/cocoa/root_view_mac.mm b/shell/browser/ui/cocoa/root_view_mac.mm index 1ecebfe06c..325753f42e 100644 --- a/shell/browser/ui/cocoa/root_view_mac.mm +++ b/shell/browser/ui/cocoa/root_view_mac.mm @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/root_view_mac.h" +#include "shell/browser/ui/cocoa/root_view_mac.h" -#include "atom/browser/native_window.h" +#include "shell/browser/native_window.h" namespace atom { diff --git a/shell/browser/ui/cocoa/views_delegate_mac.mm b/shell/browser/ui/cocoa/views_delegate_mac.mm index 6a289e8c0f..084ef4595a 100644 --- a/shell/browser/ui/cocoa/views_delegate_mac.mm +++ b/shell/browser/ui/cocoa/views_delegate_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/cocoa/views_delegate_mac.h" +#include "shell/browser/ui/cocoa/views_delegate_mac.h" #include "content/public/browser/context_factory.h" #include "ui/views/widget/native_widget_mac.h" diff --git a/shell/browser/ui/devtools_manager_delegate.cc b/shell/browser/ui/devtools_manager_delegate.cc index f461f6e67d..4cee7c9133 100644 --- a/shell/browser/ui/devtools_manager_delegate.cc +++ b/shell/browser/ui/devtools_manager_delegate.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/devtools_manager_delegate.h" +#include "shell/browser/ui/devtools_manager_delegate.h" #include #include #include -#include "atom/browser/atom_paths.h" #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" @@ -28,6 +27,7 @@ #include "net/base/net_errors.h" #include "net/socket/stream_socket.h" #include "net/socket/tcp_server_socket.h" +#include "shell/browser/atom_paths.h" #include "ui/base/resource/resource_bundle.h" namespace atom { diff --git a/shell/browser/ui/devtools_ui.cc b/shell/browser/ui/devtools_ui.cc index 8e14c5675c..5783359ab6 100644 --- a/shell/browser/ui/devtools_ui.cc +++ b/shell/browser/ui/devtools_ui.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/devtools_ui.h" +#include "shell/browser/ui/devtools_ui.h" #include #include diff --git a/shell/browser/ui/drag_util_mac.mm b/shell/browser/ui/drag_util_mac.mm index 73a539e990..9255a7d114 100644 --- a/shell/browser/ui/drag_util_mac.mm +++ b/shell/browser/ui/drag_util_mac.mm @@ -6,9 +6,9 @@ #include -#include "atom/browser/ui/drag_util.h" #include "base/files/file_path.h" #include "base/strings/sys_string_conversions.h" +#include "shell/browser/ui/drag_util.h" namespace atom { diff --git a/shell/browser/ui/drag_util_views.cc b/shell/browser/ui/drag_util_views.cc index ab2028daef..cec4c1f4d8 100644 --- a/shell/browser/ui/drag_util_views.cc +++ b/shell/browser/ui/drag_util_views.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/drag_util.h" +#include "shell/browser/ui/drag_util.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window.h" diff --git a/shell/browser/ui/file_dialog.h b/shell/browser/ui/file_dialog.h index e7c550d88e..9ff87e04af 100644 --- a/shell/browser/ui/file_dialog.h +++ b/shell/browser/ui/file_dialog.h @@ -9,10 +9,10 @@ #include #include -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/promise_util.h" #include "base/files/file_path.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/promise_util.h" namespace atom { class NativeWindow; diff --git a/shell/browser/ui/file_dialog_gtk.cc b/shell/browser/ui/file_dialog_gtk.cc index 3c245e5521..47a3314197 100644 --- a/shell/browser/ui/file_dialog_gtk.cc +++ b/shell/browser/ui/file_dialog_gtk.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/file_dialog.h" +#include "shell/browser/ui/file_dialog.h" #include // _() macro -#include "atom/browser/native_window_views.h" -#include "atom/browser/unresponsive_suppressor.h" #include "base/callback.h" #include "base/files/file_util.h" #include "base/strings/string_util.h" #include "chrome/browser/ui/libgtkui/gtk_util.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/unresponsive_suppressor.h" #include "ui/base/glib/glib_signal.h" #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" diff --git a/shell/browser/ui/file_dialog_mac.mm b/shell/browser/ui/file_dialog_mac.mm index 69bf816f16..f3ec422cb8 100644 --- a/shell/browser/ui/file_dialog_mac.mm +++ b/shell/browser/ui/file_dialog_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/file_dialog.h" +#include "shell/browser/ui/file_dialog.h" #include #include @@ -11,12 +11,12 @@ #import #import -#include "atom/browser/native_window.h" #include "base/files/file_util.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/strings/sys_string_conversions.h" +#include "shell/browser/native_window.h" @interface PopUpButtonHandler : NSObject diff --git a/shell/browser/ui/file_dialog_win.cc b/shell/browser/ui/file_dialog_win.cc index a2be90a781..af94cb8145 100644 --- a/shell/browser/ui/file_dialog_win.cc +++ b/shell/browser/ui/file_dialog_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/file_dialog.h" +#include "shell/browser/ui/file_dialog.h" #include // windows.h must be included first @@ -11,8 +11,6 @@ #include #include -#include "atom/browser/native_window_views.h" -#include "atom/browser/unresponsive_suppressor.h" #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" #include "base/strings/string_split.h" @@ -21,6 +19,8 @@ #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" #include "base/win/registry.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/unresponsive_suppressor.h" namespace file_dialog { diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc index 858a8b5db5..cd6c9532a1 100644 --- a/shell/browser/ui/inspectable_web_contents.cc +++ b/shell/browser/ui/inspectable_web_contents.cc @@ -3,9 +3,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/inspectable_web_contents.h" +#include "shell/browser/ui/inspectable_web_contents.h" -#include "atom/browser/ui/inspectable_web_contents_impl.h" +#include "shell/browser/ui/inspectable_web_contents_impl.h" namespace atom { diff --git a/shell/browser/ui/inspectable_web_contents_impl.cc b/shell/browser/ui/inspectable_web_contents_impl.cc index 48dfea30f3..23dabdb778 100644 --- a/shell/browser/ui/inspectable_web_contents_impl.cc +++ b/shell/browser/ui/inspectable_web_contents_impl.cc @@ -3,15 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/inspectable_web_contents_impl.h" +#include "shell/browser/ui/inspectable_web_contents_impl.h" #include #include -#include "atom/browser/ui/inspectable_web_contents_delegate.h" -#include "atom/browser/ui/inspectable_web_contents_view.h" -#include "atom/browser/ui/inspectable_web_contents_view_delegate.h" -#include "atom/common/platform_util.h" #include "base/base64.h" #include "base/guid.h" #include "base/json/json_reader.h" @@ -41,6 +37,10 @@ #include "net/http/http_response_headers.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/cpp/simple_url_loader_stream_consumer.h" +#include "shell/browser/ui/inspectable_web_contents_delegate.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" +#include "shell/browser/ui/inspectable_web_contents_view_delegate.h" +#include "shell/common/platform_util.h" #include "third_party/blink/public/common/logging/logging_utils.h" #include "ui/display/display.h" #include "ui/display/screen.h" diff --git a/shell/browser/ui/inspectable_web_contents_impl.h b/shell/browser/ui/inspectable_web_contents_impl.h index c75a05b6ec..9d1f6d491a 100644 --- a/shell/browser/ui/inspectable_web_contents_impl.h +++ b/shell/browser/ui/inspectable_web_contents_impl.h @@ -13,7 +13,6 @@ #include #include -#include "atom/browser/ui/inspectable_web_contents.h" #include "base/containers/unique_ptr_adapters.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" @@ -22,6 +21,7 @@ #include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" +#include "shell/browser/ui/inspectable_web_contents.h" #include "ui/gfx/geometry/rect.h" class PrefService; diff --git a/shell/browser/ui/inspectable_web_contents_view_delegate.cc b/shell/browser/ui/inspectable_web_contents_view_delegate.cc index eb4ba30d76..ecf1f34a14 100644 --- a/shell/browser/ui/inspectable_web_contents_view_delegate.cc +++ b/shell/browser/ui/inspectable_web_contents_view_delegate.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/inspectable_web_contents_view_delegate.h" +#include "shell/browser/ui/inspectable_web_contents_view_delegate.h" namespace atom { diff --git a/shell/browser/ui/inspectable_web_contents_view_mac.h b/shell/browser/ui/inspectable_web_contents_view_mac.h index 49ff8db367..2f6b70cadd 100644 --- a/shell/browser/ui/inspectable_web_contents_view_mac.h +++ b/shell/browser/ui/inspectable_web_contents_view_mac.h @@ -6,7 +6,7 @@ #ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_ #define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_ -#include "atom/browser/ui/inspectable_web_contents_view.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" #include "base/mac/scoped_nsobject.h" diff --git a/shell/browser/ui/inspectable_web_contents_view_mac.mm b/shell/browser/ui/inspectable_web_contents_view_mac.mm index 838ef9bb23..aad2990f31 100644 --- a/shell/browser/ui/inspectable_web_contents_view_mac.mm +++ b/shell/browser/ui/inspectable_web_contents_view_mac.mm @@ -3,14 +3,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/inspectable_web_contents_view_mac.h" +#include "shell/browser/ui/inspectable_web_contents_view_mac.h" #import -#import "atom/browser/ui/cocoa/atom_inspectable_web_contents_view.h" -#include "atom/browser/ui/inspectable_web_contents.h" -#include "atom/browser/ui/inspectable_web_contents_view_delegate.h" #include "base/strings/sys_string_conversions.h" +#import "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h" +#include "shell/browser/ui/inspectable_web_contents.h" +#include "shell/browser/ui/inspectable_web_contents_view_delegate.h" namespace atom { diff --git a/shell/browser/ui/message_box_gtk.cc b/shell/browser/ui/message_box_gtk.cc index 20993cb18e..46a5aa5e21 100644 --- a/shell/browser/ui/message_box_gtk.cc +++ b/shell/browser/ui/message_box_gtk.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/message_box.h" +#include "shell/browser/ui/message_box.h" #include -#include "atom/browser/browser.h" -#include "atom/browser/native_window_observer.h" -#include "atom/browser/native_window_views.h" -#include "atom/browser/unresponsive_suppressor.h" #include "base/callback.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/libgtkui/gtk_util.h" #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h" +#include "shell/browser/browser.h" +#include "shell/browser/native_window_observer.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/unresponsive_suppressor.h" #include "ui/base/glib/glib_signal.h" #include "ui/gfx/image/image_skia.h" #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" diff --git a/shell/browser/ui/message_box_mac.mm b/shell/browser/ui/message_box_mac.mm index 79e6c370dd..fabb29d817 100644 --- a/shell/browser/ui/message_box_mac.mm +++ b/shell/browser/ui/message_box_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/message_box.h" +#include "shell/browser/ui/message_box.h" #include #include @@ -10,10 +10,10 @@ #import -#include "atom/browser/native_window.h" #include "base/callback.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" +#include "shell/browser/native_window.h" #include "skia/ext/skia_utils_mac.h" #include "ui/gfx/image/image_skia.h" diff --git a/shell/browser/ui/message_box_win.cc b/shell/browser/ui/message_box_win.cc index 0dc96f39dd..006228a379 100644 --- a/shell/browser/ui/message_box_win.cc +++ b/shell/browser/ui/message_box_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/message_box.h" +#include "shell/browser/ui/message_box.h" #include // windows.h must be included first @@ -11,9 +11,6 @@ #include #include -#include "atom/browser/browser.h" -#include "atom/browser/native_window_views.h" -#include "atom/browser/unresponsive_suppressor.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" @@ -21,6 +18,9 @@ #include "base/win/scoped_gdi_object.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#include "shell/browser/browser.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/unresponsive_suppressor.h" #include "ui/gfx/icon_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/shell/browser/ui/tray_icon.cc b/shell/browser/ui/tray_icon.cc index 14b73d93a2..ef09d57d73 100644 --- a/shell/browser/ui/tray_icon.cc +++ b/shell/browser/ui/tray_icon.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/tray_icon.h" +#include "shell/browser/ui/tray_icon.h" namespace atom { diff --git a/shell/browser/ui/tray_icon.h b/shell/browser/ui/tray_icon.h index d39869baea..6527ed228f 100644 --- a/shell/browser/ui/tray_icon.h +++ b/shell/browser/ui/tray_icon.h @@ -8,9 +8,9 @@ #include #include -#include "atom/browser/ui/atom_menu_model.h" -#include "atom/browser/ui/tray_icon_observer.h" #include "base/observer_list.h" +#include "shell/browser/ui/atom_menu_model.h" +#include "shell/browser/ui/tray_icon_observer.h" #include "ui/gfx/geometry/rect.h" namespace atom { diff --git a/shell/browser/ui/tray_icon_cocoa.h b/shell/browser/ui/tray_icon_cocoa.h index 10db5c5532..65806972ed 100644 --- a/shell/browser/ui/tray_icon_cocoa.h +++ b/shell/browser/ui/tray_icon_cocoa.h @@ -9,8 +9,8 @@ #include -#include "atom/browser/ui/tray_icon.h" #include "base/mac/scoped_nsobject.h" +#include "shell/browser/ui/tray_icon.h" @class AtomMenuController; @class StatusItemView; diff --git a/shell/browser/ui/tray_icon_cocoa.mm b/shell/browser/ui/tray_icon_cocoa.mm index 97686fe6a9..130a786e93 100644 --- a/shell/browser/ui/tray_icon_cocoa.mm +++ b/shell/browser/ui/tray_icon_cocoa.mm @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/tray_icon_cocoa.h" +#include "shell/browser/ui/tray_icon_cocoa.h" #include #include -#include "atom/browser/mac/atom_application.h" -#include "atom/browser/ui/cocoa/NSString+ANSI.h" -#include "atom/browser/ui/cocoa/atom_menu_controller.h" #include "base/mac/sdk_forward_declarations.h" #include "base/strings/sys_string_conversions.h" +#include "shell/browser/mac/atom_application.h" +#include "shell/browser/ui/cocoa/NSString+ANSI.h" +#include "shell/browser/ui/cocoa/atom_menu_controller.h" #include "ui/display/screen.h" #include "ui/events/cocoa/cocoa_event_utils.h" #include "ui/gfx/image/image.h" diff --git a/shell/browser/ui/tray_icon_gtk.cc b/shell/browser/ui/tray_icon_gtk.cc index 269ddde820..d10446aaa2 100644 --- a/shell/browser/ui/tray_icon_gtk.cc +++ b/shell/browser/ui/tray_icon_gtk.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/tray_icon_gtk.h" +#include "shell/browser/ui/tray_icon_gtk.h" -#include "atom/browser/browser.h" -#include "atom/common/application_info.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "shell/browser/browser.h" +#include "shell/common/application_info.h" #include "ui/gfx/image/image.h" #include "ui/views/linux_ui/linux_ui.h" diff --git a/shell/browser/ui/tray_icon_gtk.h b/shell/browser/ui/tray_icon_gtk.h index db4382623a..05cdbe8cfe 100644 --- a/shell/browser/ui/tray_icon_gtk.h +++ b/shell/browser/ui/tray_icon_gtk.h @@ -8,7 +8,7 @@ #include #include -#include "atom/browser/ui/tray_icon.h" +#include "shell/browser/ui/tray_icon.h" #include "ui/views/linux_ui/status_icon_linux.h" namespace views { diff --git a/shell/browser/ui/tray_icon_win.cc b/shell/browser/ui/tray_icon_win.cc index 82550013ef..1c0e1f6c0d 100644 --- a/shell/browser/ui/tray_icon_win.cc +++ b/shell/browser/ui/tray_icon_win.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/win/notify_icon.h" -#include "atom/browser/ui/win/notify_icon_host.h" +#include "shell/browser/ui/win/notify_icon.h" +#include "shell/browser/ui/win/notify_icon_host.h" namespace atom { diff --git a/shell/browser/ui/views/atom_views_delegate.cc b/shell/browser/ui/views/atom_views_delegate.cc index 811963c8a0..209c86c4c1 100644 --- a/shell/browser/ui/views/atom_views_delegate.cc +++ b/shell/browser/ui/views/atom_views_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/views/atom_views_delegate.h" +#include "shell/browser/ui/views/atom_views_delegate.h" #include diff --git a/shell/browser/ui/views/autofill_popup_view.cc b/shell/browser/ui/views/autofill_popup_view.cc index fb4766ef4c..5d6baa815a 100644 --- a/shell/browser/ui/views/autofill_popup_view.cc +++ b/shell/browser/ui/views/autofill_popup_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/autofill_popup_view.h" +#include "shell/browser/ui/views/autofill_popup_view.h" #include diff --git a/shell/browser/ui/views/autofill_popup_view.h b/shell/browser/ui/views/autofill_popup_view.h index cf901479a4..87b01e5b89 100644 --- a/shell/browser/ui/views/autofill_popup_view.h +++ b/shell/browser/ui/views/autofill_popup_view.h @@ -7,7 +7,7 @@ #include -#include "atom/browser/ui/autofill_popup.h" +#include "shell/browser/ui/autofill_popup.h" #include "base/optional.h" #include "content/public/browser/native_web_keyboard_event.h" @@ -20,7 +20,7 @@ #include "ui/views/widget/widget_observer.h" #if BUILDFLAG(ENABLE_OSR) -#include "atom/browser/osr/osr_view_proxy.h" +#include "shell/browser/osr/osr_view_proxy.h" #endif namespace atom { diff --git a/shell/browser/ui/views/frameless_view.cc b/shell/browser/ui/views/frameless_view.cc index 9bbc95cdd8..48e4d00550 100644 --- a/shell/browser/ui/views/frameless_view.cc +++ b/shell/browser/ui/views/frameless_view.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/frameless_view.h" +#include "shell/browser/ui/views/frameless_view.h" -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/views/widget/widget.h" diff --git a/shell/browser/ui/views/global_menu_bar_x11.cc b/shell/browser/ui/views/global_menu_bar_x11.cc index 656bd8f991..52f291a086 100644 --- a/shell/browser/ui/views/global_menu_bar_x11.cc +++ b/shell/browser/ui/views/global_menu_bar_x11.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/global_menu_bar_x11.h" +#include "shell/browser/ui/views/global_menu_bar_x11.h" #include #include -#include "atom/browser/native_window_views.h" -#include "atom/browser/ui/atom_menu_model.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" +#include "shell/browser/native_window_views.h" +#include "shell/browser/ui/atom_menu_model.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" diff --git a/shell/browser/ui/views/global_menu_bar_x11.h b/shell/browser/ui/views/global_menu_bar_x11.h index dde466c94e..da2272c2ed 100644 --- a/shell/browser/ui/views/global_menu_bar_x11.h +++ b/shell/browser/ui/views/global_menu_bar_x11.h @@ -7,9 +7,9 @@ #include -#include "atom/browser/ui/atom_menu_model.h" #include "base/compiler_specific.h" #include "base/macros.h" +#include "shell/browser/ui/atom_menu_model.h" #include "ui/base/glib/glib_signal.h" #include "ui/gfx/native_widget_types.h" diff --git a/shell/browser/ui/views/inspectable_web_contents_view_views.cc b/shell/browser/ui/views/inspectable_web_contents_view_views.cc index 8328e50511..f2df627696 100644 --- a/shell/browser/ui/views/inspectable_web_contents_view_views.cc +++ b/shell/browser/ui/views/inspectable_web_contents_view_views.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/ui/views/inspectable_web_contents_view_views.h" +#include "shell/browser/ui/views/inspectable_web_contents_view_views.h" -#include "atom/browser/ui/inspectable_web_contents_delegate.h" -#include "atom/browser/ui/inspectable_web_contents_impl.h" -#include "atom/browser/ui/inspectable_web_contents_view_delegate.h" #include "base/strings/utf_string_conversions.h" +#include "shell/browser/ui/inspectable_web_contents_delegate.h" +#include "shell/browser/ui/inspectable_web_contents_impl.h" +#include "shell/browser/ui/inspectable_web_contents_view_delegate.h" #include "ui/views/controls/label.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/widget/widget.h" diff --git a/shell/browser/ui/views/inspectable_web_contents_view_views.h b/shell/browser/ui/views/inspectable_web_contents_view_views.h index 05336d3e9d..1a1da6b660 100644 --- a/shell/browser/ui/views/inspectable_web_contents_view_views.h +++ b/shell/browser/ui/views/inspectable_web_contents_view_views.h @@ -7,9 +7,9 @@ #include -#include "atom/browser/ui/inspectable_web_contents_view.h" #include "base/compiler_specific.h" #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" +#include "shell/browser/ui/inspectable_web_contents_view.h" #include "ui/views/view.h" namespace views { diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc index 4226090073..2a4d3d4579 100644 --- a/shell/browser/ui/views/menu_bar.cc +++ b/shell/browser/ui/views/menu_bar.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/menu_bar.h" +#include "shell/browser/ui/views/menu_bar.h" #include #include #include -#include "atom/browser/ui/views/submenu_button.h" -#include "atom/common/keyboard_util.h" +#include "shell/browser/ui/views/submenu_button.h" +#include "shell/common/keyboard_util.h" #include "ui/aura/window.h" #include "ui/base/models/menu_model.h" #include "ui/views/background.h" diff --git a/shell/browser/ui/views/menu_bar.h b/shell/browser/ui/views/menu_bar.h index f2c8ea4e03..d9a01cf4fd 100644 --- a/shell/browser/ui/views/menu_bar.h +++ b/shell/browser/ui/views/menu_bar.h @@ -7,9 +7,9 @@ #include -#include "atom/browser/ui/atom_menu_model.h" -#include "atom/browser/ui/views/menu_delegate.h" -#include "atom/browser/ui/views/root_view.h" +#include "shell/browser/ui/atom_menu_model.h" +#include "shell/browser/ui/views/menu_delegate.h" +#include "shell/browser/ui/views/root_view.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/controls/button/menu_button_listener.h" #include "ui/views/focus/focus_manager.h" diff --git a/shell/browser/ui/views/menu_delegate.cc b/shell/browser/ui/views/menu_delegate.cc index d2464cc801..cdb20eac28 100644 --- a/shell/browser/ui/views/menu_delegate.cc +++ b/shell/browser/ui/views/menu_delegate.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/menu_delegate.h" +#include "shell/browser/ui/views/menu_delegate.h" -#include "atom/browser/ui/views/menu_bar.h" -#include "atom/browser/ui/views/menu_model_adapter.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#include "shell/browser/ui/views/menu_bar.h" +#include "shell/browser/ui/views/menu_model_adapter.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/shell/browser/ui/views/menu_delegate.h b/shell/browser/ui/views/menu_delegate.h index cfffce556d..8bf7194669 100644 --- a/shell/browser/ui/views/menu_delegate.h +++ b/shell/browser/ui/views/menu_delegate.h @@ -7,8 +7,8 @@ #include -#include "atom/browser/ui/atom_menu_model.h" #include "base/observer_list.h" +#include "shell/browser/ui/atom_menu_model.h" #include "ui/views/controls/menu/menu_delegate.h" namespace views { diff --git a/shell/browser/ui/views/menu_model_adapter.cc b/shell/browser/ui/views/menu_model_adapter.cc index a3a581724f..0856637f31 100644 --- a/shell/browser/ui/views/menu_model_adapter.cc +++ b/shell/browser/ui/views/menu_model_adapter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/menu_model_adapter.h" +#include "shell/browser/ui/views/menu_model_adapter.h" namespace atom { diff --git a/shell/browser/ui/views/menu_model_adapter.h b/shell/browser/ui/views/menu_model_adapter.h index 05c2c88a7b..4eaae0dad1 100644 --- a/shell/browser/ui/views/menu_model_adapter.h +++ b/shell/browser/ui/views/menu_model_adapter.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_ #define ATOM_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_ -#include "atom/browser/ui/atom_menu_model.h" +#include "shell/browser/ui/atom_menu_model.h" #include "ui/views/controls/menu/menu_model_adapter.h" namespace atom { diff --git a/shell/browser/ui/views/native_frame_view.cc b/shell/browser/ui/views/native_frame_view.cc index 2501373851..4a9acb89f2 100644 --- a/shell/browser/ui/views/native_frame_view.cc +++ b/shell/browser/ui/views/native_frame_view.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/native_frame_view.h" +#include "shell/browser/ui/views/native_frame_view.h" -#include "atom/browser/native_window.h" +#include "shell/browser/native_window.h" namespace atom { diff --git a/shell/browser/ui/views/root_view.cc b/shell/browser/ui/views/root_view.cc index 942514f271..96e5b84b02 100644 --- a/shell/browser/ui/views/root_view.cc +++ b/shell/browser/ui/views/root_view.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/root_view.h" +#include "shell/browser/ui/views/root_view.h" -#include "atom/browser/native_window.h" -#include "atom/browser/ui/views/menu_bar.h" #include "content/public/browser/native_web_keyboard_event.h" +#include "shell/browser/native_window.h" +#include "shell/browser/ui/views/menu_bar.h" namespace atom { diff --git a/shell/browser/ui/views/root_view.h b/shell/browser/ui/views/root_view.h index f0b9b350c0..962c5e5de3 100644 --- a/shell/browser/ui/views/root_view.h +++ b/shell/browser/ui/views/root_view.h @@ -7,7 +7,7 @@ #include -#include "atom/browser/ui/accelerator_util.h" +#include "shell/browser/ui/accelerator_util.h" #include "ui/gfx/geometry/insets.h" #include "ui/views/view.h" #include "ui/views/view_tracker.h" diff --git a/shell/browser/ui/views/submenu_button.cc b/shell/browser/ui/views/submenu_button.cc index 422ef834d3..bf03cba366 100644 --- a/shell/browser/ui/views/submenu_button.cc +++ b/shell/browser/ui/views/submenu_button.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/submenu_button.h" +#include "shell/browser/ui/views/submenu_button.h" #include #include diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc index 8f2139cb90..1c4c427d7c 100644 --- a/shell/browser/ui/views/win_frame_view.cc +++ b/shell/browser/ui/views/win_frame_view.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/views/win_frame_view.h" +#include "shell/browser/ui/views/win_frame_view.h" -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" #include "ui/views/widget/widget.h" #include "ui/views/win/hwnd_util.h" diff --git a/shell/browser/ui/views/win_frame_view.h b/shell/browser/ui/views/win_frame_view.h index a6ffd7f363..cbd7bf0e81 100644 --- a/shell/browser/ui/views/win_frame_view.h +++ b/shell/browser/ui/views/win_frame_view.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_ #define ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_ -#include "atom/browser/ui/views/frameless_view.h" +#include "shell/browser/ui/views/frameless_view.h" namespace atom { diff --git a/shell/browser/ui/webui/pdf_viewer_handler.cc b/shell/browser/ui/webui/pdf_viewer_handler.cc index c5b152f781..0ddebfc563 100644 --- a/shell/browser/ui/webui/pdf_viewer_handler.cc +++ b/shell/browser/ui/webui/pdf_viewer_handler.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/webui/pdf_viewer_handler.h" +#include "shell/browser/ui/webui/pdf_viewer_handler.h" #include #include -#include "atom/common/atom_constants.h" #include "base/bind.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -18,6 +17,7 @@ #include "content/public/common/page_zoom.h" #include "content/public/common/url_constants.h" #include "net/http/http_response_headers.h" +#include "shell/common/atom_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" diff --git a/shell/browser/ui/webui/pdf_viewer_handler.h b/shell/browser/ui/webui/pdf_viewer_handler.h index 7d9d45317f..6ebff3e636 100644 --- a/shell/browser/ui/webui/pdf_viewer_handler.h +++ b/shell/browser/ui/webui/pdf_viewer_handler.h @@ -8,10 +8,10 @@ #include #include -#include "atom/browser/web_contents_zoom_controller.h" #include "base/macros.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/web_ui_message_handler.h" +#include "shell/browser/web_contents_zoom_controller.h" namespace base { class ListValue; diff --git a/shell/browser/ui/webui/pdf_viewer_ui.cc b/shell/browser/ui/webui/pdf_viewer_ui.cc index 49efc4e514..032df63389 100644 --- a/shell/browser/ui/webui/pdf_viewer_ui.cc +++ b/shell/browser/ui/webui/pdf_viewer_ui.cc @@ -2,16 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/webui/pdf_viewer_ui.h" +#include "shell/browser/ui/webui/pdf_viewer_ui.h" #include #include #include -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/loader/layered_resource_handler.h" -#include "atom/browser/ui/webui/pdf_viewer_handler.h" -#include "atom/common/atom_constants.h" #include "base/sequenced_task_runner_helpers.h" #include "base/task/post_task.h" #include "content/browser/loader/resource_dispatcher_host_impl.h" @@ -36,6 +32,10 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "services/network/public/cpp/resource_response.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/loader/layered_resource_handler.h" +#include "shell/browser/ui/webui/pdf_viewer_handler.h" +#include "shell/common/atom_constants.h" #include "ui/base/resource/resource_bundle.h" using content::BrowserThread; diff --git a/shell/browser/ui/win/atom_desktop_native_widget_aura.cc b/shell/browser/ui/win/atom_desktop_native_widget_aura.cc index 9c9aa4fbda..d1457cf96a 100644 --- a/shell/browser/ui/win/atom_desktop_native_widget_aura.cc +++ b/shell/browser/ui/win/atom_desktop_native_widget_aura.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/win/atom_desktop_native_widget_aura.h" +#include "shell/browser/ui/win/atom_desktop_native_widget_aura.h" -#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h" +#include "shell/browser/ui/win/atom_desktop_window_tree_host_win.h" #include "ui/views/corewm/tooltip_controller.h" #include "ui/wm/public/tooltip_client.h" diff --git a/shell/browser/ui/win/atom_desktop_native_widget_aura.h b/shell/browser/ui/win/atom_desktop_native_widget_aura.h index 08f460971c..0c93ab9fc7 100644 --- a/shell/browser/ui/win/atom_desktop_native_widget_aura.h +++ b/shell/browser/ui/win/atom_desktop_native_widget_aura.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_ #define ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_ -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" namespace views { diff --git a/shell/browser/ui/win/atom_desktop_window_tree_host_win.cc b/shell/browser/ui/win/atom_desktop_window_tree_host_win.cc index 8b66fcf950..75b30edaae 100644 --- a/shell/browser/ui/win/atom_desktop_window_tree_host_win.cc +++ b/shell/browser/ui/win/atom_desktop_window_tree_host_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h" +#include "shell/browser/ui/win/atom_desktop_window_tree_host_win.h" namespace atom { diff --git a/shell/browser/ui/win/atom_desktop_window_tree_host_win.h b/shell/browser/ui/win/atom_desktop_window_tree_host_win.h index 87226545b7..875f4b36e0 100644 --- a/shell/browser/ui/win/atom_desktop_window_tree_host_win.h +++ b/shell/browser/ui/win/atom_desktop_window_tree_host_win.h @@ -7,7 +7,7 @@ #include -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" namespace atom { diff --git a/shell/browser/ui/win/jump_list.cc b/shell/browser/ui/win/jump_list.cc index c0f280a60c..c61f6d2b15 100644 --- a/shell/browser/ui/win/jump_list.cc +++ b/shell/browser/ui/win/jump_list.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/win/jump_list.h" +#include "shell/browser/ui/win/jump_list.h" #include // for PKEY_* constants diff --git a/shell/browser/ui/win/notify_icon.cc b/shell/browser/ui/win/notify_icon.cc index 926e30810e..2a4d161927 100644 --- a/shell/browser/ui/win/notify_icon.cc +++ b/shell/browser/ui/win/notify_icon.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/win/notify_icon.h" +#include "shell/browser/ui/win/notify_icon.h" -#include "atom/browser/ui/win/notify_icon_host.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" +#include "shell/browser/ui/win/notify_icon_host.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/display/screen.h" #include "ui/display/win/screen_win.h" diff --git a/shell/browser/ui/win/notify_icon.h b/shell/browser/ui/win/notify_icon.h index 79be5078ed..6447021a58 100644 --- a/shell/browser/ui/win/notify_icon.h +++ b/shell/browser/ui/win/notify_icon.h @@ -12,11 +12,11 @@ #include #include -#include "atom/browser/ui/tray_icon.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/win/scoped_gdi_object.h" +#include "shell/browser/ui/tray_icon.h" namespace gfx { class Point; diff --git a/shell/browser/ui/win/notify_icon_host.cc b/shell/browser/ui/win/notify_icon_host.cc index 435ec050be..34ba2a2981 100644 --- a/shell/browser/ui/win/notify_icon_host.cc +++ b/shell/browser/ui/win/notify_icon_host.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/win/notify_icon_host.h" +#include "shell/browser/ui/win/notify_icon_host.h" #include #include -#include "atom/browser/ui/win/notify_icon.h" #include "base/bind.h" #include "base/stl_util.h" #include "base/win/win_util.h" #include "base/win/wrapped_window_proc.h" +#include "shell/browser/ui/win/notify_icon.h" #include "ui/events/event_constants.h" #include "ui/events/win/system_event_state_lookup.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/shell/browser/ui/win/taskbar_host.cc b/shell/browser/ui/win/taskbar_host.cc index b15729cba5..1e362f376b 100644 --- a/shell/browser/ui/win/taskbar_host.cc +++ b/shell/browser/ui/win/taskbar_host.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/win/taskbar_host.h" +#include "shell/browser/ui/win/taskbar_host.h" #include #include -#include "atom/browser/native_window.h" #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" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/display/win/screen_win.h" #include "ui/gfx/icon_util.h" diff --git a/shell/browser/ui/win/taskbar_host.h b/shell/browser/ui/win/taskbar_host.h index 2182d377a7..e3548af1ef 100644 --- a/shell/browser/ui/win/taskbar_host.h +++ b/shell/browser/ui/win/taskbar_host.h @@ -12,8 +12,8 @@ #include #include -#include "atom/browser/native_window.h" #include "base/callback.h" +#include "shell/browser/native_window.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image.h" diff --git a/shell/browser/ui/x/event_disabler.cc b/shell/browser/ui/x/event_disabler.cc index 2e2ebd9729..2c357b158f 100644 --- a/shell/browser/ui/x/event_disabler.cc +++ b/shell/browser/ui/x/event_disabler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/x/event_disabler.h" +#include "shell/browser/ui/x/event_disabler.h" #include diff --git a/shell/browser/ui/x/window_state_watcher.cc b/shell/browser/ui/x/window_state_watcher.cc index 9eebc361d7..2eef3f43fa 100644 --- a/shell/browser/ui/x/window_state_watcher.cc +++ b/shell/browser/ui/x/window_state_watcher.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/x/window_state_watcher.h" +#include "shell/browser/ui/x/window_state_watcher.h" #include "ui/events/platform/platform_event_source.h" #include "ui/gfx/x/x11.h" diff --git a/shell/browser/ui/x/window_state_watcher.h b/shell/browser/ui/x/window_state_watcher.h index 7d65b08d8b..2c0042d77c 100644 --- a/shell/browser/ui/x/window_state_watcher.h +++ b/shell/browser/ui/x/window_state_watcher.h @@ -7,7 +7,7 @@ #include "ui/events/platform/platform_event_observer.h" -#include "atom/browser/native_window_views.h" +#include "shell/browser/native_window_views.h" namespace atom { diff --git a/shell/browser/ui/x/x_window_utils.cc b/shell/browser/ui/x/x_window_utils.cc index 410c54e34a..906e8c46c3 100644 --- a/shell/browser/ui/x/x_window_utils.cc +++ b/shell/browser/ui/x/x_window_utils.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/ui/x/x_window_utils.h" +#include "shell/browser/ui/x/x_window_utils.h" #include #include diff --git a/shell/browser/unresponsive_suppressor.cc b/shell/browser/unresponsive_suppressor.cc index 89bfa6b900..a37f205b44 100644 --- a/shell/browser/unresponsive_suppressor.cc +++ b/shell/browser/unresponsive_suppressor.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/unresponsive_suppressor.h" +#include "shell/browser/unresponsive_suppressor.h" namespace atom { diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc index 9fd57d213b..26efbb5413 100644 --- a/shell/browser/web_contents_permission_helper.cc +++ b/shell/browser/web_contents_permission_helper.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/web_contents_permission_helper.h" +#include "shell/browser/web_contents_permission_helper.h" #include #include #include -#include "atom/browser/atom_permission_manager.h" -#include "atom/browser/media/media_stream_devices_controller.h" -#include "atom/common/native_mate_converters/gurl_converter.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" +#include "shell/browser/atom_permission_manager.h" +#include "shell/browser/media/media_stream_devices_controller.h" +#include "shell/common/native_mate_converters/gurl_converter.h" namespace { diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc index b7032f72b3..b2f0c8bf76 100644 --- a/shell/browser/web_contents_preferences.cc +++ b/shell/browser/web_contents_preferences.cc @@ -2,17 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/web_contents_preferences.h" +#include "shell/browser/web_contents_preferences.h" #include #include #include #include -#include "atom/browser/native_window.h" -#include "atom/browser/web_view_manager.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" @@ -25,6 +21,10 @@ #include "native_mate/dictionary.h" #include "net/base/filename_util.h" #include "services/service_manager/sandbox/switches.h" +#include "shell/browser/native_window.h" +#include "shell/browser/web_view_manager.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/options_switches.h" #if defined(OS_WIN) #include "ui/gfx/switches.h" diff --git a/shell/browser/web_contents_zoom_controller.cc b/shell/browser/web_contents_zoom_controller.cc index a8892584e9..beebdb5e03 100644 --- a/shell/browser/web_contents_zoom_controller.cc +++ b/shell/browser/web_contents_zoom_controller.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/web_contents_zoom_controller.h" +#include "shell/browser/web_contents_zoom_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" diff --git a/shell/browser/web_dialog_helper.cc b/shell/browser/web_dialog_helper.cc index 3785c099fe..00912823aa 100644 --- a/shell/browser/web_dialog_helper.cc +++ b/shell/browser/web_dialog_helper.cc @@ -2,16 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/web_dialog_helper.h" +#include "shell/browser/web_dialog_helper.h" #include #include #include -#include "atom/browser/atom_browser_context.h" -#include "atom/browser/native_window.h" -#include "atom/browser/ui/file_dialog.h" -#include "atom/common/native_mate_converters/once_callback.h" #include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" @@ -26,6 +22,10 @@ #include "content/public/browser/web_contents_observer.h" #include "native_mate/dictionary.h" #include "net/base/mime_util.h" +#include "shell/browser/atom_browser_context.h" +#include "shell/browser/native_window.h" +#include "shell/browser/ui/file_dialog.h" +#include "shell/common/native_mate_converters/once_callback.h" #include "ui/shell_dialogs/selected_file_info.h" using blink::mojom::FileChooserFileInfo; diff --git a/shell/browser/web_view_guest_delegate.cc b/shell/browser/web_view_guest_delegate.cc index d2952938d2..8f60f563e9 100644 --- a/shell/browser/web_view_guest_delegate.cc +++ b/shell/browser/web_view_guest_delegate.cc @@ -2,12 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/web_view_guest_delegate.h" +#include "shell/browser/web_view_guest_delegate.h" #include -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/common/native_mate_converters/gurl_converter.h" #include "content/browser/web_contents/web_contents_impl.h" // nogncheck #include "content/public/browser/navigation_handle.h" #include "content/public/browser/render_frame_host.h" @@ -15,6 +13,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/common/native_mate_converters/gurl_converter.h" namespace atom { diff --git a/shell/browser/web_view_guest_delegate.h b/shell/browser/web_view_guest_delegate.h index 6d9f440588..7162ff6598 100644 --- a/shell/browser/web_view_guest_delegate.h +++ b/shell/browser/web_view_guest_delegate.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_ #define ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_ -#include "atom/browser/web_contents_zoom_controller.h" #include "content/public/browser/browser_plugin_guest_delegate.h" +#include "shell/browser/web_contents_zoom_controller.h" namespace atom { diff --git a/shell/browser/web_view_manager.cc b/shell/browser/web_view_manager.cc index 9448f58d51..fb5edcfa20 100644 --- a/shell/browser/web_view_manager.cc +++ b/shell/browser/web_view_manager.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/web_view_manager.h" +#include "shell/browser/web_view_manager.h" -#include "atom/browser/atom_browser_context.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" +#include "shell/browser/atom_browser_context.h" namespace atom { diff --git a/shell/browser/win/scoped_hstring.cc b/shell/browser/win/scoped_hstring.cc index 437e45f512..024c5626a9 100644 --- a/shell/browser/win/scoped_hstring.cc +++ b/shell/browser/win/scoped_hstring.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "atom/browser/win/scoped_hstring.h" +#include "shell/browser/win/scoped_hstring.h" #include diff --git a/shell/browser/window_list.cc b/shell/browser/window_list.cc index 97561d16f3..d3490a69c0 100644 --- a/shell/browser/window_list.cc +++ b/shell/browser/window_list.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/browser/window_list.h" +#include "shell/browser/window_list.h" #include -#include "atom/browser/native_window.h" -#include "atom/browser/window_list_observer.h" #include "base/logging.h" +#include "shell/browser/native_window.h" +#include "shell/browser/window_list_observer.h" namespace atom { diff --git a/shell/browser/zoom_level_delegate.cc b/shell/browser/zoom_level_delegate.cc index 7fd77207bd..7cdffac2c1 100644 --- a/shell/browser/zoom_level_delegate.cc +++ b/shell/browser/zoom_level_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "atom/browser/zoom_level_delegate.h" +#include "shell/browser/zoom_level_delegate.h" #include #include diff --git a/shell/common/api/atom_api_asar.cc b/shell/common/api/atom_api_asar.cc index d17a55dd67..2de787ce50 100644 --- a/shell/common/api/atom_api_asar.cc +++ b/shell/common/api/atom_api_asar.cc @@ -6,14 +6,14 @@ #include -#include "atom/common/asar/archive.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/node_includes.h" #include "native_mate/arguments.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "native_mate/wrappable.h" +#include "shell/common/asar/archive.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/node_includes.h" #include "third_party/electron_node/src/node_native_module.h" namespace { diff --git a/shell/common/api/atom_api_clipboard.cc b/shell/common/api/atom_api_clipboard.cc index 276420a81e..2d746ff000 100644 --- a/shell/common/api/atom_api_clipboard.cc +++ b/shell/common/api/atom_api_clipboard.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/atom_api_clipboard.h" +#include "shell/common/api/atom_api_clipboard.h" -#include "atom/common/native_mate_converters/image_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" #include "base/strings/utf_string_conversions.h" +#include "shell/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkPixmap.h" diff --git a/shell/common/api/atom_api_clipboard_mac.mm b/shell/common/api/atom_api_clipboard_mac.mm index 3caec2c1dd..f683d7dcc6 100644 --- a/shell/common/api/atom_api_clipboard_mac.mm +++ b/shell/common/api/atom_api_clipboard_mac.mm @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/atom_api_clipboard.h" #include "base/strings/sys_string_conversions.h" +#include "shell/common/api/atom_api_clipboard.h" #include "ui/base/cocoa/find_pasteboard.h" namespace atom { diff --git a/shell/common/api/atom_api_command_line.cc b/shell/common/api/atom_api_command_line.cc index dc35dfef8e..9a00c2b447 100644 --- a/shell/common/api/atom_api_command_line.cc +++ b/shell/common/api/atom_api_command_line.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/strings/string_util.h" #include "native_mate/converter.h" #include "native_mate/dictionary.h" #include "services/network/public/cpp/network_switches.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" namespace { diff --git a/shell/common/api/atom_api_crash_reporter.cc b/shell/common/api/atom_api_crash_reporter.cc index 7bc05148ed..e53104f115 100644 --- a/shell/common/api/atom_api_crash_reporter.cc +++ b/shell/common/api/atom_api_crash_reporter.cc @@ -5,15 +5,15 @@ #include #include -#include "atom/common/crash_reporter/crash_reporter.h" -#include "atom/common/gin_util.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/map_converter.h" #include "base/bind.h" #include "gin/data_object_builder.h" #include "gin/dictionary.h" +#include "shell/common/crash_reporter/crash_reporter.h" +#include "shell/common/gin_util.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/map_converter.h" -#include "atom/common/node_includes.h" +#include "shell/common/node_includes.h" using crash_reporter::CrashReporter; diff --git a/shell/common/api/atom_api_key_weak_map.h b/shell/common/api/atom_api_key_weak_map.h index 14c249e219..e585cbceba 100644 --- a/shell/common/api/atom_api_key_weak_map.h +++ b/shell/common/api/atom_api_key_weak_map.h @@ -5,10 +5,10 @@ #ifndef ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_ #define ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_ -#include "atom/common/key_weak_map.h" #include "native_mate/handle.h" #include "native_mate/object_template_builder.h" #include "native_mate/wrappable.h" +#include "shell/common/key_weak_map.h" namespace atom { diff --git a/shell/common/api/atom_api_native_image.cc b/shell/common/api/atom_api_native_image.cc index 29203fe115..2ad381dcb4 100644 --- a/shell/common/api/atom_api_native_image.cc +++ b/shell/common/api/atom_api_native_image.cc @@ -2,25 +2,25 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/atom_api_native_image.h" +#include "shell/common/api/atom_api_native_image.h" #include #include #include #include -#include "atom/common/asar/asar_util.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" #include "base/files/file_util.h" #include "base/strings/pattern.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h" #include "native_mate/object_template_builder.h" #include "net/base/data_url.h" +#include "shell/common/asar/asar_util.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkPixelRef.h" @@ -34,8 +34,8 @@ #include "ui/gfx/image/image_util.h" #if defined(OS_WIN) -#include "atom/common/asar/archive.h" #include "base/win/scoped_gdi_object.h" +#include "shell/common/asar/archive.h" #include "ui/gfx/icon_util.h" #endif diff --git a/shell/common/api/atom_api_native_image_mac.mm b/shell/common/api/atom_api_native_image_mac.mm index 96a652e4a6..3b54176509 100644 --- a/shell/common/api/atom_api_native_image_mac.mm +++ b/shell/common/api/atom_api_native_image_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/atom_api_native_image.h" +#include "shell/common/api/atom_api_native_image.h" #include #include diff --git a/shell/common/api/atom_api_shell.cc b/shell/common/api/atom_api_shell.cc index e1e61a2ae1..b4fe0ed352 100644 --- a/shell/common/api/atom_api_shell.cc +++ b/shell/common/api/atom_api_shell.cc @@ -4,14 +4,14 @@ #include -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/platform_util.h" -#include "atom/common/promise_util.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/platform_util.h" +#include "shell/common/promise_util.h" #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" diff --git a/shell/common/api/atom_api_v8_util.cc b/shell/common/api/atom_api_v8_util.cc index a685a0e59c..4ef1be8eee 100644 --- a/shell/common/api/atom_api_v8_util.cc +++ b/shell/common/api/atom_api_v8_util.cc @@ -5,14 +5,14 @@ #include #include -#include "atom/common/api/atom_api_key_weak_map.h" -#include "atom/common/api/remote_callback_freer.h" -#include "atom/common/api/remote_object_freer.h" -#include "atom/common/native_mate_converters/content_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/node_includes.h" #include "base/hash/hash.h" #include "native_mate/dictionary.h" +#include "shell/common/api/atom_api_key_weak_map.h" +#include "shell/common/api/remote_callback_freer.h" +#include "shell/common/api/remote_object_freer.h" +#include "shell/common/native_mate_converters/content_converter.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/node_includes.h" #include "url/origin.h" #include "v8/include/v8-profiler.h" diff --git a/shell/common/api/electron_bindings.cc b/shell/common/api/electron_bindings.cc index 42fb30366f..1a06321963 100644 --- a/shell/common/api/electron_bindings.cc +++ b/shell/common/api/electron_bindings.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/electron_bindings.h" +#include "shell/common/api/electron_bindings.h" #include #include @@ -10,14 +10,6 @@ #include #include -#include "atom/browser/browser.h" -#include "atom/common/api/locker.h" -#include "atom/common/application_info.h" -#include "atom/common/heap_snapshot.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/promise_util.h" #include "base/logging.h" #include "base/process/process.h" #include "base/process/process_handle.h" @@ -29,6 +21,14 @@ #include "native_mate/dictionary.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/global_memory_dump.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" +#include "shell/browser/browser.h" +#include "shell/common/api/locker.h" +#include "shell/common/application_info.h" +#include "shell/common/heap_snapshot.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/promise_util.h" #include "third_party/blink/renderer/platform/heap/process_heap.h" // nogncheck namespace atom { diff --git a/shell/common/api/electron_bindings.h b/shell/common/api/electron_bindings.h index 10b4018916..5ac970eae7 100644 --- a/shell/common/api/electron_bindings.h +++ b/shell/common/api/electron_bindings.h @@ -8,13 +8,13 @@ #include #include -#include "atom/common/promise_util.h" #include "base/files/file_path.h" #include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "base/process/process_metrics.h" #include "base/strings/string16.h" #include "native_mate/arguments.h" +#include "shell/common/promise_util.h" #include "uv.h" // NOLINT(build/include) #include "v8/include/v8.h" diff --git a/shell/common/api/event_emitter_caller.cc b/shell/common/api/event_emitter_caller.cc index a3b9187d68..6288da03ea 100644 --- a/shell/common/api/event_emitter_caller.cc +++ b/shell/common/api/event_emitter_caller.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/event_emitter_caller.h" +#include "shell/common/api/event_emitter_caller.h" -#include "atom/common/api/locker.h" -#include "atom/common/node_includes.h" +#include "shell/common/api/locker.h" +#include "shell/common/node_includes.h" namespace mate { diff --git a/shell/common/api/event_emitter_caller.h b/shell/common/api/event_emitter_caller.h index fc9a88e09f..fe23c042d8 100644 --- a/shell/common/api/event_emitter_caller.h +++ b/shell/common/api/event_emitter_caller.h @@ -8,8 +8,8 @@ #include #include -#include "atom/common/native_mate_converters/string16_converter.h" #include "native_mate/converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" namespace mate { diff --git a/shell/common/api/features.cc b/shell/common/api/features.cc index 0552f7f17d..e08102938b 100644 --- a/shell/common/api/features.cc +++ b/shell/common/api/features.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/node_includes.h" #include "electron/buildflags/buildflags.h" #include "native_mate/dictionary.h" #include "printing/buildflags/buildflags.h" +#include "shell/common/node_includes.h" namespace { diff --git a/shell/common/api/locker.cc b/shell/common/api/locker.cc index 0ae695a1f0..b5c5b9f515 100644 --- a/shell/common/api/locker.cc +++ b/shell/common/api/locker.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE.chromium file. -#include "atom/common/api/locker.h" +#include "shell/common/api/locker.h" namespace mate { diff --git a/shell/common/api/object_life_monitor.cc b/shell/common/api/object_life_monitor.cc index 4f83a76cf6..5f6d77e221 100644 --- a/shell/common/api/object_life_monitor.cc +++ b/shell/common/api/object_life_monitor.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/object_life_monitor.h" +#include "shell/common/api/object_life_monitor.h" #include "base/bind.h" #include "base/message_loop/message_loop.h" diff --git a/shell/common/api/remote_callback_freer.cc b/shell/common/api/remote_callback_freer.cc index 561b625d24..b47169314c 100644 --- a/shell/common/api/remote_callback_freer.cc +++ b/shell/common/api/remote_callback_freer.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/remote_callback_freer.h" +#include "shell/common/api/remote_callback_freer.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" namespace atom { diff --git a/shell/common/api/remote_callback_freer.h b/shell/common/api/remote_callback_freer.h index d0a05d9fa8..988b6a0428 100644 --- a/shell/common/api/remote_callback_freer.h +++ b/shell/common/api/remote_callback_freer.h @@ -7,8 +7,8 @@ #include -#include "atom/common/api/object_life_monitor.h" #include "content/public/browser/web_contents_observer.h" +#include "shell/common/api/object_life_monitor.h" namespace atom { diff --git a/shell/common/api/remote_object_freer.cc b/shell/common/api/remote_object_freer.cc index c2f7078013..a74e9249c9 100644 --- a/shell/common/api/remote_object_freer.cc +++ b/shell/common/api/remote_object_freer.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/api/remote_object_freer.h" +#include "shell/common/api/remote_object_freer.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/public/renderer/render_frame.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/shell/common/api/remote_object_freer.h b/shell/common/api/remote_object_freer.h index b89ff388d3..0405d3cb5c 100644 --- a/shell/common/api/remote_object_freer.h +++ b/shell/common/api/remote_object_freer.h @@ -8,7 +8,7 @@ #include #include -#include "atom/common/api/object_life_monitor.h" +#include "shell/common/api/object_life_monitor.h" namespace atom { diff --git a/shell/common/application_info.cc b/shell/common/application_info.cc index 06b6a11197..71b724355f 100644 --- a/shell/common/application_info.cc +++ b/shell/common/application_info.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/application_info.h" +#include "shell/common/application_info.h" -#include "atom/browser/browser.h" #include "base/no_destructor.h" #include "base/strings/stringprintf.h" #include "chrome/common/chrome_version.h" #include "content/public/common/user_agent.h" #include "electron/electron_version.h" +#include "shell/browser/browser.h" namespace atom { diff --git a/shell/common/application_info.h b/shell/common/application_info.h index f899d3583d..8e55d2d556 100644 --- a/shell/common/application_info.h +++ b/shell/common/application_info.h @@ -6,8 +6,8 @@ #define ATOM_COMMON_APPLICATION_INFO_H_ #if defined(OS_WIN) -#include "atom/browser/win/scoped_hstring.h" #include "base/strings/string16.h" +#include "shell/browser/win/scoped_hstring.h" #endif #include diff --git a/shell/common/application_info_linux.cc b/shell/common/application_info_linux.cc index fa16ded4dc..d0a5bfde54 100644 --- a/shell/common/application_info_linux.cc +++ b/shell/common/application_info_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/application_info.h" +#include "shell/common/application_info.h" #include #include @@ -10,11 +10,11 @@ #include #include -#include "atom/common/platform_util.h" #include "base/environment.h" #include "base/logging.h" #include "chrome/browser/ui/libgtkui/gtk_util.h" #include "electron/electron_version.h" +#include "shell/common/platform_util.h" namespace { diff --git a/shell/common/application_info_mac.mm b/shell/common/application_info_mac.mm index 7ce72c1035..be08595dcf 100644 --- a/shell/common/application_info_mac.mm +++ b/shell/common/application_info_mac.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#import "atom/common/application_info.h" +#import "shell/common/application_info.h" #include -#import "atom/common/mac/main_application_bundle.h" #import "base/mac/foundation_util.h" #import "base/strings/sys_string_conversions.h" +#import "shell/common/mac/main_application_bundle.h" namespace atom { diff --git a/shell/common/application_info_win.cc b/shell/common/application_info_win.cc index a6f4e939f4..bb902b031f 100644 --- a/shell/common/application_info_win.cc +++ b/shell/common/application_info_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/application_info.h" +#include "shell/common/application_info.h" #include // windows.h must be included first @@ -12,11 +12,11 @@ #include -#include "atom/browser/win/scoped_hstring.h" #include "base/file_version_info.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "shell/browser/win/scoped_hstring.h" namespace atom { diff --git a/shell/common/asar/archive.cc b/shell/common/asar/archive.cc index 1da683c213..1e240b3cb7 100644 --- a/shell/common/asar/archive.cc +++ b/shell/common/asar/archive.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/asar/archive.h" +#include "shell/common/asar/archive.h" #include #include #include -#include "atom/common/asar/scoped_temporary_file.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" @@ -18,6 +17,7 @@ #include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" +#include "shell/common/asar/scoped_temporary_file.h" #if defined(OS_WIN) #include diff --git a/shell/common/asar/asar_util.cc b/shell/common/asar/asar_util.cc index b564a75dc7..62f0b9bc12 100644 --- a/shell/common/asar/asar_util.cc +++ b/shell/common/asar/asar_util.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/asar/asar_util.h" +#include "shell/common/asar/asar_util.h" #include #include -#include "atom/common/asar/archive.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/stl_util.h" #include "base/threading/thread_local.h" +#include "shell/common/asar/archive.h" namespace asar { diff --git a/shell/common/asar/scoped_temporary_file.cc b/shell/common/asar/scoped_temporary_file.cc index f96eabc7a6..e663f1bee8 100644 --- a/shell/common/asar/scoped_temporary_file.cc +++ b/shell/common/asar/scoped_temporary_file.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/asar/scoped_temporary_file.h" +#include "shell/common/asar/scoped_temporary_file.h" #include diff --git a/shell/common/atom_command_line.cc b/shell/common/atom_command_line.cc index 287e43f75f..a46291d1f0 100644 --- a/shell/common/atom_command_line.cc +++ b/shell/common/atom_command_line.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/atom_command_line.h" +#include "shell/common/atom_command_line.h" #include "base/command_line.h" #include "uv.h" // NOLINT(build/include) diff --git a/shell/common/atom_constants.cc b/shell/common/atom_constants.cc index 4d4c596ced..6f7374a99f 100644 --- a/shell/common/atom_constants.cc +++ b/shell/common/atom_constants.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/atom_constants.h" +#include "shell/common/atom_constants.h" namespace atom { diff --git a/shell/common/color_util.cc b/shell/common/color_util.cc index 9e357c39d0..2c65a331fc 100644 --- a/shell/common/color_util.cc +++ b/shell/common/color_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/color_util.h" +#include "shell/common/color_util.h" #include diff --git a/shell/common/crash_reporter/crash_reporter.cc b/shell/common/crash_reporter/crash_reporter.cc index 93d8df1930..8442682595 100644 --- a/shell/common/crash_reporter/crash_reporter.cc +++ b/shell/common/crash_reporter/crash_reporter.cc @@ -2,14 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/crash_reporter/crash_reporter.h" +#include "shell/common/crash_reporter/crash_reporter.h" #include -#include "atom/browser/browser.h" -#include "atom/common/atom_constants.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/map_converter.h" #include "base/command_line.h" #include "base/environment.h" #include "base/files/file_util.h" @@ -18,6 +14,10 @@ #include "base/threading/thread_restrictions.h" #include "content/public/common/content_switches.h" #include "electron/electron_version.h" +#include "shell/browser/browser.h" +#include "shell/common/atom_constants.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/map_converter.h" namespace crash_reporter { diff --git a/shell/common/crash_reporter/crash_reporter_crashpad.cc b/shell/common/crash_reporter/crash_reporter_crashpad.cc index 87265ed0b0..979e627034 100644 --- a/shell/common/crash_reporter/crash_reporter_crashpad.cc +++ b/shell/common/crash_reporter/crash_reporter_crashpad.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/crash_reporter/crash_reporter_crashpad.h" +#include "shell/common/crash_reporter/crash_reporter_crashpad.h" #include #include diff --git a/shell/common/crash_reporter/crash_reporter_crashpad.h b/shell/common/crash_reporter/crash_reporter_crashpad.h index bd721d5337..1baf7e441d 100644 --- a/shell/common/crash_reporter/crash_reporter_crashpad.h +++ b/shell/common/crash_reporter/crash_reporter_crashpad.h @@ -10,9 +10,9 @@ #include #include -#include "atom/common/crash_reporter/crash_reporter.h" #include "base/compiler_specific.h" #include "base/strings/string_piece.h" +#include "shell/common/crash_reporter/crash_reporter.h" #include "third_party/crashpad/crashpad/client/crash_report_database.h" #include "third_party/crashpad/crashpad/client/simple_string_dictionary.h" diff --git a/shell/common/crash_reporter/crash_reporter_linux.cc b/shell/common/crash_reporter/crash_reporter_linux.cc index c293cdcbdf..68223844f1 100644 --- a/shell/common/crash_reporter/crash_reporter_linux.cc +++ b/shell/common/crash_reporter/crash_reporter_linux.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/crash_reporter/crash_reporter_linux.h" +#include "shell/common/crash_reporter/crash_reporter_linux.h" #include #include diff --git a/shell/common/crash_reporter/crash_reporter_linux.h b/shell/common/crash_reporter/crash_reporter_linux.h index 0f22d553c1..05e0105ddf 100644 --- a/shell/common/crash_reporter/crash_reporter_linux.h +++ b/shell/common/crash_reporter/crash_reporter_linux.h @@ -8,9 +8,9 @@ #include #include -#include "atom/common/crash_reporter/crash_reporter.h" -#include "atom/common/crash_reporter/linux/crash_dump_handler.h" #include "base/compiler_specific.h" +#include "shell/common/crash_reporter/crash_reporter.h" +#include "shell/common/crash_reporter/linux/crash_dump_handler.h" namespace base { template diff --git a/shell/common/crash_reporter/crash_reporter_mac.h b/shell/common/crash_reporter/crash_reporter_mac.h index d1b4bcbc33..dc5b49f4bb 100644 --- a/shell/common/crash_reporter/crash_reporter_mac.h +++ b/shell/common/crash_reporter/crash_reporter_mac.h @@ -8,7 +8,7 @@ #include #include -#include "atom/common/crash_reporter/crash_reporter_crashpad.h" +#include "shell/common/crash_reporter/crash_reporter_crashpad.h" namespace base { template diff --git a/shell/common/crash_reporter/crash_reporter_mac.mm b/shell/common/crash_reporter/crash_reporter_mac.mm index 3da73d0944..5a6bc8bcee 100644 --- a/shell/common/crash_reporter/crash_reporter_mac.mm +++ b/shell/common/crash_reporter/crash_reporter_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/crash_reporter/crash_reporter_mac.h" +#include "shell/common/crash_reporter/crash_reporter_mac.h" #include #include diff --git a/shell/common/crash_reporter/crash_reporter_win.cc b/shell/common/crash_reporter/crash_reporter_win.cc index 6d48b9533c..18e428b90e 100644 --- a/shell/common/crash_reporter/crash_reporter_win.cc +++ b/shell/common/crash_reporter/crash_reporter_win.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/crash_reporter/crash_reporter_win.h" +#include "shell/common/crash_reporter/crash_reporter_win.h" #include #include -#include "atom/browser/ui/inspectable_web_contents_impl.h" -#include "atom/common/atom_constants.h" #include "base/environment.h" #include "base/memory/singleton.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" +#include "shell/browser/ui/inspectable_web_contents_impl.h" +#include "shell/common/atom_constants.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/crashpad/crashpad/client/crashpad_client.h" #include "third_party/crashpad/crashpad/client/crashpad_info.h" diff --git a/shell/common/crash_reporter/crash_reporter_win.h b/shell/common/crash_reporter/crash_reporter_win.h index f41385de37..aca1dead67 100644 --- a/shell/common/crash_reporter/crash_reporter_win.h +++ b/shell/common/crash_reporter/crash_reporter_win.h @@ -8,7 +8,7 @@ #include #include -#include "atom/common/crash_reporter/crash_reporter_crashpad.h" +#include "shell/common/crash_reporter/crash_reporter_crashpad.h" #include "third_party/crashpad/crashpad/client/crashpad_client.h" namespace base { diff --git a/shell/common/crash_reporter/linux/crash_dump_handler.cc b/shell/common/crash_reporter/linux/crash_dump_handler.cc index 8b0e3de5ce..1892677e40 100644 --- a/shell/common/crash_reporter/linux/crash_dump_handler.cc +++ b/shell/common/crash_reporter/linux/crash_dump_handler.cc @@ -6,7 +6,7 @@ // For linux_syscall_support.h. This makes it safe to call embedded system // calls when in seccomp mode. -#include "atom/common/crash_reporter/linux/crash_dump_handler.h" +#include "shell/common/crash_reporter/linux/crash_dump_handler.h" #include diff --git a/shell/common/crash_reporter/win/crash_service.cc b/shell/common/crash_reporter/win/crash_service.cc index a05db72208..c5589dd2e9 100644 --- a/shell/common/crash_reporter/win/crash_service.cc +++ b/shell/common/crash_reporter/win/crash_service.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/crash_reporter/win/crash_service.h" +#include "shell/common/crash_reporter/win/crash_service.h" #include diff --git a/shell/common/crash_reporter/win/crash_service_main.cc b/shell/common/crash_reporter/win/crash_service_main.cc index 99caaaa391..ce7fa8dc06 100644 --- a/shell/common/crash_reporter/win/crash_service_main.cc +++ b/shell/common/crash_reporter/win/crash_service_main.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/crash_reporter/win/crash_service_main.h" +#include "shell/common/crash_reporter/win/crash_service_main.h" #include -#include "atom/common/crash_reporter/crash_reporter.h" -#include "atom/common/crash_reporter/win/crash_service.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "shell/common/crash_reporter/crash_reporter.h" +#include "shell/common/crash_reporter/win/crash_service.h" #include "third_party/crashpad/crashpad/handler/handler_main.h" namespace crash_service { diff --git a/shell/common/deprecate_util.cc b/shell/common/deprecate_util.cc index ecc866c1d8..ecb3892694 100644 --- a/shell/common/deprecate_util.cc +++ b/shell/common/deprecate_util.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/deprecate_util.h" +#include "shell/common/deprecate_util.h" -#include "atom/common/native_mate_converters/callback.h" #include "base/callback.h" #include "native_mate/converter.h" #include "native_mate/dictionary.h" +#include "shell/common/native_mate_converters/callback.h" namespace atom { diff --git a/shell/common/deprecate_util.h b/shell/common/deprecate_util.h index 8359933f14..2aaaa96cc8 100644 --- a/shell/common/deprecate_util.h +++ b/shell/common/deprecate_util.h @@ -7,7 +7,7 @@ #include -#include "atom/common/node_includes.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/common/heap_snapshot.cc b/shell/common/heap_snapshot.cc index bb36e98f59..6e6538b9df 100644 --- a/shell/common/heap_snapshot.cc +++ b/shell/common/heap_snapshot.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/heap_snapshot.h" +#include "shell/common/heap_snapshot.h" #include "v8/include/v8-profiler.h" diff --git a/shell/common/keyboard_util.cc b/shell/common/keyboard_util.cc index 35034a5002..c82435b528 100644 --- a/shell/common/keyboard_util.cc +++ b/shell/common/keyboard_util.cc @@ -4,9 +4,9 @@ #include -#include "atom/common/keyboard_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" +#include "shell/common/keyboard_util.h" #include "third_party/blink/public/platform/web_input_event.h" #include "ui/events/event_constants.h" diff --git a/shell/common/mac/main_application_bundle.mm b/shell/common/mac/main_application_bundle.mm index 6971424e9c..19e701402f 100644 --- a/shell/common/mac/main_application_bundle.mm +++ b/shell/common/mac/main_application_bundle.mm @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#import "atom/common/mac/main_application_bundle.h" +#import "shell/common/mac/main_application_bundle.h" #include "base/files/file_path.h" #include "base/mac/bundle_locations.h" diff --git a/shell/common/mouse_util.cc b/shell/common/mouse_util.cc index d87be5b504..7e4d0214fb 100644 --- a/shell/common/mouse_util.cc +++ b/shell/common/mouse_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/mouse_util.h" +#include "shell/common/mouse_util.h" #include using Cursor = blink::WebCursorInfo::Type; diff --git a/shell/common/native_mate_converters/accelerator_converter.cc b/shell/common/native_mate_converters/accelerator_converter.cc index 0958308871..7b33caca06 100644 --- a/shell/common/native_mate_converters/accelerator_converter.cc +++ b/shell/common/native_mate_converters/accelerator_converter.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/accelerator_converter.h" +#include "shell/common/native_mate_converters/accelerator_converter.h" #include -#include "atom/browser/ui/accelerator_util.h" +#include "shell/browser/ui/accelerator_util.h" namespace mate { diff --git a/shell/common/native_mate_converters/blink_converter.cc b/shell/common/native_mate_converters/blink_converter.cc index 5bee5df33f..9724219b81 100644 --- a/shell/common/native_mate_converters/blink_converter.cc +++ b/shell/common/native_mate_converters/blink_converter.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/blink_converter.h" +#include "shell/common/native_mate_converters/blink_converter.h" #include #include #include -#include "atom/common/keyboard_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/native_web_keyboard_event.h" #include "gin/converter.h" #include "native_mate/dictionary.h" +#include "shell/common/keyboard_util.h" #include "third_party/blink/public/platform/web_input_event.h" #include "third_party/blink/public/platform/web_mouse_event.h" #include "third_party/blink/public/platform/web_mouse_wheel_event.h" diff --git a/shell/common/native_mate_converters/callback.cc b/shell/common/native_mate_converters/callback.cc index 96e9c68bab..92029f3fc6 100644 --- a/shell/common/native_mate_converters/callback.cc +++ b/shell/common/native_mate_converters/callback.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/callback.h" #include "base/stl_util.h" #include "content/public/browser/browser_thread.h" diff --git a/shell/common/native_mate_converters/callback.h b/shell/common/native_mate_converters/callback.h index 666f6bae03..6c7a05a895 100644 --- a/shell/common/native_mate_converters/callback.h +++ b/shell/common/native_mate_converters/callback.h @@ -8,13 +8,13 @@ #include #include -#include "atom/common/api/locker.h" #include "base/bind.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "native_mate/function_template.h" #include "native_mate/scoped_persistent.h" +#include "shell/common/api/locker.h" namespace mate { diff --git a/shell/common/native_mate_converters/content_converter.cc b/shell/common/native_mate_converters/content_converter.cc index 9fd25f046a..96b0a4af08 100644 --- a/shell/common/native_mate_converters/content_converter.cc +++ b/shell/common/native_mate_converters/content_converter.cc @@ -2,22 +2,22 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/content_converter.h" +#include "shell/common/native_mate_converters/content_converter.h" #include #include -#include "atom/browser/api/atom_api_web_contents.h" -#include "atom/browser/web_contents_permission_helper.h" -#include "atom/common/native_mate_converters/blink_converter.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/native_mate_converters/ui_base_types_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_web_contents.h" +#include "shell/browser/web_contents_permission_helper.h" +#include "shell/common/native_mate_converters/blink_converter.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/native_mate_converters/ui_base_types_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" namespace { diff --git a/shell/common/native_mate_converters/file_dialog_converter.cc b/shell/common/native_mate_converters/file_dialog_converter.cc index ff2567e67f..b4c65b237b 100644 --- a/shell/common/native_mate_converters/file_dialog_converter.cc +++ b/shell/common/native_mate_converters/file_dialog_converter.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/file_dialog_converter.h" +#include "shell/common/native_mate_converters/file_dialog_converter.h" -#include "atom/browser/api/atom_api_browser_window.h" -#include "atom/browser/ui/file_dialog.h" -#include "atom/common/native_mate_converters/file_path_converter.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_browser_window.h" +#include "shell/browser/ui/file_dialog.h" +#include "shell/common/native_mate_converters/file_path_converter.h" namespace mate { diff --git a/shell/common/native_mate_converters/file_dialog_converter.h b/shell/common/native_mate_converters/file_dialog_converter.h index 7d4b5f1217..dca6720591 100644 --- a/shell/common/native_mate_converters/file_dialog_converter.h +++ b/shell/common/native_mate_converters/file_dialog_converter.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_ #define ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_ -#include "atom/browser/ui/file_dialog.h" #include "native_mate/converter.h" +#include "shell/browser/ui/file_dialog.h" namespace mate { diff --git a/shell/common/native_mate_converters/file_path_converter.h b/shell/common/native_mate_converters/file_path_converter.h index 87a77c16d4..4e0f7d6e35 100644 --- a/shell/common/native_mate_converters/file_path_converter.h +++ b/shell/common/native_mate_converters/file_path_converter.h @@ -7,8 +7,8 @@ #include -#include "atom/common/native_mate_converters/string16_converter.h" #include "base/files/file_path.h" +#include "shell/common/native_mate_converters/string16_converter.h" namespace gin { diff --git a/shell/common/native_mate_converters/gfx_converter.cc b/shell/common/native_mate_converters/gfx_converter.cc index 9d63e54347..18c691d5be 100644 --- a/shell/common/native_mate_converters/gfx_converter.cc +++ b/shell/common/native_mate_converters/gfx_converter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/gfx_converter.h" #include "native_mate/dictionary.h" #include "ui/display/display.h" diff --git a/shell/common/native_mate_converters/image_converter.cc b/shell/common/native_mate_converters/image_converter.cc index 1198479926..514fc68e5e 100644 --- a/shell/common/native_mate_converters/image_converter.cc +++ b/shell/common/native_mate_converters/image_converter.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/image_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" -#include "atom/common/api/atom_api_native_image.h" -#include "atom/common/native_mate_converters/file_path_converter.h" +#include "shell/common/api/atom_api_native_image.h" +#include "shell/common/native_mate_converters/file_path_converter.h" #include "ui/gfx/image/image_skia.h" namespace mate { diff --git a/shell/common/native_mate_converters/message_box_converter.cc b/shell/common/native_mate_converters/message_box_converter.cc index e364c3b8bd..1e0781ba57 100644 --- a/shell/common/native_mate_converters/message_box_converter.cc +++ b/shell/common/native_mate_converters/message_box_converter.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/message_box_converter.h" +#include "shell/common/native_mate_converters/message_box_converter.h" -#include "atom/browser/api/atom_api_browser_window.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/native_mate_converters/image_converter.h" #include "native_mate/dictionary.h" +#include "shell/browser/api/atom_api_browser_window.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/native_mate_converters/image_converter.h" namespace mate { diff --git a/shell/common/native_mate_converters/message_box_converter.h b/shell/common/native_mate_converters/message_box_converter.h index c922245d45..b2d3b78048 100644 --- a/shell/common/native_mate_converters/message_box_converter.h +++ b/shell/common/native_mate_converters/message_box_converter.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_ #define ATOM_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_ -#include "atom/browser/ui/message_box.h" #include "native_mate/converter.h" +#include "shell/browser/ui/message_box.h" namespace mate { diff --git a/shell/common/native_mate_converters/net_converter.cc b/shell/common/native_mate_converters/net_converter.cc index aed3d9c102..b758b8fb55 100644 --- a/shell/common/native_mate_converters/net_converter.cc +++ b/shell/common/native_mate_converters/net_converter.cc @@ -2,17 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/net_converter.h" +#include "shell/common/native_mate_converters/net_converter.h" #include #include #include #include -#include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/values.h" @@ -26,6 +22,10 @@ #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "services/network/public/cpp/resource_request.h" +#include "shell/common/native_mate_converters/gurl_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" #include "storage/browser/blob/upload_blob_element_reader.h" namespace mate { diff --git a/shell/common/native_mate_converters/network_converter.cc b/shell/common/native_mate_converters/network_converter.cc index 1707ed018b..d9ed0e0494 100644 --- a/shell/common/native_mate_converters/network_converter.cc +++ b/shell/common/native_mate_converters/network_converter.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/network_converter.h" +#include "shell/common/native_mate_converters/network_converter.h" #include #include #include #include -#include "atom/common/native_mate_converters/value_converter.h" #include "base/numerics/safe_conversions.h" #include "native_mate/dictionary.h" #include "services/network/public/cpp/resource_request_body.h" +#include "shell/common/native_mate_converters/value_converter.h" namespace mate { diff --git a/shell/common/native_mate_converters/once_callback.h b/shell/common/native_mate_converters/once_callback.h index f0bc60fc34..540627bdba 100644 --- a/shell/common/native_mate_converters/once_callback.h +++ b/shell/common/native_mate_converters/once_callback.h @@ -7,7 +7,7 @@ #include -#include "atom/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/callback.h" namespace mate { diff --git a/shell/common/native_mate_converters/v8_value_converter.cc b/shell/common/native_mate_converters/v8_value_converter.cc index 8de1af41f7..682305eb68 100644 --- a/shell/common/native_mate_converters/v8_value_converter.cc +++ b/shell/common/native_mate_converters/v8_value_converter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/v8_value_converter.h" +#include "shell/common/native_mate_converters/v8_value_converter.h" #include #include @@ -14,8 +14,8 @@ #include "base/values.h" #include "native_mate/dictionary.h" -#include "atom/common/node_bindings.h" -#include "atom/common/node_includes.h" +#include "shell/common/node_bindings.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/common/native_mate_converters/value_converter.cc b/shell/common/native_mate_converters/value_converter.cc index 309edb14af..58be22da5e 100644 --- a/shell/common/native_mate_converters/value_converter.cc +++ b/shell/common/native_mate_converters/value_converter.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/native_mate_converters/value_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" #include -#include "atom/common/native_mate_converters/v8_value_converter.h" #include "base/values.h" +#include "shell/common/native_mate_converters/v8_value_converter.h" namespace mate { diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc index 4b83392c79..974d27fcef 100644 --- a/shell/common/node_bindings.cc +++ b/shell/common/node_bindings.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/node_bindings.h" +#include "shell/common/node_bindings.h" #include #include @@ -10,11 +10,6 @@ #include #include -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/api/locker.h" -#include "atom/common/atom_command_line.h" -#include "atom/common/native_mate_converters/file_path_converter.h" -#include "atom/common/node_includes.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/environment.h" @@ -28,6 +23,11 @@ #include "content/public/common/content_paths.h" #include "electron/buildflags/buildflags.h" #include "native_mate/dictionary.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/api/locker.h" +#include "shell/common/atom_command_line.h" +#include "shell/common/native_mate_converters/file_path_converter.h" +#include "shell/common/node_includes.h" #define ELECTRON_BUILTIN_MODULES(V) \ V(atom_browser_app) \ diff --git a/shell/common/node_bindings_linux.cc b/shell/common/node_bindings_linux.cc index 3c58cb67a0..43509ae18b 100644 --- a/shell/common/node_bindings_linux.cc +++ b/shell/common/node_bindings_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/node_bindings_linux.h" +#include "shell/common/node_bindings_linux.h" #include diff --git a/shell/common/node_bindings_linux.h b/shell/common/node_bindings_linux.h index 15d9b33eb0..907379dea0 100644 --- a/shell/common/node_bindings_linux.h +++ b/shell/common/node_bindings_linux.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NODE_BINDINGS_LINUX_H_ #define ATOM_COMMON_NODE_BINDINGS_LINUX_H_ -#include "atom/common/node_bindings.h" #include "base/compiler_specific.h" +#include "shell/common/node_bindings.h" namespace atom { diff --git a/shell/common/node_bindings_mac.cc b/shell/common/node_bindings_mac.cc index 856b9cc868..6534336258 100644 --- a/shell/common/node_bindings_mac.cc +++ b/shell/common/node_bindings_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/node_bindings_mac.h" +#include "shell/common/node_bindings_mac.h" #include #include @@ -10,7 +10,7 @@ #include #include -#include "atom/common/node_includes.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/common/node_bindings_mac.h b/shell/common/node_bindings_mac.h index a0f93d8755..e486e2333b 100644 --- a/shell/common/node_bindings_mac.h +++ b/shell/common/node_bindings_mac.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NODE_BINDINGS_MAC_H_ #define ATOM_COMMON_NODE_BINDINGS_MAC_H_ -#include "atom/common/node_bindings.h" #include "base/compiler_specific.h" +#include "shell/common/node_bindings.h" namespace atom { diff --git a/shell/common/node_bindings_win.cc b/shell/common/node_bindings_win.cc index ef16edc723..5685a19627 100644 --- a/shell/common/node_bindings_win.cc +++ b/shell/common/node_bindings_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/node_bindings_win.h" +#include "shell/common/node_bindings_win.h" #include diff --git a/shell/common/node_bindings_win.h b/shell/common/node_bindings_win.h index 77fe5f43b5..b5f68938b0 100644 --- a/shell/common/node_bindings_win.h +++ b/shell/common/node_bindings_win.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NODE_BINDINGS_WIN_H_ #define ATOM_COMMON_NODE_BINDINGS_WIN_H_ -#include "atom/common/node_bindings.h" #include "base/compiler_specific.h" +#include "shell/common/node_bindings.h" namespace atom { diff --git a/shell/common/options_switches.cc b/shell/common/options_switches.cc index a51eb6fd17..08abf03256 100644 --- a/shell/common/options_switches.cc +++ b/shell/common/options_switches.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/options_switches.h" +#include "shell/common/options_switches.h" namespace atom { diff --git a/shell/common/platform_util_linux.cc b/shell/common/platform_util_linux.cc index 899ded5972..956f82dbda 100644 --- a/shell/common/platform_util_linux.cc +++ b/shell/common/platform_util_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/platform_util.h" +#include "shell/common/platform_util.h" #include diff --git a/shell/common/platform_util_mac.mm b/shell/common/platform_util_mac.mm index 832dcfd50b..cd11c050af 100644 --- a/shell/common/platform_util_mac.mm +++ b/shell/common/platform_util_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/platform_util.h" +#include "shell/common/platform_util.h" #include #include diff --git a/shell/common/platform_util_win.cc b/shell/common/platform_util_win.cc index 086166bb95..3021c2e1fb 100644 --- a/shell/common/platform_util_win.cc +++ b/shell/common/platform_util_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/common/platform_util.h" +#include "shell/common/platform_util.h" #include // windows.h must be included first diff --git a/shell/common/promise_util.cc b/shell/common/promise_util.cc index 82b05f06f0..0e5afae671 100644 --- a/shell/common/promise_util.cc +++ b/shell/common/promise_util.cc @@ -4,8 +4,8 @@ #include -#include "atom/common/api/locker.h" -#include "atom/common/promise_util.h" +#include "shell/common/api/locker.h" +#include "shell/common/promise_util.h" namespace atom { diff --git a/shell/common/promise_util.h b/shell/common/promise_util.h index 5441fd150c..2a4b9ed611 100644 --- a/shell/common/promise_util.h +++ b/shell/common/promise_util.h @@ -8,13 +8,13 @@ #include #include -#include "atom/common/api/locker.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/once_callback.h" #include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "native_mate/converter.h" +#include "shell/common/api/locker.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/once_callback.h" namespace atom { diff --git a/shell/renderer/api/atom_api_renderer_ipc.cc b/shell/renderer/api/atom_api_renderer_ipc.cc index 23374315ac..10414a5767 100644 --- a/shell/renderer/api/atom_api_renderer_ipc.cc +++ b/shell/renderer/api/atom_api_renderer_ipc.cc @@ -4,20 +4,20 @@ #include -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_bindings.h" -#include "atom/common/node_includes.h" -#include "atom/common/promise_util.h" #include "base/task/post_task.h" #include "base/values.h" #include "content/public/renderer/render_frame.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "native_mate/arguments.h" #include "native_mate/dictionary.h" #include "native_mate/handle.h" #include "native_mate/object_template_builder.h" #include "native_mate/wrappable.h" #include "services/service_manager/public/cpp/interface_provider.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_bindings.h" +#include "shell/common/node_includes.h" +#include "shell/common/promise_util.h" #include "third_party/blink/public/web/web_local_frame.h" using blink::WebLocalFrame; diff --git a/shell/renderer/api/atom_api_spell_check_client.cc b/shell/renderer/api/atom_api_spell_check_client.cc index 59689c8de9..389c5ad868 100644 --- a/shell/renderer/api/atom_api_spell_check_client.cc +++ b/shell/renderer/api/atom_api_spell_check_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/api/atom_api_spell_check_client.h" +#include "shell/renderer/api/atom_api_spell_check_client.h" #include #include @@ -10,7 +10,6 @@ #include #include -#include "atom/common/native_mate_converters/string16_converter.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/threading/thread_task_runner_handle.h" @@ -18,6 +17,7 @@ #include "native_mate/converter.h" #include "native_mate/dictionary.h" #include "native_mate/function_template.h" +#include "shell/common/native_mate_converters/string16_converter.h" #include "third_party/blink/public/web/web_text_checking_completion.h" #include "third_party/blink/public/web/web_text_checking_result.h" #include "third_party/icu/source/common/unicode/uscript.h" diff --git a/shell/renderer/api/atom_api_web_frame.cc b/shell/renderer/api/atom_api_web_frame.cc index 63464d13b3..139f9c6461 100644 --- a/shell/renderer/api/atom_api_web_frame.cc +++ b/shell/renderer/api/atom_api_web_frame.cc @@ -7,15 +7,6 @@ #include #include -#include "atom/common/api/api.mojom.h" -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/native_mate_converters/blink_converter.h" -#include "atom/common/native_mate_converters/callback.h" -#include "atom/common/native_mate_converters/gfx_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/promise_util.h" -#include "atom/renderer/api/atom_api_spell_check_client.h" #include "base/memory/memory_pressure_listener.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" @@ -24,6 +15,15 @@ #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "services/service_manager/public/cpp/interface_provider.h" +#include "shell/common/api/api.mojom.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/native_mate_converters/blink_converter.h" +#include "shell/common/native_mate_converters/callback.h" +#include "shell/common/native_mate_converters/gfx_converter.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/promise_util.h" +#include "shell/renderer/api/atom_api_spell_check_client.h" #include "third_party/blink/public/platform/web_cache.h" #include "third_party/blink/public/platform/web_isolated_world_info.h" #include "third_party/blink/public/web/web_custom_element.h" diff --git a/shell/renderer/atom_autofill_agent.cc b/shell/renderer/atom_autofill_agent.cc index 73f6134cef..3dddab3c14 100644 --- a/shell/renderer/atom_autofill_agent.cc +++ b/shell/renderer/atom_autofill_agent.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/atom_autofill_agent.h" +#include "shell/renderer/atom_autofill_agent.h" #include #include diff --git a/shell/renderer/atom_autofill_agent.h b/shell/renderer/atom_autofill_agent.h index 3f03efb79d..68d3793f87 100644 --- a/shell/renderer/atom_autofill_agent.h +++ b/shell/renderer/atom_autofill_agent.h @@ -7,10 +7,10 @@ #include -#include "atom/common/api/api.mojom.h" #include "base/memory/weak_ptr.h" #include "content/public/renderer/render_frame_observer.h" #include "mojo/public/cpp/bindings/associated_binding.h" +#include "shell/common/api/api.mojom.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" #include "third_party/blink/public/web/web_autofill_client.h" #include "third_party/blink/public/web/web_element.h" diff --git a/shell/renderer/atom_render_frame_observer.cc b/shell/renderer/atom_render_frame_observer.cc index 3f3f52284d..da47fecb9f 100644 --- a/shell/renderer/atom_render_frame_observer.cc +++ b/shell/renderer/atom_render_frame_observer.cc @@ -2,27 +2,27 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/atom_render_frame_observer.h" +#include "shell/renderer/atom_render_frame_observer.h" #include #include #include -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_view.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "ipc/ipc_message_macros.h" #include "native_mate/dictionary.h" #include "net/base/net_module.h" #include "net/grit/net_resources.h" #include "services/service_manager/public/cpp/interface_provider.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" #include "third_party/blink/public/platform/web_isolated_world_info.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_document.h" diff --git a/shell/renderer/atom_render_frame_observer.h b/shell/renderer/atom_render_frame_observer.h index 5b31a38f1b..b7f9279d09 100644 --- a/shell/renderer/atom_render_frame_observer.h +++ b/shell/renderer/atom_render_frame_observer.h @@ -7,10 +7,10 @@ #include -#include "atom/renderer/renderer_client_base.h" #include "base/strings/string16.h" #include "content/public/renderer/render_frame_observer.h" #include "ipc/ipc_platform_file.h" +#include "shell/renderer/renderer_client_base.h" #include "third_party/blink/public/platform/web_isolated_world_ids.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/shell/renderer/atom_renderer_client.cc b/shell/renderer/atom_renderer_client.cc index 02cb61da06..d54e037d3e 100644 --- a/shell/renderer/atom_renderer_client.cc +++ b/shell/renderer/atom_renderer_client.cc @@ -2,22 +2,22 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/atom_renderer_client.h" +#include "shell/renderer/atom_renderer_client.h" #include #include -#include "atom/common/api/electron_bindings.h" -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/asar/asar_util.h" -#include "atom/common/node_bindings.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" -#include "atom/renderer/atom_render_frame_observer.h" -#include "atom/renderer/web_worker_observer.h" #include "base/command_line.h" #include "content/public/renderer/render_frame.h" #include "native_mate/dictionary.h" +#include "shell/common/api/electron_bindings.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/asar/asar_util.h" +#include "shell/common/node_bindings.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" +#include "shell/renderer/atom_render_frame_observer.h" +#include "shell/renderer/web_worker_observer.h" #include "third_party/blink/public/web/web_document.h" #include "third_party/blink/public/web/web_local_frame.h" #include "third_party/electron_node/src/node_native_module.h" diff --git a/shell/renderer/atom_renderer_client.h b/shell/renderer/atom_renderer_client.h index 437d741073..2e20253e47 100644 --- a/shell/renderer/atom_renderer_client.h +++ b/shell/renderer/atom_renderer_client.h @@ -10,7 +10,7 @@ #include #include -#include "atom/renderer/renderer_client_base.h" +#include "shell/renderer/renderer_client_base.h" namespace node { class Environment; diff --git a/shell/renderer/atom_sandboxed_renderer_client.cc b/shell/renderer/atom_sandboxed_renderer_client.cc index cfef15bb98..064099f23b 100644 --- a/shell/renderer/atom_sandboxed_renderer_client.cc +++ b/shell/renderer/atom_sandboxed_renderer_client.cc @@ -2,16 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/atom_sandboxed_renderer_client.h" +#include "shell/renderer/atom_sandboxed_renderer_client.h" -#include "atom/common/api/electron_bindings.h" -#include "atom/common/application_info.h" -#include "atom/common/native_mate_converters/string16_converter.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_bindings.h" -#include "atom/common/node_includes.h" -#include "atom/common/options_switches.h" -#include "atom/renderer/atom_render_frame_observer.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/files/file_path.h" @@ -20,6 +12,14 @@ #include "content/public/renderer/render_frame.h" #include "gin/converter.h" #include "native_mate/dictionary.h" +#include "shell/common/api/electron_bindings.h" +#include "shell/common/application_info.h" +#include "shell/common/native_mate_converters/string16_converter.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/node_bindings.h" +#include "shell/common/node_includes.h" +#include "shell/common/options_switches.h" +#include "shell/renderer/atom_render_frame_observer.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_document.h" #include "third_party/electron_node/src/node_binding.h" diff --git a/shell/renderer/atom_sandboxed_renderer_client.h b/shell/renderer/atom_sandboxed_renderer_client.h index caede06135..bc8fcf57b5 100644 --- a/shell/renderer/atom_sandboxed_renderer_client.h +++ b/shell/renderer/atom_sandboxed_renderer_client.h @@ -9,8 +9,8 @@ #include #include -#include "atom/renderer/renderer_client_base.h" #include "base/process/process_metrics.h" +#include "shell/renderer/renderer_client_base.h" namespace atom { diff --git a/shell/renderer/content_settings_observer.cc b/shell/renderer/content_settings_observer.cc index e455ca5459..0460a7fdd4 100644 --- a/shell/renderer/content_settings_observer.cc +++ b/shell/renderer/content_settings_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/content_settings_observer.h" +#include "shell/renderer/content_settings_observer.h" #include "content/public/renderer/render_frame.h" #include "third_party/blink/public/platform/url_conversion.h" diff --git a/shell/renderer/electron_api_service_impl.cc b/shell/renderer/electron_api_service_impl.cc index 99bbcdbbe2..602f2041af 100644 --- a/shell/renderer/electron_api_service_impl.cc +++ b/shell/renderer/electron_api_service_impl.cc @@ -2,25 +2,25 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "electron/atom/renderer/electron_api_service_impl.h" +#include "electron/shell/renderer/electron_api_service_impl.h" #include #include #include -#include "atom/common/atom_constants.h" -#include "atom/common/heap_snapshot.h" -#include "atom/common/native_mate_converters/value_converter.h" #include "base/environment.h" #include "base/macros.h" #include "base/threading/thread_restrictions.h" -#include "electron/atom/common/api/event_emitter_caller.h" -#include "electron/atom/common/node_includes.h" -#include "electron/atom/common/options_switches.h" -#include "electron/atom/renderer/atom_render_frame_observer.h" -#include "electron/atom/renderer/renderer_client_base.h" +#include "electron/shell/common/api/event_emitter_caller.h" +#include "electron/shell/common/node_includes.h" +#include "electron/shell/common/options_switches.h" +#include "electron/shell/renderer/atom_render_frame_observer.h" +#include "electron/shell/renderer/renderer_client_base.h" #include "mojo/public/cpp/system/platform_handle.h" #include "native_mate/dictionary.h" +#include "shell/common/atom_constants.h" +#include "shell/common/heap_snapshot.h" +#include "shell/common/native_mate_converters/value_converter.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/shell/renderer/electron_api_service_impl.h b/shell/renderer/electron_api_service_impl.h index 4c198a9ccc..9371610a7d 100644 --- a/shell/renderer/electron_api_service_impl.h +++ b/shell/renderer/electron_api_service_impl.h @@ -9,7 +9,7 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" -#include "electron/atom/common/api/api.mojom.h" +#include "electron/shell/common/api/api.mojom.h" #include "mojo/public/cpp/bindings/associated_binding.h" namespace atom { diff --git a/shell/renderer/guest_view_container.cc b/shell/renderer/guest_view_container.cc index 294bfda5f1..7ce8d0d8eb 100644 --- a/shell/renderer/guest_view_container.cc +++ b/shell/renderer/guest_view_container.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/guest_view_container.h" +#include "shell/renderer/guest_view_container.h" #include #include diff --git a/shell/renderer/printing/print_render_frame_helper_delegate.cc b/shell/renderer/printing/print_render_frame_helper_delegate.cc index 0a3bf8321b..4625fe2451 100644 --- a/shell/renderer/printing/print_render_frame_helper_delegate.cc +++ b/shell/renderer/printing/print_render_frame_helper_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/printing/print_render_frame_helper_delegate.h" +#include "shell/renderer/printing/print_render_frame_helper_delegate.h" #include "content/public/renderer/render_frame.h" #include "third_party/blink/public/web/web_element.h" diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc index a1e878b1d9..ea596dbb4e 100644 --- a/shell/renderer/renderer_client_base.cc +++ b/shell/renderer/renderer_client_base.cc @@ -2,19 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/renderer_client_base.h" +#include "shell/renderer/renderer_client_base.h" #include #include #include -#include "atom/common/color_util.h" -#include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/options_switches.h" -#include "atom/renderer/atom_autofill_agent.h" -#include "atom/renderer/atom_render_frame_observer.h" -#include "atom/renderer/content_settings_observer.h" -#include "atom/renderer/electron_api_service_impl.h" #include "base/command_line.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" @@ -26,6 +19,13 @@ #include "electron/buildflags/buildflags.h" #include "native_mate/dictionary.h" #include "printing/buildflags/buildflags.h" +#include "shell/common/color_util.h" +#include "shell/common/native_mate_converters/value_converter.h" +#include "shell/common/options_switches.h" +#include "shell/renderer/atom_autofill_agent.h" +#include "shell/renderer/atom_render_frame_observer.h" +#include "shell/renderer/content_settings_observer.h" +#include "shell/renderer/electron_api_service_impl.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_custom_element.h" // NOLINT(build/include_alpha) @@ -45,7 +45,7 @@ #endif #if BUILDFLAG(ENABLE_PDF_VIEWER) -#include "atom/common/atom_constants.h" +#include "shell/common/atom_constants.h" #endif // BUILDFLAG(ENABLE_PDF_VIEWER) #if BUILDFLAG(ENABLE_PEPPER_FLASH) @@ -57,9 +57,9 @@ #endif // BUILDFLAG(ENABLE_TTS) #if BUILDFLAG(ENABLE_PRINTING) -#include "atom/renderer/printing/print_render_frame_helper_delegate.h" #include "components/printing/renderer/print_render_frame_helper.h" #include "printing/print_settings.h" +#include "shell/renderer/printing/print_render_frame_helper_delegate.h" #endif // BUILDFLAG(ENABLE_PRINTING) namespace atom { diff --git a/shell/renderer/web_worker_observer.cc b/shell/renderer/web_worker_observer.cc index 439140c7a3..81bcab2686 100644 --- a/shell/renderer/web_worker_observer.cc +++ b/shell/renderer/web_worker_observer.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/renderer/web_worker_observer.h" +#include "shell/renderer/web_worker_observer.h" -#include "atom/common/api/electron_bindings.h" -#include "atom/common/api/event_emitter_caller.h" -#include "atom/common/asar/asar_util.h" -#include "atom/common/node_bindings.h" -#include "atom/common/node_includes.h" #include "base/lazy_instance.h" #include "base/threading/thread_local.h" +#include "shell/common/api/electron_bindings.h" +#include "shell/common/api/event_emitter_caller.h" +#include "shell/common/asar/asar_util.h" +#include "shell/common/node_bindings.h" +#include "shell/common/node_includes.h" namespace atom { diff --git a/shell/utility/atom_content_utility_client.cc b/shell/utility/atom_content_utility_client.cc index 8192104d29..1175e5780e 100644 --- a/shell/utility/atom_content_utility_client.cc +++ b/shell/utility/atom_content_utility_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "atom/utility/atom_content_utility_client.h" +#include "shell/utility/atom_content_utility_client.h" #include