summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 23:35:09 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 23:35:09 +0000
commitce5737147ffa9e194590cf081dbe198a2f98f27d (patch)
tree7150ac07e269a1d7ab934c7c34e39fe5a5bbb531 /chrome/common
parent5bd955545384f88891ac79937532106adc77ac66 (diff)
downloadchromium_src-ce5737147ffa9e194590cf081dbe198a2f98f27d.zip
chromium_src-ce5737147ffa9e194590cf081dbe198a2f98f27d.tar.gz
chromium_src-ce5737147ffa9e194590cf081dbe198a2f98f27d.tar.bz2
Hide Wi-Fi 802.1X EAP-TLS and LEAP under a flag.
EAP-TLS and LEAP support are still experimental, so for M12 we're going to hide them behind an --enable-experimental-eap flag. BUG=chromium-os:14047 TEST=Try to join "Google-A" or other EAP-TLS network. In the Join Wi-Fi network dialog you should only see EAP methods "PEAP" and "EAP-TTLS". There should be a "server CA cert" combobox, but not a "user cert" combobox. Then start chrome with the command line flag "--enable-experimental-eap" and try again. You should now see "EAP-TLS" as an option and a combobox to select a client certificate. Review URL: http://codereview.chromium.org/6824065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc6
-rw-r--r--chrome/common/chrome_switches.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index efbb36b..83e9322 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1085,6 +1085,12 @@ const char kDOMLogin[] = "dom-login";
// Enables device policy support on ChromeOS.
const char kEnableDevicePolicy[] = "enable-device-policy";
+// Enable all 802.1X EAP Wi-Fi connection modes, like EAP-TLS and LEAP.
+// TODO(jamescook): Remove this when all major 802.1X modes are supported
+// through the full network stack, specifically those that require TPM and
+// client-side certificates.
+const char kEnableExperimentalEap[] = "enable-experimental-eap";
+
// Enable the redirection of viewable document requests to the Google
// Document Viewer.
const char kEnableGView[] = "enable-gview";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 64bc63c..248f0b8 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -301,6 +301,7 @@ extern const char kWinHttpProxyResolver[];
#if defined(OS_CHROMEOS)
extern const char kDOMLogin[];
extern const char kEnableDevicePolicy[];
+extern const char kEnableExperimentalEap[];
extern const char kEnableGView[];
extern const char kEnableLoginImages[];
extern const char kLoginManager[];