diff options
| author | ziadh@chromium.org <ziadh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 22:46:57 +0000 |
|---|---|---|
| committer | ziadh@chromium.org <ziadh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 22:46:57 +0000 |
| commit | d461264aa483e2ace1e0225ebb442dbf4c753ada (patch) | |
| tree | c1d85f6eb6cb324dc4891cfda3748e73b8653b7f /chrome/browser/browser_main.cc | |
| parent | 4762b4917edbf202740d27f275e9f96ea5eef54a (diff) | |
| download | chromium_src-d461264aa483e2ace1e0225ebb442dbf4c753ada.zip chromium_src-d461264aa483e2ace1e0225ebb442dbf4c753ada.tar.gz chromium_src-d461264aa483e2ace1e0225ebb442dbf4c753ada.tar.bz2 | |
Revert 55797 - Disable support of --enable-preconnect flag
The preconenct feature is still not fully implemented yet. We would like to
disable it for M6 as it is causing crashes. This is a temporary 'fix'.
BUG=48549
r=jar
Review URL: http://codereview.chromium.org/3140007
TBR=ziadh@chromium.org
Review URL: http://codereview.chromium.org/3161007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55806 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 77d05d7..fc6511b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1248,10 +1248,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, - false, // Preconnect is disabled. + preconnect_enabled, parsed_command_line.HasSwitch(switches::kPreconnectDespiteProxy)); #if defined(OS_WIN) |