From 438d0aeb1a2a0d4ecde86cb75b8db39cf75771f2 Mon Sep 17 00:00:00 2001 From: Peter Varga <pvarga@inf.u-szeged.hu> Date: Tue, 6 Mar 2018 16:48:54 +0100 Subject: [PATCH] Remove some unused header includes from core Change-Id: Ie5bcf9cfb249f364dbe01a8bee98aada2acdd38f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> --- src/core/chromium_gpu_helper.h | 1 - src/core/net/url_request_context_getter_qt.cpp | 9 --------- src/core/net/url_request_context_getter_qt.h | 5 +---- src/core/permission_manager_qt.h | 1 - src/core/render_widget_host_view_qt.h | 1 - src/core/renderer/content_renderer_client_qt.cpp | 2 -- src/core/web_contents_adapter.cpp | 1 - 7 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/core/chromium_gpu_helper.h b/src/core/chromium_gpu_helper.h index 848a43c7e..be4380085 100644 --- a/src/core/chromium_gpu_helper.h +++ b/src/core/chromium_gpu_helper.h @@ -41,7 +41,6 @@ #define CHROMIUM_GPU_HELPER_H #include <QtGlobal> // We need this for the Q_OS_QNX define. -#include <QMap> namespace base { class MessageLoop; diff --git a/src/core/net/url_request_context_getter_qt.cpp b/src/core/net/url_request_context_getter_qt.cpp index 3b041639e..904130611 100644 --- a/src/core/net/url_request_context_getter_qt.cpp +++ b/src/core/net/url_request_context_getter_qt.cpp @@ -39,9 +39,7 @@ #include "url_request_context_getter_qt.h" -#include "base/command_line.h" #include "base/memory/ptr_util.h" -#include "base/strings/string_util.h" #include "base/task_scheduler/post_task.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" @@ -65,9 +63,7 @@ #include "net/http/http_auth_preferences.h" #include "net/http/http_auth_scheme.h" #include "net/http/http_cache.h" -#include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" -#include "net/proxy/dhcp_proxy_script_fetcher_factory.h" #include "net/proxy/proxy_script_fetcher_impl.h" #include "net/proxy/proxy_service.h" #include "net/ssl/channel_id_service.h" @@ -80,15 +76,10 @@ #include "net/url_request/ftp_protocol_handler.h" #include "net/url_request/url_request_intercepting_job_factory.h" #include "net/ftp/ftp_network_layer.h" -#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h" #include "api/qwebengineurlschemehandler.h" -#include "browser_context_adapter.h" #include "browser_context_qt.h" #include "custom_protocol_handler.h" -#include "cookie_monster_delegate_qt.h" -#include "content_client_qt.h" -#include "network_delegate_qt.h" #include "proxy_config_service_qt.h" #include "qrc_protocol_handler_qt.h" #include "qwebenginecookiestore.h" diff --git a/src/core/net/url_request_context_getter_qt.h b/src/core/net/url_request_context_getter_qt.h index 809e4190d..0eb4a2fe4 100644 --- a/src/core/net/url_request_context_getter_qt.h +++ b/src/core/net/url_request_context_getter_qt.h @@ -42,17 +42,14 @@ #include "net/url_request/url_request_context_getter.h" -#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" -#include "content/public/browser/browser_context.h" -#include "content/public/browser/content_browser_client.h" -#include "content/public/common/url_constants.h" #include "net/http/http_network_session.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory_impl.h" #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" +#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h" #include "cookie_monster_delegate_qt.h" #include "network_delegate_qt.h" diff --git a/src/core/permission_manager_qt.h b/src/core/permission_manager_qt.h index f51ea3c59..c76b377f4 100644 --- a/src/core/permission_manager_qt.h +++ b/src/core/permission_manager_qt.h @@ -45,7 +45,6 @@ #include "browser_context_adapter.h" #include <QHash> -#include <QList> namespace QtWebEngineCore { diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index 96d40eae2..db68e5232 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -54,7 +54,6 @@ #include "qtwebenginecoreglobal_p.h" #include <QMap> #include <QPoint> -#include <QRect> #include <QtGlobal> #include <QtGui/qaccessible.h> #include <QtGui/QTouchEvent> diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 2c3ea4cc3..56ebfec30 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -43,7 +43,6 @@ #include "printing/features/features.h" #include "base/strings/string_split.h" -#include "base/strings/utf_string_conversions.h" #if BUILDFLAG(ENABLE_SPELLCHECK) #include "components/spellcheck/renderer/spellcheck.h" #include "components/spellcheck/renderer/spellcheck_provider.h" @@ -64,7 +63,6 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "net/base/net_errors.h" -#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "ui/base/resource/resource_bundle.h" diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index e04edb3d7..26ae9e3c5 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -56,7 +56,6 @@ #include "renderer_host/web_channel_ipc_transport_host.h" #include "render_view_observer_host_qt.h" #include "type_conversion.h" -#include "web_contents_adapter_client.h" #include "web_contents_view_qt.h" #include "web_engine_context.h" #include "web_engine_settings.h" -- GitLab