diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/http/http_network_layer.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/http/http_network_layer.cc')
| -rw-r--r-- | chromium/net/http/http_network_layer.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chromium/net/http/http_network_layer.cc b/chromium/net/http/http_network_layer.cc index e4d082eb0fd..7d3f1588006 100644 --- a/chromium/net/http/http_network_layer.cc +++ b/chromium/net/http/http_network_layer.cc @@ -5,6 +5,7 @@ #include "net/http/http_network_layer.h" #include "base/logging.h" +#include "base/power_monitor/power_monitor.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -23,9 +24,19 @@ HttpNetworkLayer::HttpNetworkLayer(HttpNetworkSession* session) : session_(session), suspended_(false) { DCHECK(session_.get()); +#if defined(OS_WIN) + base::PowerMonitor* power_monitor = base::PowerMonitor::Get(); + if (power_monitor) + power_monitor->AddObserver(this); +#endif } HttpNetworkLayer::~HttpNetworkLayer() { +#if defined(OS_WIN) + base::PowerMonitor* power_monitor = base::PowerMonitor::Get(); + if (power_monitor) + power_monitor->RemoveObserver(this); +#endif } //----------------------------------------------------------------------------- @@ -42,7 +53,7 @@ HttpTransactionFactory* HttpNetworkLayer::CreateFactory( void HttpNetworkLayer::ForceAlternateProtocol() { PortAlternateProtocolPair pair; pair.port = 443; - pair.protocol = NPN_SPDY_2; + pair.protocol = NPN_SPDY_3; HttpServerPropertiesImpl::ForceAlternateProtocol(pair); } |