diff options
Diffstat (limited to 'chrome/common/chrome_switches.cc')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 2317fe8..f5c122f 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -917,9 +917,10 @@ const char kStartupManifest[] = "startup-manifest"; const char kVertScrollDelta[] = "vert-scroll-delta"; #endif -#if defined(OS_WIN) -// Use SChannel (the system SSL library on Windows) instead of NSS for SSL. -const char kUseSChannel[] = "use-schannel"; +#if defined(OS_MACOSX) || defined(OS_WIN) +// Use the system SSL library (Secure Transport on Mac, SChannel on Windows) +// instead of NSS for SSL. +const char kUseSystemSSL[] = "use-system-ssl"; #endif #if defined(OS_POSIX) @@ -944,10 +945,6 @@ 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"; |