diff options
author | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 21:37:21 +0000 |
---|---|---|
committer | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 21:37:21 +0000 |
commit | 669f1476f3c5cf464e7b82d6338ba7ae41bf8ce0 (patch) | |
tree | 319f6e3d4e70acfa143e9a28b05fafb0ec630366 /chrome/browser | |
parent | 1a14188b1eb6a595da3e2f012e9223ca2b55f590 (diff) | |
download | chromium_src-669f1476f3c5cf464e7b82d6338ba7ae41bf8ce0.zip chromium_src-669f1476f3c5cf464e7b82d6338ba7ae41bf8ce0.tar.gz chromium_src-669f1476f3c5cf464e7b82d6338ba7ae41bf8ce0.tar.bz2 |
Remove HttpTransactionWinHttp and the --winhttp command-line
switch.
Remove WinHttpThrottle and CertStatusCache, which are only
used by HttpTransactionWinHttp.
Fix nits reported by cpplint.py.
R=eroman,darin
BUG=6323
Review URL: http://codereview.chromium.org/17635
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/browser_main.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 6a5b879..21e93e7 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -147,9 +147,9 @@ StringPiece NetResourceProvider(int key) { // Main routine for running as the Browser process. int BrowserMain(const MainFunctionParams& parameters) { CommandLine& parsed_command_line = parameters.command_line_; - sandbox::BrokerServices* broker_services = + sandbox::BrokerServices* broker_services = parameters.sandbox_info_.BrokerServices(); - + // WARNING: If we get a WM_ENDSESSION objects created on the stack here // are NOT deleted. If you need something to run during WM_ENDSESSION add it // to browser_shutdown::Shutdown or BrowserProcess::EndSession. @@ -180,13 +180,6 @@ int BrowserMain(const MainFunctionParams& parameters) { main_message_loop.set_thread_name(thread_name); bool already_running = Upgrade::IsBrowserAlreadyRunning(); -#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); -#endif - std::wstring user_data_dir; PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); BrowserInit::MessageWindow message_window(user_data_dir); |