diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 02:02:22 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 02:02:22 +0000 |
| commit | e0da37dfb035ba050fbc0d7f83a205bab9493e22 (patch) | |
| tree | 68ee9de464d0b6d779fb615d80c058030d7e474a /chrome/common/chrome_switches.h | |
| parent | f658af8bb836debbac7ca687634792d9dc6b9f87 (diff) | |
| download | chromium_src-e0da37dfb035ba050fbc0d7f83a205bab9493e22.zip chromium_src-e0da37dfb035ba050fbc0d7f83a205bab9493e22.tar.gz chromium_src-e0da37dfb035ba050fbc0d7f83a205bab9493e22.tar.bz2 | |
Use NSS for SSL by default on Mac OS X.
To use Mac OS X Secure Transport in Chromium, specify the --use-system-ssl
command-line switch, which also replaced the --use-schannel command-line
switch for Windows. All other programs are hardcoded to use NSS for SSL.
If SSL client authentication is requested, fall back on Mac OS X Secure
Transport for now.
R=mark,mbelshe
BUG=30689
TEST=none
Review URL: http://codereview.chromium.org/2747002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_switches.h')
| -rw-r--r-- | chrome/common/chrome_switches.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index c0e3d3e..fb4b5d1 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -264,8 +264,8 @@ extern const char kStartupManifest[]; extern const char kVertScrollDelta[]; #endif -#if defined(OS_WIN) -extern const char kUseSChannel[]; +#if defined(OS_MACOSX) || defined(OS_WIN) +extern const char kUseSystemSSL[]; #endif #if defined(OS_POSIX) @@ -276,7 +276,6 @@ extern const char kNoProcessSingletonDialog[]; #if defined(OS_MACOSX) extern const char kDisableFlashCoreAnimation[]; extern const char kEnableSandboxLogging[]; -extern const char kUseNSSForSSL[]; #else extern const char kKioskMode[]; #endif |