summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 21:58:42 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 21:58:42 +0000
commit9dc700d1f0e45530ae1055c38721bad2504e53b7 (patch)
treef44e3d84532c226bf9ce1d3aba88e108a6049c3a
parentc2a17ba1120977c97de531883aafbf74eae4cf97 (diff)
downloadchromium_src-9dc700d1f0e45530ae1055c38721bad2504e53b7.zip
chromium_src-9dc700d1f0e45530ae1055c38721bad2504e53b7.tar.gz
chromium_src-9dc700d1f0e45530ae1055c38721bad2504e53b7.tar.bz2
Ensure that SPDY is enabled on Chrome OS.
Review URL: http://codereview.chromium.org/6821079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81316 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_main.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 40696db..746ae30 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -413,6 +413,9 @@ void BrowserMainParts::SpdyFieldTrial() {
} else {
CHECK(!is_spdy_trial);
}
+#else
+ // Always enable SPDY on Chrome OS
+ net::HttpNetworkLayer::EnableSpdy("npn");
#endif // !defined(OS_CHROMEOS)
}