diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 14:18:56 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:13 +0000 |
| commit | 201ade2fbba22bfb27ae029f4d23fca6ded109a0 (patch) | |
| tree | b793f4ed916f73cf18357ea467ff3deb5ffb5b52 /chrome/common/chrome_switches.h | |
| parent | d8c4c37a7d0961944bfdfaa117d5c68c8e129c97 (diff) | |
| download | external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.zip external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.gz external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.bz2 | |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
Diffstat (limited to 'chrome/common/chrome_switches.h')
| -rw-r--r-- | chrome/common/chrome_switches.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 2f30352..6b8570d 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -31,6 +31,7 @@ extern const char kApp[]; extern const char kAppId[]; extern const char kAppsGalleryReturnTokens[]; extern const char kAppsGalleryURL[]; +extern const char kAppsGalleryUpdateURL[]; extern const char kAppsNoThrob[]; extern const char kAuthNegotiateDelegateWhitelist[]; extern const char kAuthSchemes[]; @@ -55,6 +56,7 @@ extern const char kDisableAltWinstation[]; extern const char kDisableApplicationCache[]; extern const char kDisableAudio[]; extern const char kDisableAuthNegotiateCnameLookup[]; +extern const char kDisableBackgroundMode[]; extern const char kDisableBackgroundNetworking[]; extern const char kDisableBackingStoreLimit[]; extern const char kDisableConnectBackupJobs[]; @@ -116,12 +118,15 @@ extern const char kDnsServer[]; extern const char kDomAutomationController[]; extern const char kDumpHistogramsOnExit[]; extern const char kEnableAccelerated2dCanvas[]; +extern const char kEnableAcceleratedLayers[]; extern const char kEnableAccessibility[]; extern const char kEnableAeroPeekTabs[]; extern const char kEnableAppLauncher[]; extern const char kEnableAuthNegotiatePort[]; extern const char kEnableBackgroundMode[]; extern const char kEnableBenchmarking[]; +extern const char kEnableBlockContentAnimation[]; +extern const char kEnableClientSidePhishingDetection[]; extern const char kEnableClearServerData[]; extern const char kEnableClickToPlay[]; extern const char kEnableCloudPrintProxy[]; @@ -129,6 +134,7 @@ extern const char kEnableCloudPrint[]; extern const char kEnableConfirmToQuit[]; extern const char kEnableConnectBackupJobs[]; extern const char kEnableContentPrefetch[]; +extern const char kEnableCrxlessWebApps[]; extern const char kEnableDefaultApps[]; extern const char kEnableDeviceMotion[]; extern const char kEnableDNSCertProvenanceChecking[]; @@ -146,6 +152,7 @@ extern const char kEnableNaCl[]; extern const char kEnableNaClDebug[]; extern const char kEnableNativeWebWorkers[]; extern const char kEnablePagePrerender[]; +extern const char kEnableSyncNewAutofill[]; extern const char kEnablePreconnect[]; extern const char kEnablePredictiveInstant[]; extern const char kEnablePreparsedJsCaching[]; @@ -389,6 +396,10 @@ extern const char kWebSocketLiveExperimentHost[]; extern const char kRendererCheckFalseTest[]; #endif +#if defined(HAVE_XINPUT2) +extern const char kTouchDevices[]; +#endif + #if defined(USE_SECCOMP_SANDBOX) extern const char kDisableSeccompSandbox[]; #else |