summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 14:41:41 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 14:41:41 +0000
commit8e0e513103bb5dc6ff104c669432c3aba4af18d3 (patch)
tree6259e591639b557e4ee4558226a7d3e262fa4d4b /chrome
parent62fed2f49842268ddc5963b9a8b8110d08a06779 (diff)
downloadchromium_src-8e0e513103bb5dc6ff104c669432c3aba4af18d3.zip
chromium_src-8e0e513103bb5dc6ff104c669432c3aba4af18d3.tar.gz
chromium_src-8e0e513103bb5dc6ff104c669432c3aba4af18d3.tar.bz2
net: disable the Snap Start command line flag.
We're not ready for external people to start playing with this yet. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/about_flags.cc7
-rw-r--r--chrome/browser/browser_main.cc5
2 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 722cd5d..bb52310 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -221,13 +221,6 @@ const Experiment kExperiments[] = {
switches::kEnableConfirmToQuit
},
{
- "snap-start", // FLAGS:RECORD_UMA
- IDS_FLAGS_SNAP_START_NAME,
- IDS_FLAGS_SNAP_START_DESCRIPTION,
- kOsAll,
- switches::kEnableSnapStart
- },
- {
"extension-apis", // FLAGS:RECORD_UMA
IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index e7afaff..f02ab35 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -202,8 +202,9 @@ void BrowserMainParts::EarlyInitialization() {
net::SSLConfigService::DisableFalseStart();
if (parsed_command_line().HasSwitch(switches::kAllowSSLMITMProxies))
net::SSLConfigService::AllowMITMProxies();
- if (parsed_command_line().HasSwitch(switches::kEnableSnapStart))
- net::SSLConfigService::EnableSnapStart();
+ // Disabled to stop people playing with it.
+ // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart))
+ // net::SSLConfigService::EnableSnapStart();
if (parsed_command_line().HasSwitch(
switches::kEnableDNSCertProvenanceChecking)) {
net::SSLConfigService::EnableDNSCertProvenanceChecking();