diff options
author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-08 20:37:30 +0000 |
---|---|---|
committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-08 20:37:30 +0000 |
commit | 955fc2e75864c1202c399d75c2351f01fba0a9a0 (patch) | |
tree | eed044f5b961a2c9c4ec319c50e76bda09cb670f /chrome/browser | |
parent | 177002925b7152b6eafe92912fe922eb823d21c6 (diff) | |
download | chromium_src-955fc2e75864c1202c399d75c2351f01fba0a9a0.zip chromium_src-955fc2e75864c1202c399d75c2351f01fba0a9a0.tar.gz chromium_src-955fc2e75864c1202c399d75c2351f01fba0a9a0.tar.bz2 |
The great Flip -> Spdy rename.
BUG=30747
TEST=none
Review URL: http://codereview.chromium.org/580009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/browser_init.cc | 8 | ||||
-rw-r--r-- | chrome/browser/browser_main.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 4353846..937cbc8f 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -885,10 +885,10 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line, } } - if (command_line.HasSwitch(switches::kUseFlip)) { - std::string flip_mode = - command_line.GetSwitchValueASCII(switches::kUseFlip); - net::HttpNetworkLayer::EnableFlip(flip_mode); + if (command_line.HasSwitch(switches::kUseSpdy)) { + std::string spdy_mode = + command_line.GetSwitchValueASCII(switches::kUseSpdy); + net::HttpNetworkLayer::EnableSpdy(spdy_mode); } if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 21cc36c..04ec0ed 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -721,7 +721,7 @@ int BrowserMain(const MainFunctionParams& parameters) { #if defined(OS_WIN) if (parsed_command_line.HasSwitch(switches::kUseNSSForSSL) || - parsed_command_line.HasSwitch(switches::kUseFlip)) { + parsed_command_line.HasSwitch(switches::kUseSpdy)) { net::ClientSocketFactory::SetSSLClientSocketFactory( net::SSLClientSocketNSSFactory); } |