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

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

Issue 573041: Add the ssl_client_socket_nss_factory.h header and declare... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Sync with the current trunk. Created 10 years, 10 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
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | net/net.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8
9 namespace switches { 9 namespace switches {
10 10
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 // This is a comma-separated list of plugin library names. 624 // This is a comma-separated list of plugin library names.
625 const char kTrustedPlugins[] = "trusted-plugins"; 625 const char kTrustedPlugins[] = "trusted-plugins";
626 626
627 // Experimental. Shows a dialog asking the user to try chrome. This flag 627 // Experimental. Shows a dialog asking the user to try chrome. This flag
628 // is to be used only by the upgrade process. 628 // is to be used only by the upgrade process.
629 const char kTryChromeAgain[] = "try-chrome-again"; 629 const char kTryChromeAgain[] = "try-chrome-again";
630 630
631 // Runs un-installation steps that were done by chrome first-run. 631 // Runs un-installation steps that were done by chrome first-run.
632 const char kUninstall[] = "uninstall"; 632 const char kUninstall[] = "uninstall";
633 633
634 // Use NSS instead of the system SSL library for SSL.
635 // This is a temporary testing flag.
636 const char kUseNSSForSSL[] = "use-nss-for-ssl";
637
638 // Use Spdy for the transport protocol instead of HTTP. 634 // Use Spdy for the transport protocol instead of HTTP.
639 // This is a temporary testing flag. 635 // This is a temporary testing flag.
640 const char kUseSpdy[] = "use-spdy"; 636 const char kUseSpdy[] = "use-spdy";
641 637
642 // Force all requests to go to this server. This commandline is provided 638 // Force all requests to go to this server. This commandline is provided
643 // for testing purposes only, and will likely be removed soon. It can also 639 // for testing purposes only, and will likely be removed soon. It can also
644 // hurt startup performance as it does a synchronous name resolution on the 640 // hurt startup performance as it does a synchronous name resolution on the
645 // UI thread. 641 // UI thread.
646 // The host resolution using this scheme is done exactly once at startup. 642 // The host resolution using this scheme is done exactly once at startup.
647 // From that point on, it is completely a static configuration. 643 // From that point on, it is completely a static configuration.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 // means the library could not be loaded correctly. 719 // means the library could not be loaded correctly.
724 const char kTestLoadLibcros[] = "test-load-libcros"; 720 const char kTestLoadLibcros[] = "test-load-libcros";
725 721
726 // Overrides the Default profile. 722 // Overrides the Default profile.
727 const char kProfile[] = "profile"; 723 const char kProfile[] = "profile";
728 724
729 // Use the frame layout used in chromeos. 725 // Use the frame layout used in chromeos.
730 const char kChromeosFrame[] = "chromeos-frame"; 726 const char kChromeosFrame[] = "chromeos-frame";
731 #endif 727 #endif
732 728
729 #if defined(OS_WIN)
730 // Use NSS instead of the system SSL library for SSL.
731 // This is a temporary testing flag.
732 const char kUseNSSForSSL[] = "use-nss-for-ssl";
733 #endif
734
733 #if defined(OS_LINUX) 735 #if defined(OS_LINUX)
734 // A temporary switch before we implement the client certificate selection UI. 736 // A temporary switch before we implement the client certificate selection UI.
735 // When an SSL server requests client authentication, select a client 737 // When an SSL server requests client authentication, select a client
736 // certificate automatically. 738 // certificate automatically.
737 // WARNING: This switch has privacy issues because it reveals the user's 739 // WARNING: This switch has privacy issues because it reveals the user's
738 // identity to any server that requests a client certificate without the 740 // identity to any server that requests a client certificate without the
739 // user's consent. 741 // user's consent.
740 const char kAutoSSLClientAuth[] = "auto-ssl-client-auth"; 742 const char kAutoSSLClientAuth[] = "auto-ssl-client-auth";
741 #endif 743 #endif
742 744
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 776
775 // ----------------------------------------------------------------------------- 777 // -----------------------------------------------------------------------------
776 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 778 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
777 // 779 //
778 // You were going to just dump your switches here, weren't you? Instead, 780 // You were going to just dump your switches here, weren't you? Instead,
779 // please put them in alphabetical order above, or in order inside the 781 // please put them in alphabetical order above, or in order inside the
780 // appropriate ifdef at the bottom. The order should match the header. 782 // appropriate ifdef at the bottom. The order should match the header.
781 // ----------------------------------------------------------------------------- 783 // -----------------------------------------------------------------------------
782 784
783 } // namespace switches 785 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698