Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 2322008: Use SSLClientSocketNSS on Mac OS X. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add build/linux/system.gyp to the CL. Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 #endif 922 #endif
923 923
924 #if defined(OS_MACOSX) 924 #if defined(OS_MACOSX)
925 // Cause the OS X sandbox write to syslog every time an access to a resource 925 // Cause the OS X sandbox write to syslog every time an access to a resource
926 // is denied by the sandbox. 926 // is denied by the sandbox.
927 const char kEnableSandboxLogging[] = "enable-sandbox-logging"; 927 const char kEnableSandboxLogging[] = "enable-sandbox-logging";
928 928
929 // Temporary flag to prevent Flash from negotiating the Core Animation drawing 929 // Temporary flag to prevent Flash from negotiating the Core Animation drawing
930 // model. This will be removed once the last issues have been resolved. 930 // model. This will be removed once the last issues have been resolved.
931 const char kDisableFlashCoreAnimation[] = "disable-flash-core-animation"; 931 const char kDisableFlashCoreAnimation[] = "disable-flash-core-animation";
932
933 // Use NSS instead of the system SSL library for SSL.
934 // This is a temporary testing flag.
935 const char kUseNSSForSSL[] = "use-nss-for-ssl";
932 #else 936 #else
933 // Enable Kiosk mode. 937 // Enable Kiosk mode.
934 const char kKioskMode[] = "kiosk"; 938 const char kKioskMode[] = "kiosk";
935 #endif 939 #endif
936 940
937 #ifndef NDEBUG 941 #ifndef NDEBUG
938 // Debug only switch to specify which gears plugin dll to load. 942 // Debug only switch to specify which gears plugin dll to load.
939 const char kGearsPluginPathOverride[] = "gears-plugin-path"; 943 const char kGearsPluginPathOverride[] = "gears-plugin-path";
940 944
941 // Makes sure any sync login attempt will fail with an error. (Only 945 // Makes sure any sync login attempt will fail with an error. (Only
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 979
976 // ----------------------------------------------------------------------------- 980 // -----------------------------------------------------------------------------
977 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 981 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
978 // 982 //
979 // You were going to just dump your switches here, weren't you? Instead, 983 // You were going to just dump your switches here, weren't you? Instead,
980 // please put them in alphabetical order above, or in order inside the 984 // please put them in alphabetical order above, or in order inside the
981 // appropriate ifdef at the bottom. The order should match the header. 985 // appropriate ifdef at the bottom. The order should match the header.
982 // ----------------------------------------------------------------------------- 986 // -----------------------------------------------------------------------------
983 987
984 } // namespace switches 988 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698