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

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

Issue 10823208: Reverting this as it causes browser tests on the Linux ChromiumOS builder to fail. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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') | chrome/common/pref_names.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 // Enable Kiosk mode. 814 // Enable Kiosk mode.
815 const char kKioskMode[] = "kiosk"; 815 const char kKioskMode[] = "kiosk";
816 816
817 // Print automatically in kiosk mode. |kKioskMode| must be set as well. 817 // Print automatically in kiosk mode. |kKioskMode| must be set as well.
818 // See http://crbug.com/31395. 818 // See http://crbug.com/31395.
819 const char kKioskModePrinting[] = "kiosk-printing"; 819 const char kKioskModePrinting[] = "kiosk-printing";
820 820
821 // Comma-separated list of directories with component extensions to load. 821 // Comma-separated list of directories with component extensions to load.
822 const char kLoadComponentExtension[] = "load-component-extension"; 822 const char kLoadComponentExtension[] = "load-component-extension";
823 823
824 // If present, cloud policy will be loaded and applied once the user is signed
825 // in to the browser.
826 const char kLoadCloudPolicyOnSignin[] = "load-cloud-policy-on-signin";
827
828 // Loads an extension from the specified directory. 824 // Loads an extension from the specified directory.
829 const char kLoadExtension[] = "load-extension"; 825 const char kLoadExtension[] = "load-extension";
830 826
831 // Loads the opencryptoki library into NSS at startup. This is only needed 827 // Loads the opencryptoki library into NSS at startup. This is only needed
832 // temporarily for developers who need to work on WiFi/VPN certificate code. 828 // temporarily for developers who need to work on WiFi/VPN certificate code.
833 // 829 //
834 // TODO(gspencer): Remove this switch once cryptohomed work is finished: 830 // TODO(gspencer): Remove this switch once cryptohomed work is finished:
835 // http://crosbug.com/12295 and http://crosbug.com/12304 831 // http://crosbug.com/12295 and http://crosbug.com/12304
836 const char kLoadOpencryptoki[] = "load-opencryptoki"; 832 const char kLoadOpencryptoki[] = "load-opencryptoki";
837 833
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
1553 1549
1554 // ----------------------------------------------------------------------------- 1550 // -----------------------------------------------------------------------------
1555 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1551 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1556 // 1552 //
1557 // You were going to just dump your switches here, weren't you? Instead, please 1553 // You were going to just dump your switches here, weren't you? Instead, please
1558 // put them in alphabetical order above, or in order inside the appropriate 1554 // put them in alphabetical order above, or in order inside the appropriate
1559 // ifdef at the bottom. The order should match the header. 1555 // ifdef at the bottom. The order should match the header.
1560 // ----------------------------------------------------------------------------- 1556 // -----------------------------------------------------------------------------
1561 1557
1562 } // namespace switches 1558 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698