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

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

Issue 431833002: Cleanup: Only define various NaCl flags when PPAPI is enabled. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 6 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') | 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) 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 15 matching lines...) Expand all
26 const char kAllowCrossOriginAuthPrompt[] = "allow-cross-origin-auth-prompt"; 26 const char kAllowCrossOriginAuthPrompt[] = "allow-cross-origin-auth-prompt";
27 27
28 // On ChromeOS, file:// access is disabled except for certain whitelisted 28 // On ChromeOS, file:// access is disabled except for certain whitelisted
29 // directories. This switch re-enables file:// for testing. 29 // directories. This switch re-enables file:// for testing.
30 const char kAllowFileAccess[] = "allow-file-access"; 30 const char kAllowFileAccess[] = "allow-file-access";
31 31
32 // Allow non-secure origins to use the screen capture API and the desktopCapture 32 // Allow non-secure origins to use the screen capture API and the desktopCapture
33 // extension API. 33 // extension API.
34 const char kAllowHttpScreenCapture[] = "allow-http-screen-capture"; 34 const char kAllowHttpScreenCapture[] = "allow-http-screen-capture";
35 35
36 #if defined(ENABLE_PLUGINS)
36 // Specifies comma-separated list of extension ids or hosts to grant 37 // Specifies comma-separated list of extension ids or hosts to grant
37 // access to CRX file system APIs. 38 // access to CRX file system APIs.
38 const char kAllowNaClCrxFsAPI[] = "allow-nacl-crxfs-api"; 39 const char kAllowNaClCrxFsAPI[] = "allow-nacl-crxfs-api";
39 40
40 // Specifies comma-separated list of extension ids or hosts to grant 41 // Specifies comma-separated list of extension ids or hosts to grant
41 // access to file handle APIs. 42 // access to file handle APIs.
42 const char kAllowNaClFileHandleAPI[] = "allow-nacl-file-handle-api"; 43 const char kAllowNaClFileHandleAPI[] = "allow-nacl-file-handle-api";
43 44
44 // Specifies comma-separated list of extension ids or hosts to grant 45 // Specifies comma-separated list of extension ids or hosts to grant
45 // access to TCP/UDP socket APIs. 46 // access to TCP/UDP socket APIs.
46 const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; 47 const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
48 #endif
47 49
48 // Don't block outdated plugins. 50 // Don't block outdated plugins.
49 const char kAllowOutdatedPlugins[] = "allow-outdated-plugins"; 51 const char kAllowOutdatedPlugins[] = "allow-outdated-plugins";
50 52
51 // By default, an https page cannot run JavaScript, CSS or plug-ins from http 53 // By default, an https page cannot run JavaScript, CSS or plug-ins from http
52 // URLs. This provides an override to get the old insecure behavior. 54 // URLs. This provides an override to get the old insecure behavior.
53 const char kAllowRunningInsecureContent[] = "allow-running-insecure-content"; 55 const char kAllowRunningInsecureContent[] = "allow-running-insecure-content";
54 56
55 // Specifies the threshold to be used when determining of an Alternate-Protocol 57 // Specifies the threshold to be used when determining of an Alternate-Protocol
56 // advertisement will be honored. If the advertised probability is larger 58 // advertisement will be honored. If the advertised probability is larger
(...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1380 1382
1381 // ----------------------------------------------------------------------------- 1383 // -----------------------------------------------------------------------------
1382 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1384 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1383 // 1385 //
1384 // You were going to just dump your switches here, weren't you? Instead, please 1386 // You were going to just dump your switches here, weren't you? Instead, please
1385 // put them in alphabetical order above, or in order inside the appropriate 1387 // put them in alphabetical order above, or in order inside the appropriate
1386 // ifdef at the bottom. The order should match the header. 1388 // ifdef at the bottom. The order should match the header.
1387 // ----------------------------------------------------------------------------- 1389 // -----------------------------------------------------------------------------
1388 1390
1389 } // namespace switches 1391 } // 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