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

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

Issue 6667020: This change loads opencryptoki and uses the TPM for keygen tags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adding missing args in unit tests Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 698
699 // Specifies the flags passed to JS engine 699 // Specifies the flags passed to JS engine
700 const char kJavaScriptFlags[] = "js-flags"; 700 const char kJavaScriptFlags[] = "js-flags";
701 701
702 // Used for testing - keeps browser alive after last browser window closes. 702 // Used for testing - keeps browser alive after last browser window closes.
703 const char kKeepAliveForTest[] = "keep-alive-for-test"; 703 const char kKeepAliveForTest[] = "keep-alive-for-test";
704 704
705 // Load an extension from the specified directory. 705 // Load an extension from the specified directory.
706 const char kLoadExtension[] = "load-extension"; 706 const char kLoadExtension[] = "load-extension";
707 707
708 // Load the opencryptoki library into NSS at startup. This is only
709 // needed temporarily for developers who need to work on WiFi/VPN
710 // certificate code.
711 // TODO(gspencer): Remove this flag once cryptohomed work has landed.
712 const char kLoadOpencryptoki[] = "load-opencryptoki";
713
708 // Uninstall an extension with the specified extension id. 714 // Uninstall an extension with the specified extension id.
709 const char kUninstallExtension[] = "uninstall-extension"; 715 const char kUninstallExtension[] = "uninstall-extension";
710 716
711 // Make Chrome default browser 717 // Make Chrome default browser
712 const char kMakeDefaultBrowser[] = "make-default-browser"; 718 const char kMakeDefaultBrowser[] = "make-default-browser";
713 719
714 // Forces the maximum disk space to be used by the media cache, in bytes. 720 // Forces the maximum disk space to be used by the media cache, in bytes.
715 const char kMediaCacheSize[] = "media-cache-size"; 721 const char kMediaCacheSize[] = "media-cache-size";
716 722
717 // Enable dynamic loading of the Memory Profiler DLL, which will trace 723 // Enable dynamic loading of the Memory Profiler DLL, which will trace
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1217 1223
1218 // ----------------------------------------------------------------------------- 1224 // -----------------------------------------------------------------------------
1219 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1225 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1220 // 1226 //
1221 // You were going to just dump your switches here, weren't you? Instead, 1227 // You were going to just dump your switches here, weren't you? Instead,
1222 // please put them in alphabetical order above, or in order inside the 1228 // please put them in alphabetical order above, or in order inside the
1223 // appropriate ifdef at the bottom. The order should match the header. 1229 // appropriate ifdef at the bottom. The order should match the header.
1224 // ----------------------------------------------------------------------------- 1230 // -----------------------------------------------------------------------------
1225 1231
1226 } // namespace switches 1232 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698