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

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

Issue 10693022: Add support for loading user cloud policy on desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed redundant #ifdef OS_CHROMEOS guard 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
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 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 // Enable Kiosk mode. 809 // Enable Kiosk mode.
810 const char kKioskMode[] = "kiosk"; 810 const char kKioskMode[] = "kiosk";
811 811
812 // Print automatically in kiosk mode. |kKioskMode| must be set as well. 812 // Print automatically in kiosk mode. |kKioskMode| must be set as well.
813 // See http://crbug.com/31395. 813 // See http://crbug.com/31395.
814 const char kKioskModePrinting[] = "kiosk-printing"; 814 const char kKioskModePrinting[] = "kiosk-printing";
815 815
816 // Comma-separated list of directories with component extensions to load. 816 // Comma-separated list of directories with component extensions to load.
817 const char kLoadComponentExtension[] = "load-component-extension"; 817 const char kLoadComponentExtension[] = "load-component-extension";
818 818
819 // If present, cloud policy will be loaded and applied once the user is signed
820 // in to the browser.
821 const char kLoadCloudPolicyOnSignin[] = "load-cloud-policy-on-signin";
822
819 // Loads an extension from the specified directory. 823 // Loads an extension from the specified directory.
820 const char kLoadExtension[] = "load-extension"; 824 const char kLoadExtension[] = "load-extension";
821 825
822 // Loads the opencryptoki library into NSS at startup. This is only needed 826 // Loads the opencryptoki library into NSS at startup. This is only needed
823 // temporarily for developers who need to work on WiFi/VPN certificate code. 827 // temporarily for developers who need to work on WiFi/VPN certificate code.
824 // 828 //
825 // TODO(gspencer): Remove this switch once cryptohomed work is finished: 829 // TODO(gspencer): Remove this switch once cryptohomed work is finished:
826 // http://crosbug.com/12295 and http://crosbug.com/12304 830 // http://crosbug.com/12295 and http://crosbug.com/12304
827 const char kLoadOpencryptoki[] = "load-opencryptoki"; 831 const char kLoadOpencryptoki[] = "load-opencryptoki";
828 832
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1524 1528
1525 // ----------------------------------------------------------------------------- 1529 // -----------------------------------------------------------------------------
1526 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1530 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1527 // 1531 //
1528 // You were going to just dump your switches here, weren't you? Instead, please 1532 // You were going to just dump your switches here, weren't you? Instead, please
1529 // put them in alphabetical order above, or in order inside the appropriate 1533 // put them in alphabetical order above, or in order inside the appropriate
1530 // ifdef at the bottom. The order should match the header. 1534 // ifdef at the bottom. The order should match the header.
1531 // ----------------------------------------------------------------------------- 1535 // -----------------------------------------------------------------------------
1532 1536
1533 } // namespace switches 1537 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698