summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_switches.cc
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 20:28:03 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 20:28:03 +0000
commit3dd6f5e0807447194b12c7adc9a730d81738a0a6 (patch)
tree6176f288326fdb65d167ce419929260209fff32b /chrome/common/chrome_switches.cc
parent3f94a9eedbb0bd352beeea9ae65591c69c9012f1 (diff)
downloadchromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.zip
chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.tar.gz
chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.tar.bz2
Use SSLClientSocketNSS on Mac OS X. By default, chrome still uses
SSLClientSocketMac. Specify the --use-nss-for-ssl command-line option to use SSLClientSocketNSS. The nss.gyp in src/net/third_party/nss is renamed ssl.gyp to avoid a naming conflict with the nss.gyp in src/third_party/nss. The GYP generator for Xcode project files disallows same-named .gyp files. SSL client authentication doesn't work yet. R=mark BUG=30689 TEST=No build and test failures on Mac and Windows. Review URL: http://codereview.chromium.org/2322008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_switches.cc')
-rw-r--r--chrome/common/chrome_switches.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index f09e7c5..04de5ab 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -931,6 +931,10 @@ const char kEnableSandboxLogging[] = "enable-sandbox-logging";
// Temporary flag to prevent Flash from negotiating the Core Animation drawing
// model. This will be removed once the last issues have been resolved.
const char kDisableFlashCoreAnimation[] = "disable-flash-core-animation";
+
+// Use NSS instead of the system SSL library for SSL.
+// This is a temporary testing flag.
+const char kUseNSSForSSL[] = "use-nss-for-ssl";
#else
// Enable Kiosk mode.
const char kKioskMode[] = "kiosk";