Index: content/common/content_switches.h |
diff --git a/content/common/content_switches.h b/content/common/content_switches.h |
index c11bb6f4bdbc804da31c28b2f513c07a922a18d3..c26af00cf2ec39a438f1b25ddc2676050149af57 100644 |
--- a/content/common/content_switches.h |
+++ b/content/common/content_switches.h |
@@ -9,142 +9,147 @@ |
#pragma once |
#include "build/build_config.h" |
+#include "content/common/content_export.h" |
namespace switches { |
-extern const char kAllowFileAccessFromFiles[]; |
-extern const char kAllowRunningInsecureContent[]; |
+CONTENT_EXPORT extern const char kAllowFileAccessFromFiles[]; |
+CONTENT_EXPORT extern const char kAllowRunningInsecureContent[]; |
extern const char kAllowSandboxDebugging[]; |
extern const char kBrowserSubprocessPath[]; |
// TODO(jam): this doesn't belong in content. |
-extern const char kChromeFrame[]; |
-extern const char kDisable3DAPIs[]; |
-extern const char kDisableAccelerated2dCanvas[]; |
-extern const char kDisableAcceleratedCompositing[]; |
-extern const char kDisableAcceleratedLayers[]; |
-extern const char kDisableAcceleratedPlugins[]; |
-extern const char kDisableAcceleratedVideo[]; |
-extern const char kDisableAltWinstation[]; |
-extern const char kDisableApplicationCache[]; |
+CONTENT_EXPORT extern const char kChromeFrame[]; |
+CONTENT_EXPORT extern const char kDisable3DAPIs[]; |
+CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[]; |
+CONTENT_EXPORT extern const char kDisableAcceleratedCompositing[]; |
+CONTENT_EXPORT extern const char kDisableAcceleratedLayers[]; |
+CONTENT_EXPORT extern const char kDisableAcceleratedPlugins[]; |
+CONTENT_EXPORT extern const char kDisableAcceleratedVideo[]; |
+CONTENT_EXPORT extern const char kDisableAltWinstation[]; |
+CONTENT_EXPORT extern const char kDisableApplicationCache[]; |
extern const char kDisableAudio[]; |
extern const char kDisableBackingStoreLimit[]; |
-extern const char kDisableDatabases[]; |
+CONTENT_EXPORT extern const char kDisableDatabases[]; |
extern const char kDisableDataTransferItems[]; |
extern const char kDisableDesktopNotifications[]; |
extern const char kDisableDeviceOrientation[]; |
-extern const char kDisableExperimentalWebGL[]; |
+CONTENT_EXPORT extern const char kDisableExperimentalWebGL[]; |
extern const char kDisableFileSystem[]; |
extern const char kDisableGeolocation[]; |
-extern const char kDisableGLMultisampling[]; |
+CONTENT_EXPORT extern const char kDisableGLMultisampling[]; |
extern const char kDisableGLSLTranslator[]; |
extern const char kDisableGpuSandbox[]; |
extern const char kDisableGpuWatchdog[]; |
-extern const char kDisableHangMonitor[]; |
+CONTENT_EXPORT extern const char kDisableHangMonitor[]; |
extern const char kDisableIndexedDatabase[]; |
-extern const char kDisableJava[]; |
-extern const char kDisableJavaScript[]; |
+CONTENT_EXPORT extern const char kDisableJava[]; |
+CONTENT_EXPORT extern const char kDisableJavaScript[]; |
extern const char kDisableJavaScriptI18NAPI[]; |
-extern const char kDisableLocalStorage[]; |
-extern const char kDisableLogging[]; |
-extern const char kDisableSmoothScrolling[]; |
-extern const char kDisablePlugins[]; |
-extern const char kDisablePopupBlocking[]; |
+CONTENT_EXPORT extern const char kDisableLocalStorage[]; |
+CONTENT_EXPORT extern const char kDisableLogging[]; |
+CONTENT_EXPORT extern const char kDisableSmoothScrolling[]; |
+CONTENT_EXPORT extern const char kDisablePlugins[]; |
+CONTENT_EXPORT extern const char kDisablePopupBlocking[]; |
extern const char kDisableRendererAccessibility[]; |
extern const char kDisableSeccompSandbox[]; |
extern const char kDisableSessionStorage[]; |
extern const char kDisableSharedWorkers[]; |
extern const char kDisableSpeechInput[]; |
extern const char kDisableSpellcheckAPI[]; |
-extern const char kDisableWebAudio[]; |
+CONTENT_EXPORT extern const char kDisableWebAudio[]; |
extern const char kDisableWebSockets[]; |
extern const char kEnableAccelerated2dCanvas[]; |
-extern const char kEnableAcceleratedDrawing[]; |
+CONTENT_EXPORT extern const char kEnableAcceleratedDrawing[]; |
extern const char kEnableAccessibility[]; |
extern const char kEnableAccessibilityLogging[]; |
-extern const char kEnableBenchmarking[]; |
+CONTENT_EXPORT extern const char kEnableBenchmarking[]; |
extern const char kEnableDeviceMotion[]; |
-extern const char kEnableFullScreen[]; |
+CONTENT_EXPORT extern const char kEnableFullScreen[]; |
extern const char kEnableGPUPlugin[]; |
-extern const char kEnableLogging[]; |
+CONTENT_EXPORT extern const char kEnableLogging[]; |
extern const char kEnableMediaStream[]; |
extern const char kEnableMonitorProfile[]; |
extern const char kEnablePreparsedJsCaching[]; |
extern const char kEnableSandboxLogging[]; |
extern const char kEnableSeccompSandbox[]; |
-extern const char kEnableStatsTable[]; |
+CONTENT_EXPORT extern const char kEnableStatsTable[]; |
extern const char kEnableVideoFullscreen[]; |
extern const char kEnableVideoLogging[]; |
-extern const char kEnableWebIntents[]; |
-extern const char kExperimentalLocationFeatures[]; |
+CONTENT_EXPORT extern const char kEnableWebIntents[]; |
+CONTENT_EXPORT extern const char kExperimentalLocationFeatures[]; |
// TODO(jam): this doesn't belong in content. |
-extern const char kExtensionProcess[]; |
+CONTENT_EXPORT extern const char kExtensionProcess[]; |
extern const char kExtraPluginDir[]; |
extern const char kForceFieldTestNameAndValue[]; |
extern const char kForceRendererAccessibility[]; |
extern const char kGpuLauncher[]; |
-extern const char kGpuProcess[]; |
+CONTENT_EXPORT extern const char kGpuProcess[]; |
extern const char kGpuStartupDialog[]; |
-extern const char kIgnoreGpuBlacklist[]; |
+CONTENT_EXPORT extern const char kIgnoreGpuBlacklist[]; |
extern const char kInProcessGPU[]; |
extern const char kInProcessPlugins[]; |
-extern const char kInProcessWebGL[]; |
+CONTENT_EXPORT extern const char kInProcessWebGL[]; |
extern const char kJavaScriptFlags[]; |
extern const char kLoadPlugin[]; |
-extern const char kLoggingLevel[]; |
+CONTENT_EXPORT extern const char kLoggingLevel[]; |
extern const char kLogPluginMessages[]; |
extern const char kHighLatencyAudio[]; |
// TODO(jam): this doesn't belong in content. |
-extern const char kNaClBrokerProcess[]; |
-extern const char kNaClLoaderProcess[]; |
-extern const char kNoDisplayingInsecureContent[]; |
+CONTENT_EXPORT extern const char kNaClBrokerProcess[]; |
+CONTENT_EXPORT extern const char kNaClLoaderProcess[]; |
+// TODO(bradchen): remove kNaClLinuxHelper switch. |
+// This switch enables the experimental lightweight nacl_helper for Linux. |
+// It will be going away soon, when the helper is enabled permanently. |
+extern const char kNaClLinuxHelper[]; |
+CONTENT_EXPORT extern const char kNoDisplayingInsecureContent[]; |
extern const char kNoJsRandomness[]; |
-extern const char kNoReferrers[]; |
-extern const char kNoSandbox[]; |
-extern const char kPlaybackMode[]; |
+CONTENT_EXPORT extern const char kNoReferrers[]; |
+CONTENT_EXPORT extern const char kNoSandbox[]; |
+CONTENT_EXPORT extern const char kPlaybackMode[]; |
extern const char kPluginLauncher[]; |
-extern const char kPluginPath[]; |
-extern const char kPluginProcess[]; |
+CONTENT_EXPORT extern const char kPluginPath[]; |
+CONTENT_EXPORT extern const char kPluginProcess[]; |
extern const char kPluginStartupDialog[]; |
-extern const char kPpapiBrokerProcess[]; |
-extern const char kPpapiFlashArgs[]; |
-extern const char kPpapiFlashPath[]; |
-extern const char kPpapiFlashVersion[]; |
+CONTENT_EXPORT extern const char kPpapiBrokerProcess[]; |
+CONTENT_EXPORT extern const char kPpapiFlashArgs[]; |
+CONTENT_EXPORT extern const char kPpapiFlashPath[]; |
+CONTENT_EXPORT extern const char kPpapiFlashVersion[]; |
extern const char kPpapiOutOfProcess[]; |
extern const char kPpapiPluginLauncher[]; |
-extern const char kPpapiPluginProcess[]; |
+CONTENT_EXPORT extern const char kPpapiPluginProcess[]; |
extern const char kPpapiStartupDialog[]; |
extern const char kProcessPerSite[]; |
-extern const char kProcessPerTab[]; |
-extern const char kProcessType[]; |
+CONTENT_EXPORT extern const char kProcessPerTab[]; |
+CONTENT_EXPORT extern const char kProcessType[]; |
// TODO(jam): this doesn't belong in content. |
extern const char kProfileImportProcess[]; |
-extern const char kRecordMode[]; |
+CONTENT_EXPORT extern const char kRecordMode[]; |
extern const char kRegisterPepperPlugins[]; |
-extern const char kRemoteShellPort[]; |
+CONTENT_EXPORT extern const char kRemoteShellPort[]; |
extern const char kRendererAssertTest[]; |
extern const char kRendererCmdPrefix[]; |
extern const char kRendererCrashTest[]; |
-extern const char kRendererProcess[]; |
+CONTENT_EXPORT extern const char kRendererProcess[]; |
extern const char kRendererStartupDialog[]; |
// TODO(jam): this doesn't belong in content. |
-extern const char kServiceProcess[]; |
+CONTENT_EXPORT extern const char kServiceProcess[]; |
extern const char kShowPaintRects[]; |
extern const char kSimpleDataSource[]; |
-extern const char kSingleProcess[]; |
+CONTENT_EXPORT extern const char kSingleProcess[]; |
extern const char kSQLiteIndexedDatabase[]; |
extern const char kTestSandbox[]; |
extern const char kUnlimitedQuotaForFiles[]; |
-extern const char kUserAgent[]; |
+CONTENT_EXPORT extern const char kUserAgent[]; |
extern const char kUtilityCmdPrefix[]; |
-extern const char kUtilityProcess[]; |
+CONTENT_EXPORT extern const char kUtilityProcess[]; |
extern const char kUtilityProcessAllowedDir[]; |
-extern const char kWaitForDebuggerChildren[]; |
+CONTENT_EXPORT extern const char kWaitForDebuggerChildren[]; |
extern const char kWebCoreLogChannels[]; |
extern const char kWebWorkerProcessPerCore[]; |
extern const char kWebWorkerShareProcesses[]; |
-extern const char kWorkerProcess[]; |
-extern const char kZygoteCmdPrefix[]; |
-extern const char kZygoteProcess[]; |
+CONTENT_EXPORT extern const char kWorkerProcess[]; |
+CONTENT_EXPORT extern const char kZygoteCmdPrefix[]; |
+CONTENT_EXPORT extern const char kZygoteProcess[]; |
#if defined(OS_WIN) |
extern const char kAuditHandles[]; |