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

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

Issue 2333004: Re-landing mistakenly reverted CL http://codereview.chromium.org/2101021.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | no next file » | 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 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 const char kProfile[] = "profile"; 888 const char kProfile[] = "profile";
889 889
890 // Specifies the profile to use once a chromeos user is logged in. 890 // Specifies the profile to use once a chromeos user is logged in.
891 const char kLoginProfile[] = "login-profile"; 891 const char kLoginProfile[] = "login-profile";
892 892
893 // Specifies the user which is already logged in. 893 // Specifies the user which is already logged in.
894 const char kLoginUser[] = "login-user"; 894 const char kLoginUser[] = "login-user";
895 895
896 // Use the frame layout used in chromeos. 896 // Use the frame layout used in chromeos.
897 const char kChromeosFrame[] = "chromeos-frame"; 897 const char kChromeosFrame[] = "chromeos-frame";
898
899 // Specify startup customization manifest.
900 // TODO(denisromanov): delete this once it's not needed for testing anymore.
901 const char kStartupManifest[] = "startup-manifest";
902
898 #endif 903 #endif
899 904
900 #if defined(OS_WIN) 905 #if defined(OS_WIN)
901 // Use SChannel (the system SSL library on Windows) instead of NSS for SSL. 906 // Use SChannel (the system SSL library on Windows) instead of NSS for SSL.
902 const char kUseSChannel[] = "use-schannel"; 907 const char kUseSChannel[] = "use-schannel";
903 #endif 908 #endif
904 909
905 #if defined(OS_POSIX) 910 #if defined(OS_POSIX)
906 // Bypass the error dialog when the profile lock couldn't be attained. 911 // Bypass the error dialog when the profile lock couldn't be attained.
907 // A flag, generated internally by Chrome for renderer and other helper process 912 // A flag, generated internally by Chrome for renderer and other helper process
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 975
971 // ----------------------------------------------------------------------------- 976 // -----------------------------------------------------------------------------
972 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 977 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
973 // 978 //
974 // You were going to just dump your switches here, weren't you? Instead, 979 // You were going to just dump your switches here, weren't you? Instead,
975 // please put them in alphabetical order above, or in order inside the 980 // please put them in alphabetical order above, or in order inside the
976 // appropriate ifdef at the bottom. The order should match the header. 981 // appropriate ifdef at the bottom. The order should match the header.
977 // ----------------------------------------------------------------------------- 982 // -----------------------------------------------------------------------------
978 983
979 } // namespace switches 984 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698