diff options
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/browser_main.cc | 5 | ||||
-rw-r--r-- | chrome/common/chrome_switches.cc | 4 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index a35bce3..104a93f 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -295,8 +295,9 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, #if defined(OS_WIN) // Make the selection of network stacks early on before any consumers try to // issue HTTP requests. - if (parsed_command_line.HasSwitch(switches::kUseWinHttp)) - net::HttpNetworkLayer::UseWinHttp(true); + net::HttpNetworkLayer::UseWinHttp(true); + if (parsed_command_line.HasSwitch(switches::kUseNewHttp)) + net::HttpNetworkLayer::UseWinHttp(false); #endif std::wstring user_data_dir; diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index cafb6f1..9e9f88b 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -312,8 +312,8 @@ const wchar_t kGearsPluginPathOverride[] = L"gears-plugin-path"; // Switch to load Gears in the renderer process. const wchar_t kGearsInRenderer[] = L"gears-in-renderer"; -// Enable winhttp HTTP stack. -const wchar_t kUseWinHttp[] = L"winhttp"; +// Enable new HTTP stack. +const wchar_t kUseNewHttp[] = L"new-http"; // Enable the fastback page cache. const wchar_t kEnableFastback[] = L"enable-fastback"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 9e99a80..fdd2648 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -118,7 +118,7 @@ extern const wchar_t kGearsPluginPathOverride[]; extern const wchar_t kGearsInRenderer[]; -extern const wchar_t kUseWinHttp[]; +extern const wchar_t kUseNewHttp[]; extern const wchar_t kEnableFastback[]; |