diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-12-09 16:13:37 +0100 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-12-09 16:13:37 +0100 |
| commit | 04b30d974aee4fc556249b1bfa62c7cb79b839c5 (patch) | |
| tree | 8c287e09e01936c0f482522d5082bbf64bafb786 /src/core/url_request_context_getter_qt.h | |
| parent | 1c09b16ebb88737682a5cd6ddc58f6d360b635af (diff) | |
| parent | 7c5f2a9393a3fc77c0c5b2406332d57a37325183 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
Diffstat (limited to 'src/core/url_request_context_getter_qt.h')
| -rw-r--r-- | src/core/url_request_context_getter_qt.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h index c7a4366ec..247247f7c 100644 --- a/src/core/url_request_context_getter_qt.h +++ b/src/core/url_request_context_getter_qt.h @@ -45,6 +45,7 @@ #include "base/single_thread_task_runner.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" @@ -86,6 +87,8 @@ private: void generateHttpCache(); void generateUserAgent(); void generateJobFactory(); + void cancelAllUrlRequests(); + net::HttpNetworkSession::Params generateNetworkSessionParams(); bool m_ignoreCertificateErrors; QAtomicInt m_updateCookieStore; |