summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorziadh@chromium.org <ziadh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 21:57:53 +0000
committerziadh@chromium.org <ziadh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 21:57:53 +0000
commitc113e9510e7135107358db42397c0797c83ab12f (patch)
treeb0a184faf945f6d71f8d7d98dd06ca7102389d3b
parent0349ab5dc3d6aa0abd87e7c72c0cf3daeff975b1 (diff)
downloadchromium_src-c113e9510e7135107358db42397c0797c83ab12f.zip
chromium_src-c113e9510e7135107358db42397c0797c83ab12f.tar.gz
chromium_src-c113e9510e7135107358db42397c0797c83ab12f.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55797 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_main.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index fc6511b..77d05d7 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1248,15 +1248,10 @@ 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,
- preconnect_enabled,
+ false, // Preconnect is disabled.
parsed_command_line.HasSwitch(switches::kPreconnectDespiteProxy));
#if defined(OS_WIN)