diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-10 16:56:53 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-25 10:00:35 +0000 |
commit | 44d980ff67867cb65bfe8035326be2b461ca7172 (patch) | |
tree | b17af444fe62213fd7ea4d740c1abbe8d6b1002d /src/core/proxy_config_service_qt.h | |
parent | 38944be4048e19a0ab6f3b8961f58e36048b53a8 (diff) |
Rebasing on Chromium 45
Fixing the minor differences needed to work with Chromium 45.
Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/proxy_config_service_qt.h')
-rw-r--r-- | src/core/proxy_config_service_qt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/proxy_config_service_qt.h b/src/core/proxy_config_service_qt.h index f2f06d3fa..ee4263314 100644 --- a/src/core/proxy_config_service_qt.h +++ b/src/core/proxy_config_service_qt.h @@ -72,7 +72,7 @@ private: void RegisterObserver(); scoped_ptr<net::ProxyConfigService> m_baseService; - ObserverList<net::ProxyConfigService::Observer, true> m_observers; + base::ObserverList<net::ProxyConfigService::Observer, true> m_observers; // Keep the last QNetworkProxy::applicationProxy state around. QNetworkProxy m_qtApplicationProxy; |