summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 18:06:06 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 18:06:06 +0000
commit31e2c69eb9a9cf4e59f08b483f7cd849631e7da4 (patch)
treeb3aa94737e007c402e16f761af2c8b11796a360c /chrome/browser/browser_main.cc
parent485392bfbc7a311782c2663b02f28a64f1bcc4be (diff)
downloadchromium_src-31e2c69eb9a9cf4e59f08b483f7cd849631e7da4.zip
chromium_src-31e2c69eb9a9cf4e59f08b483f7cd849631e7da4.tar.gz
chromium_src-31e2c69eb9a9cf4e59f08b483f7cd849631e7da4.tar.bz2
SPDY: Alternate-Protocol changes.
Change chromium to expect npn-spdy/1 instead of npn-spdy to match server-side changes. Move the use of Alternate-Protocol to be behind command line flag: "--use-alternate-protocols". Review URL: http://codereview.chromium.org/1593029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-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 17838223..840c0d1 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -363,6 +363,9 @@ void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
if (parsed_command_line.HasSwitch(switches::kIgnoreCertificateErrors))
net::HttpNetworkTransaction::IgnoreCertificateErrors(true);
+ if (parsed_command_line.HasSwitch(switches::kUseAlternateProtocols))
+ net::HttpNetworkTransaction::SetUseAlternateProtocols(true);
+
if (parsed_command_line.HasSwitch(switches::kMaxSpdySessionsPerDomain)) {
int value = StringToInt(
parsed_command_line.GetSwitchValueASCII(