diff options
author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/common/chrome_switches.h | |
parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/common/chrome_switches.h')
-rw-r--r-- | chrome/common/chrome_switches.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index f8ac686..1270ac4 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -23,6 +23,7 @@ namespace switches { extern const char kActivateOnLaunch[]; extern const char kAllowFileAccessFromFiles[]; extern const char kAllowFileAccess[]; +extern const char kAllowOutdatedPlugins[]; extern const char kAllowSSLMITMProxies[]; extern const char kAllowSandboxDebugging[]; extern const char kAllowScriptingGallery[]; @@ -37,7 +38,6 @@ extern const char kAuthNegotiateDelegateWhitelist[]; extern const char kAuthSchemes[]; extern const char kAuthServerWhitelist[]; extern const char kAutomationClientChannelID[]; -extern const char kBlockNonSandboxedPlugins[]; extern const char kBrowserAssertTest[]; extern const char kBrowserCrashTest[]; extern const char kBrowserSubprocessPath[]; @@ -67,10 +67,12 @@ extern const char kDisableDatabases[]; extern const char kDisableDesktopNotifications[]; extern const char kDisableDevTools[]; extern const char kDisableDeviceOrientation[]; +extern const char kDisableEnforcedThrottling[]; extern const char kDisableExperimentalWebGL[]; extern const char kDisableExtensionsFileAccessCheck[]; extern const char kDisableExtensions[]; extern const char kDisableFileSystem[]; +extern const char kDisableFlashSandbox[]; extern const char kDisableGLSLTranslator[]; extern const char kDisableGeolocation[]; extern const char kDisableGpuWatchdog[]; @@ -78,13 +80,13 @@ extern const char kDisableHangMonitor[]; extern const char kDisableHistoryQuickProvider[]; extern const char kDisableHistoryURLProvider[]; extern const char kDisableInternalFlash[]; +extern const char kDisableIndexedDatabase[]; extern const char kDisableIPv6[]; extern const char kDisableJavaScript[]; extern const char kDisableJava[]; extern const char kDisableLocalStorage[]; extern const char kDisableLogging[]; extern const char kDisableNewTabFirstRun[]; -extern const char kDisableOutdatedPlugins[]; extern const char kDisablePlugins[]; extern const char kDisablePopupBlocking[]; extern const char kDisablePreconnect[]; @@ -100,6 +102,7 @@ extern const char kDisableSSLFalseStart[]; extern const char kDisableSync[]; extern const char kDisableSyncApps[]; extern const char kDisableSyncAutofill[]; +extern const char kDisableSyncAutofillProfile[]; extern const char kDisableSyncBookmarks[]; extern const char kDisableSyncExtensions[]; extern const char kDisableSyncPreferences[]; @@ -140,10 +143,8 @@ extern const char kEnableExperimentalExtensionApis[]; extern const char kEnableExtensionTimelineApi[]; extern const char kEnableFastback[]; extern const char kEnableFileCookies[]; -extern const char kEnableFlashSandbox[]; extern const char kEnableGPUPlugin[]; extern const char kEnableIPv6[]; -extern const char kEnableIndexedDatabase[]; extern const char kEnableLogging[]; extern const char kEnableMemoryInfo[]; extern const char kEnableMonitorProfile[]; @@ -154,6 +155,7 @@ extern const char kEnablePagePrerender[]; extern const char kEnableSyncNewAutofill[]; extern const char kEnablePreconnect[]; extern const char kEnablePredictiveInstant[]; +extern const char kEnablePredictiveNoAutoCompleteInstant[]; extern const char kEnablePreparsedJsCaching[]; extern const char kEnablePrintPreview[]; extern const char kEnableRemoting[]; @@ -194,6 +196,7 @@ extern const char kForceAppsPromoVisible[]; extern const char kForceFieldTestNameAndValue[]; extern const char kForceInternalPDFPlugin[]; extern const char kForceRendererAccessibility[]; +extern const char kForceStubLibcros[]; extern const char kGpuLauncher[]; extern const char kGpuProcess[]; extern const char kGpuStartupDialog[]; @@ -237,6 +240,7 @@ extern const char kNoDefaultBrowserCheck[]; extern const char kNoEvents[]; extern const char kNoExperiments[]; extern const char kNoFirstRun[]; +extern const char kNoGpuSandbox[]; extern const char kNoJsRandomness[]; extern const char kNoProxyServer[]; extern const char kNoReferrers[]; @@ -286,6 +290,7 @@ extern const char kSafePlugins[]; extern const char kSbInfoURLPrefix[]; extern const char kSbMacKeyURLPrefix[]; extern const char kSbDisableAutoUpdate[]; +extern const char kSbEnableDownloadProtection[]; extern const char kSdchFilter[]; extern const char kSearchInOmniboxHint[]; extern const char kServiceProcess[]; @@ -354,7 +359,6 @@ extern const char kGuestSession[]; extern const char kStubCros[]; extern const char kScreenSaverUrl[]; extern const char kCompressSystemFeedback[]; -extern const char kForceStubLibcros[]; extern const char kEnableDOMUIMenu[]; extern const char kEnableMediaPlayer[]; extern const char kEnableAdvancedFileSystem[]; @@ -380,7 +384,6 @@ extern const char kPasswordStore[]; extern const char kDisableHolePunching[]; extern const char kEnableExposeForTabs[]; extern const char kEnableSandboxLogging[]; -extern const char kDisableLinuxWorkerPool[]; #else extern const char kKioskMode[]; #endif @@ -400,11 +403,9 @@ extern const char kRendererCheckFalseTest[]; extern const char kTouchDevices[]; #endif -#if defined(USE_SECCOMP_SANDBOX) extern const char kDisableSeccompSandbox[]; -#else extern const char kEnableSeccompSandbox[]; -#endif + // Return true if the switches indicate the seccomp sandbox is enabled. bool SeccompSandboxEnabled(); |