diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/api/qwebenginecookiestore.cpp | 2 | ||||
-rw-r--r-- | src/core/api/qwebengineurlrequestjob.cpp | 4 | ||||
-rw-r--r-- | src/core/browser_context_adapter.cpp | 4 | ||||
-rw-r--r-- | src/core/browser_context_qt.cpp | 4 | ||||
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 6 | ||||
-rw-r--r-- | src/core/content_client_qt.cpp | 2 | ||||
-rw-r--r-- | src/core/core_chromium.pri | 66 | ||||
-rw-r--r-- | src/core/net/cookie_monster_delegate_qt.cpp (renamed from src/core/cookie_monster_delegate_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/cookie_monster_delegate_qt.h (renamed from src/core/cookie_monster_delegate_qt.h) | 0 | ||||
-rw-r--r-- | src/core/net/custom_protocol_handler.cpp (renamed from src/core/custom_protocol_handler.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/custom_protocol_handler.h (renamed from src/core/custom_protocol_handler.h) | 0 | ||||
-rw-r--r-- | src/core/net/network_delegate_qt.cpp (renamed from src/core/network_delegate_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/network_delegate_qt.h (renamed from src/core/network_delegate_qt.h) | 0 | ||||
-rw-r--r-- | src/core/net/proxy_config_service_qt.cpp (renamed from src/core/proxy_config_service_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/proxy_config_service_qt.h (renamed from src/core/proxy_config_service_qt.h) | 0 | ||||
-rw-r--r-- | src/core/net/qrc_protocol_handler_qt.cpp (renamed from src/core/qrc_protocol_handler_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/qrc_protocol_handler_qt.h (renamed from src/core/qrc_protocol_handler_qt.h) | 0 | ||||
-rw-r--r-- | src/core/net/ssl_host_state_delegate_qt.cpp (renamed from src/core/ssl_host_state_delegate_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/ssl_host_state_delegate_qt.h (renamed from src/core/ssl_host_state_delegate_qt.h) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_context_getter_qt.cpp (renamed from src/core/url_request_context_getter_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_context_getter_qt.h (renamed from src/core/url_request_context_getter_qt.h) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_custom_job.cpp (renamed from src/core/url_request_custom_job.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_custom_job.h (renamed from src/core/url_request_custom_job.h) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_custom_job_delegate.cpp (renamed from src/core/url_request_custom_job_delegate.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_custom_job_delegate.h (renamed from src/core/url_request_custom_job_delegate.h) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_custom_job_proxy.cpp (renamed from src/core/url_request_custom_job_proxy.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_custom_job_proxy.h (renamed from src/core/url_request_custom_job_proxy.h) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_qrc_job_qt.cpp (renamed from src/core/url_request_qrc_job_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/url_request_qrc_job_qt.h (renamed from src/core/url_request_qrc_job_qt.h) | 0 | ||||
-rw-r--r-- | src/core/net/webui_controller_factory_qt.cpp (renamed from src/core/webui/webui_controller_factory_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/net/webui_controller_factory_qt.h (renamed from src/core/webui/webui_controller_factory_qt.h) | 0 | ||||
-rw-r--r-- | src/core/printing/pdfium_document_wrapper_qt.cpp (renamed from src/core/pdfium_document_wrapper_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/printing/pdfium_document_wrapper_qt.h (renamed from src/core/pdfium_document_wrapper_qt.h) | 0 | ||||
-rw-r--r-- | src/core/printing/print_view_manager_base_qt.cpp (renamed from src/core/print_view_manager_base_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/printing/print_view_manager_base_qt.h (renamed from src/core/print_view_manager_base_qt.h) | 0 | ||||
-rw-r--r-- | src/core/printing/print_view_manager_qt.cpp (renamed from src/core/print_view_manager_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/printing/print_view_manager_qt.h (renamed from src/core/print_view_manager_qt.h) | 0 | ||||
-rw-r--r-- | src/core/printing/printing_message_filter_qt.cpp (renamed from src/core/printing_message_filter_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/printing/printing_message_filter_qt.h (renamed from src/core/printing_message_filter_qt.h) | 0 | ||||
-rw-r--r-- | src/core/web_contents_adapter.cpp | 2 | ||||
-rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 2 | ||||
-rw-r--r-- | src/core/web_engine_context.cpp | 2 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 |
43 files changed, 48 insertions, 48 deletions
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp index 691fab8ab..c87cb12bf 100644 --- a/src/core/api/qwebenginecookiestore.cpp +++ b/src/core/api/qwebenginecookiestore.cpp @@ -42,7 +42,7 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "cookie_monster_delegate_qt.h" +#include "net/cookie_monster_delegate_qt.h" #include "type_conversion.h" #include <QByteArray> diff --git a/src/core/api/qwebengineurlrequestjob.cpp b/src/core/api/qwebengineurlrequestjob.cpp index 941c70b1d..c028a1167 100644 --- a/src/core/api/qwebengineurlrequestjob.cpp +++ b/src/core/api/qwebengineurlrequestjob.cpp @@ -39,8 +39,8 @@ #include "qwebengineurlrequestjob.h" -#include "url_request_custom_job_proxy.h" -#include "url_request_custom_job_delegate.h" +#include "net/url_request_custom_job_proxy.h" +#include "net/url_request_custom_job_delegate.h" using QtWebEngineCore::URLRequestCustomJobDelegate; diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 404cfc575..b0f244393 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -47,12 +47,12 @@ #include "browser_context_qt.h" #include "content_client_qt.h" #include "download_manager_delegate_qt.h" +#include "net/url_request_context_getter_qt.h" #include "permission_manager_qt.h" +#include "renderer_host/user_resource_controller_host.h" #include "type_conversion.h" #include "visited_links_manager_qt.h" #include "web_engine_context.h" -#include "url_request_context_getter_qt.h" -#include "renderer_host/user_resource_controller_host.h" #include "net/proxy/proxy_service.h" diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index 16adf0308..96bfde443 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -42,12 +42,12 @@ #include "browser_context_adapter.h" #include "browsing_data_remover_delegate_qt.h" #include "download_manager_delegate_qt.h" +#include "net/ssl_host_state_delegate_qt.h" +#include "net/url_request_context_getter_qt.h" #include "permission_manager_qt.h" #include "qtwebenginecoreglobal_p.h" #include "resource_context_qt.h" -#include "ssl_host_state_delegate_qt.h" #include "type_conversion.h" -#include "url_request_context_getter_qt.h" #include "web_engine_library_info.h" #include "base/time/time.h" diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 3b30cd24b..1f5f76a4d 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -93,11 +93,11 @@ #include "desktop_screen_qt.h" #include "devtools_manager_delegate_qt.h" #include "media_capture_devices_dispatcher.h" -#include "network_delegate_qt.h" +#include "net/network_delegate_qt.h" +#include "net/qrc_protocol_handler_qt.h" #if BUILDFLAG(ENABLE_BASIC_PRINTING) -#include "printing_message_filter_qt.h" +#include "printing/printing_message_filter_qt.h" #endif // BUILDFLAG(ENABLE_BASIC_PRINTING) -#include "qrc_protocol_handler_qt.h" #include "quota_permission_context_qt.h" #include "renderer_host/resource_dispatcher_host_delegate_qt.h" #include "renderer_host/user_resource_controller_host.h" diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index c98853c58..c1683bfa0 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -51,7 +51,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "qrc_protocol_handler_qt.h" +#include "net/qrc_protocol_handler_qt.h" #include "type_conversion.h" #include <QCoreApplication> diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 783c41e88..213eb0e89 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -55,8 +55,6 @@ SOURCES = \ content_client_qt.cpp \ content_browser_client_qt.cpp \ content_main_delegate_qt.cpp \ - cookie_monster_delegate_qt.cpp \ - custom_protocol_handler.cpp \ delegated_frame_node.cpp \ desktop_screen_qt.cpp \ devtools_frontend_qt.cpp \ @@ -70,12 +68,21 @@ SOURCES = \ javascript_dialog_manager_qt.cpp \ media_capture_devices_dispatcher.cpp \ native_web_keyboard_event_qt.cpp \ - network_delegate_qt.cpp \ + net/cookie_monster_delegate_qt.cpp \ + net/custom_protocol_handler.cpp \ + net/network_delegate_qt.cpp \ + net/proxy_config_service_qt.cpp \ + net/qrc_protocol_handler_qt.cpp \ + net/ssl_host_state_delegate_qt.cpp \ + net/url_request_context_getter_qt.cpp \ + net/url_request_custom_job.cpp \ + net/url_request_custom_job_delegate.cpp \ + net/url_request_custom_job_proxy.cpp \ + net/url_request_qrc_job_qt.cpp \ + net/webui_controller_factory_qt.cpp \ ozone_platform_qt.cpp \ permission_manager_qt.cpp \ process_main.cpp \ - proxy_config_service_qt.cpp \ - qrc_protocol_handler_qt.cpp \ quota_permission_context_qt.cpp \ quota_permission_controller_impl.cpp \ register_protocol_handler_permission_controller_impl.cpp \ @@ -92,14 +99,8 @@ SOURCES = \ renderer_host/web_channel_ipc_transport_host.cpp \ resource_bundle_qt.cpp \ resource_context_qt.cpp \ - ssl_host_state_delegate_qt.cpp \ surface_factory_qt.cpp \ type_conversion.cpp \ - url_request_context_getter_qt.cpp \ - url_request_custom_job.cpp \ - url_request_custom_job_delegate.cpp \ - url_request_custom_job_proxy.cpp \ - url_request_qrc_job_qt.cpp \ user_script.cpp \ visited_links_manager_qt.cpp \ web_contents_adapter.cpp \ @@ -109,8 +110,7 @@ SOURCES = \ web_engine_error.cpp \ web_engine_library_info.cpp \ web_engine_settings.cpp \ - web_event_factory.cpp \ - webui/webui_controller_factory_qt.cpp + web_event_factory.cpp HEADERS = \ authentication_dialog_controller_p.h \ @@ -134,8 +134,6 @@ HEADERS = \ content_client_qt.h \ content_browser_client_qt.h \ content_main_delegate_qt.h \ - cookie_monster_delegate_qt.h \ - custom_protocol_handler.h \ delegated_frame_node.h \ desktop_screen_qt.h \ devtools_frontend_qt.h \ @@ -152,13 +150,22 @@ HEADERS = \ javascript_dialog_controller.h \ javascript_dialog_manager_qt.h \ media_capture_devices_dispatcher.h \ - network_delegate_qt.h \ + net/cookie_monster_delegate_qt.h \ + net/custom_protocol_handler.h \ + net/network_delegate_qt.h \ + net/qrc_protocol_handler_qt.h \ + net/ssl_host_state_delegate_qt.h \ + net/url_request_context_getter_qt.h \ + net/url_request_custom_job.h \ + net/url_request_custom_job_delegate.h \ + net/url_request_custom_job_proxy.h \ + net/url_request_qrc_job_qt.h \ + net/webui_controller_factory_qt.h \ ozone_platform_qt.h \ permission_controller.h \ permission_manager_qt.h \ process_main.h \ proxy_config_service_qt.h \ - qrc_protocol_handler_qt.h \ quota_permission_context_qt.h \ quota_permission_controller.h \ quota_permission_controller_impl.h \ @@ -177,14 +184,8 @@ HEADERS = \ renderer_host/user_resource_controller_host.h \ renderer_host/web_channel_ipc_transport_host.h \ resource_context_qt.h \ - ssl_host_state_delegate_qt.h \ surface_factory_qt.h \ type_conversion.h \ - url_request_context_getter_qt.h \ - url_request_custom_job.h \ - url_request_custom_job_delegate.h \ - url_request_custom_job_proxy.h \ - url_request_qrc_job_qt.h \ user_script.h \ visited_links_manager_qt.h \ web_contents_adapter.h \ @@ -196,8 +197,7 @@ HEADERS = \ web_engine_error.h \ web_engine_library_info.h \ web_engine_settings.h \ - web_event_factory.h \ - webui/webui_controller_factory_qt.h + web_event_factory.h qtConfig(webengine-pepper-plugins) { @@ -219,20 +219,20 @@ qtConfig(webengine-pepper-plugins) { qtConfig(webengine-printing-and-pdf) { SOURCES += \ - printing_message_filter_qt.cpp \ - print_view_manager_base_qt.cpp \ - print_view_manager_qt.cpp \ + printing/printing_message_filter_qt.cpp \ + printing/print_view_manager_base_qt.cpp \ + printing/print_view_manager_qt.cpp \ renderer/print_web_view_helper_delegate_qt.cpp HEADERS += \ - printing_message_filter_qt.h \ - print_view_manager_base_qt.h \ - print_view_manager_qt.h \ + printing/printing_message_filter_qt.h \ + printing/print_view_manager_base_qt.h \ + printing/print_view_manager_qt.h \ renderer/print_web_view_helper_delegate_qt.h # pdf sources - SOURCES += pdfium_document_wrapper_qt.cpp - HEADERS += pdfium_document_wrapper_qt.h + SOURCES += printing/pdfium_document_wrapper_qt.cpp + HEADERS += printing/pdfium_document_wrapper_qt.h } contains(QT_CONFIG, opengl) { diff --git a/src/core/cookie_monster_delegate_qt.cpp b/src/core/net/cookie_monster_delegate_qt.cpp index abc386204..abc386204 100644 --- a/src/core/cookie_monster_delegate_qt.cpp +++ b/src/core/net/cookie_monster_delegate_qt.cpp diff --git a/src/core/cookie_monster_delegate_qt.h b/src/core/net/cookie_monster_delegate_qt.h index 8aceca9c9..8aceca9c9 100644 --- a/src/core/cookie_monster_delegate_qt.h +++ b/src/core/net/cookie_monster_delegate_qt.h diff --git a/src/core/custom_protocol_handler.cpp b/src/core/net/custom_protocol_handler.cpp index 402df04ba..402df04ba 100644 --- a/src/core/custom_protocol_handler.cpp +++ b/src/core/net/custom_protocol_handler.cpp diff --git a/src/core/custom_protocol_handler.h b/src/core/net/custom_protocol_handler.h index 5d3838834..5d3838834 100644 --- a/src/core/custom_protocol_handler.h +++ b/src/core/net/custom_protocol_handler.h diff --git a/src/core/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp index 74db51d7d..74db51d7d 100644 --- a/src/core/network_delegate_qt.cpp +++ b/src/core/net/network_delegate_qt.cpp diff --git a/src/core/network_delegate_qt.h b/src/core/net/network_delegate_qt.h index b5165d229..b5165d229 100644 --- a/src/core/network_delegate_qt.h +++ b/src/core/net/network_delegate_qt.h diff --git a/src/core/proxy_config_service_qt.cpp b/src/core/net/proxy_config_service_qt.cpp index 7fca18eb6..7fca18eb6 100644 --- a/src/core/proxy_config_service_qt.cpp +++ b/src/core/net/proxy_config_service_qt.cpp diff --git a/src/core/proxy_config_service_qt.h b/src/core/net/proxy_config_service_qt.h index 7be3289d0..7be3289d0 100644 --- a/src/core/proxy_config_service_qt.h +++ b/src/core/net/proxy_config_service_qt.h diff --git a/src/core/qrc_protocol_handler_qt.cpp b/src/core/net/qrc_protocol_handler_qt.cpp index eb716f182..eb716f182 100644 --- a/src/core/qrc_protocol_handler_qt.cpp +++ b/src/core/net/qrc_protocol_handler_qt.cpp diff --git a/src/core/qrc_protocol_handler_qt.h b/src/core/net/qrc_protocol_handler_qt.h index f2849c1ef..f2849c1ef 100644 --- a/src/core/qrc_protocol_handler_qt.h +++ b/src/core/net/qrc_protocol_handler_qt.h diff --git a/src/core/ssl_host_state_delegate_qt.cpp b/src/core/net/ssl_host_state_delegate_qt.cpp index d8f73abda..d8f73abda 100644 --- a/src/core/ssl_host_state_delegate_qt.cpp +++ b/src/core/net/ssl_host_state_delegate_qt.cpp diff --git a/src/core/ssl_host_state_delegate_qt.h b/src/core/net/ssl_host_state_delegate_qt.h index 3ebabb601..3ebabb601 100644 --- a/src/core/ssl_host_state_delegate_qt.h +++ b/src/core/net/ssl_host_state_delegate_qt.h diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/net/url_request_context_getter_qt.cpp index 3b041639e..3b041639e 100644 --- a/src/core/url_request_context_getter_qt.cpp +++ b/src/core/net/url_request_context_getter_qt.cpp diff --git a/src/core/url_request_context_getter_qt.h b/src/core/net/url_request_context_getter_qt.h index 809e4190d..809e4190d 100644 --- a/src/core/url_request_context_getter_qt.h +++ b/src/core/net/url_request_context_getter_qt.h diff --git a/src/core/url_request_custom_job.cpp b/src/core/net/url_request_custom_job.cpp index cf96cd6d9..cf96cd6d9 100644 --- a/src/core/url_request_custom_job.cpp +++ b/src/core/net/url_request_custom_job.cpp diff --git a/src/core/url_request_custom_job.h b/src/core/net/url_request_custom_job.h index 021cf3204..021cf3204 100644 --- a/src/core/url_request_custom_job.h +++ b/src/core/net/url_request_custom_job.h diff --git a/src/core/url_request_custom_job_delegate.cpp b/src/core/net/url_request_custom_job_delegate.cpp index 338bd7137..338bd7137 100644 --- a/src/core/url_request_custom_job_delegate.cpp +++ b/src/core/net/url_request_custom_job_delegate.cpp diff --git a/src/core/url_request_custom_job_delegate.h b/src/core/net/url_request_custom_job_delegate.h index 6bbd10909..6bbd10909 100644 --- a/src/core/url_request_custom_job_delegate.h +++ b/src/core/net/url_request_custom_job_delegate.h diff --git a/src/core/url_request_custom_job_proxy.cpp b/src/core/net/url_request_custom_job_proxy.cpp index 6c9824bb9..6c9824bb9 100644 --- a/src/core/url_request_custom_job_proxy.cpp +++ b/src/core/net/url_request_custom_job_proxy.cpp diff --git a/src/core/url_request_custom_job_proxy.h b/src/core/net/url_request_custom_job_proxy.h index 603ad5840..603ad5840 100644 --- a/src/core/url_request_custom_job_proxy.h +++ b/src/core/net/url_request_custom_job_proxy.h diff --git a/src/core/url_request_qrc_job_qt.cpp b/src/core/net/url_request_qrc_job_qt.cpp index a2712653d..a2712653d 100644 --- a/src/core/url_request_qrc_job_qt.cpp +++ b/src/core/net/url_request_qrc_job_qt.cpp diff --git a/src/core/url_request_qrc_job_qt.h b/src/core/net/url_request_qrc_job_qt.h index 11c130693..11c130693 100644 --- a/src/core/url_request_qrc_job_qt.h +++ b/src/core/net/url_request_qrc_job_qt.h diff --git a/src/core/webui/webui_controller_factory_qt.cpp b/src/core/net/webui_controller_factory_qt.cpp index 3b13f03b8..3b13f03b8 100644 --- a/src/core/webui/webui_controller_factory_qt.cpp +++ b/src/core/net/webui_controller_factory_qt.cpp diff --git a/src/core/webui/webui_controller_factory_qt.h b/src/core/net/webui_controller_factory_qt.h index 440dd5a13..440dd5a13 100644 --- a/src/core/webui/webui_controller_factory_qt.h +++ b/src/core/net/webui_controller_factory_qt.h diff --git a/src/core/pdfium_document_wrapper_qt.cpp b/src/core/printing/pdfium_document_wrapper_qt.cpp index ca1e8cd07..ca1e8cd07 100644 --- a/src/core/pdfium_document_wrapper_qt.cpp +++ b/src/core/printing/pdfium_document_wrapper_qt.cpp diff --git a/src/core/pdfium_document_wrapper_qt.h b/src/core/printing/pdfium_document_wrapper_qt.h index 28c490ae5..28c490ae5 100644 --- a/src/core/pdfium_document_wrapper_qt.h +++ b/src/core/printing/pdfium_document_wrapper_qt.h diff --git a/src/core/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp index abc1edf74..abc1edf74 100644 --- a/src/core/print_view_manager_base_qt.cpp +++ b/src/core/printing/print_view_manager_base_qt.cpp diff --git a/src/core/print_view_manager_base_qt.h b/src/core/printing/print_view_manager_base_qt.h index 0d86fcf90..0d86fcf90 100644 --- a/src/core/print_view_manager_base_qt.h +++ b/src/core/printing/print_view_manager_base_qt.h diff --git a/src/core/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp index 627afb01a..627afb01a 100644 --- a/src/core/print_view_manager_qt.cpp +++ b/src/core/printing/print_view_manager_qt.cpp diff --git a/src/core/print_view_manager_qt.h b/src/core/printing/print_view_manager_qt.h index 654608ddd..654608ddd 100644 --- a/src/core/print_view_manager_qt.h +++ b/src/core/printing/print_view_manager_qt.h diff --git a/src/core/printing_message_filter_qt.cpp b/src/core/printing/printing_message_filter_qt.cpp index c0e3498ee..c0e3498ee 100644 --- a/src/core/printing_message_filter_qt.cpp +++ b/src/core/printing/printing_message_filter_qt.cpp diff --git a/src/core/printing_message_filter_qt.h b/src/core/printing/printing_message_filter_qt.h index ca5e29f08..ca5e29f08 100644 --- a/src/core/printing_message_filter_qt.h +++ b/src/core/printing/printing_message_filter_qt.h diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index fc8fded7a..e04edb3d7 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -51,7 +51,7 @@ #include "devtools_frontend_qt.h" #include "download_manager_delegate_qt.h" #include "media_capture_devices_dispatcher.h" -#include "print_view_manager_qt.h" +#include "printing/print_view_manager_qt.h" #include "qwebenginecallback_p.h" #include "renderer_host/web_channel_ipc_transport_host.h" #include "render_view_observer_host_qt.h" diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index a88f7665e..4afbbe436 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -50,7 +50,7 @@ #include "favicon_manager_p.h" #include "file_picker_controller.h" #include "media_capture_devices_dispatcher.h" -#include "network_delegate_qt.h" +#include "net/network_delegate_qt.h" #include "render_widget_host_view_qt.h" #include "type_conversion.h" #include "visited_links_manager_qt.h" diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 79584f55d..7154859df 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -89,10 +89,10 @@ #include "devtools_manager_delegate_qt.h" #include "gl_context_qt.h" #include "media_capture_devices_dispatcher.h" +#include "net/webui_controller_factory_qt.h" #include "type_conversion.h" #include "surface_factory_qt.h" #include "web_engine_library_info.h" -#include "webui/webui_controller_factory_qt.h" #include <QFileInfo> #include <QGuiApplication> diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 30ccf26f2..20a0297cd 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -47,7 +47,7 @@ #include "favicon_manager.h" #include "file_picker_controller.h" #include "javascript_dialog_controller.h" -#include "pdfium_document_wrapper_qt.h" +#include "printing/pdfium_document_wrapper_qt.h" #include "qwebenginefullscreenrequest.h" #include "qwebenginehistory.h" #include "qwebenginehistory_p.h" |