diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 16:23:35 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 16:23:35 +0000 |
| commit | 78ed550dbdaa920b0f899b6fa8776492667957b6 (patch) | |
| tree | f5597794a4f4acb32d5192188d38485588ba833d /chrome/browser/browser_main.cc | |
| parent | 14a0aacb411040d2a4f60dc27573f0f8b33bc1e6 (diff) | |
| download | chromium_src-78ed550dbdaa920b0f899b6fa8776492667957b6.zip chromium_src-78ed550dbdaa920b0f899b6fa8776492667957b6.tar.gz chromium_src-78ed550dbdaa920b0f899b6fa8776492667957b6.tar.bz2 | |
Reland 54771 (and 54795) To enable TCP Preconnection by default
I added defensive code in ClientSocketHandle::ReleaseSocket(),
which should preclude the crash that was reported on the
stability bot.
I added a second call to ReleaseSocket() from
~ClientSocketHandle to ensure that we updated the
related ClientSocket when we are torn down.
r=mbelshe
Review URL: http://codereview.chromium.org/3071022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 04fd26b..f35779a 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1199,10 +1199,15 @@ int BrowserMain(const MainFunctionParams& parameters) { // pre-resolution, as well as TCP/IP connection pre-warming. // This also registers an observer to discard data when closing incognito // mode. + bool preconnect_enabled = true; // Default status (easy to change!). + if (parsed_command_line.HasSwitch(switches::kDisablePreconnect)) + preconnect_enabled = false; + else if (parsed_command_line.HasSwitch(switches::kEnablePreconnect)) + preconnect_enabled = true; chrome_browser_net::PredictorInit dns_prefetch( user_prefs, local_state, - parsed_command_line.HasSwitch(switches::kEnablePreconnect), + preconnect_enabled, parsed_command_line.HasSwitch(switches::kPreconnectDespiteProxy)); #if defined(OS_WIN) |