diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 18:06:06 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 18:06:06 +0000 |
| commit | 31e2c69eb9a9cf4e59f08b483f7cd849631e7da4 (patch) | |
| tree | b3aa94737e007c402e16f761af2c8b11796a360c /chrome | |
| parent | 485392bfbc7a311782c2663b02f28a64f1bcc4be (diff) | |
| download | chromium_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')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
3 files changed, 7 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( diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index a1725e9..d75105d 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -753,6 +753,9 @@ const char kIgnoreCertificateErrors[] = "ignore-certificate-errors"; // Set the maximum SPDY sessions per domain. const char kMaxSpdySessionsPerDomain[] = "max-spdy-sessions-per-domain"; +// Enable Alternate-Protocol support. +const char kUseAlternateProtocols[] = "use-alternate-protocols"; + // Use the low fragmentation heap for the CRT. const char kUseLowFragHeapCrt[] = "use-lf-heap"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index ca48aa7..7cf55b3 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -211,6 +211,7 @@ extern const char kFixedHttpPort[]; extern const char kFixedHttpsPort[]; extern const char kIgnoreCertificateErrors[]; extern const char kMaxSpdySessionsPerDomain[]; +extern const char kUseAlternateProtocols[]; extern const char kUseLowFragHeapCrt[]; extern const char kUserAgent[]; extern const char kUserDataDir[]; |