diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 09:47:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 10:08:28 +0200 |
| commit | e53ddd7b7ec0ca766557d947031820986f11b1a2 (patch) | |
| tree | 19f7d4c09af27da94bda2dd0ff647b1913b70a67 /src/core/url_request_context_getter_qt.h | |
| parent | 13d03ef21d3bd67595bd0b36be7401f6e6bcbbd6 (diff) | |
| parent | dd7b409388949bc628af75a6e65474d699c416d3 (diff) | |
Merge branch '5.5' into 5.6
Change-Id: I9977663123560a22f493b8c02d02de8897b38666
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, 2 insertions, 1 deletions
diff --git a/src/core/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h index be9567f4b..c7a4366ec 100644 --- a/src/core/url_request_context_getter_qt.h +++ b/src/core/url_request_context_getter_qt.h @@ -47,6 +47,7 @@ #include "content/public/common/url_constants.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 "cookie_monster_delegate_qt.h" #include "network_delegate_qt.h" @@ -97,7 +98,7 @@ private: scoped_ptr<NetworkDelegateQt> m_networkDelegate; scoped_ptr<net::URLRequestContextStorage> m_storage; scoped_ptr<net::URLRequestJobFactoryImpl> m_jobFactory; - + scoped_ptr<net::DhcpProxyScriptFetcherFactory> m_dhcpProxyScriptFetcherFactory; scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate; friend class NetworkDelegateQt; }; |