diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/base/base_switches.cc | |
parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/base_switches.cc')
-rw-r--r-- | chromium/base/base_switches.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chromium/base/base_switches.cc b/chromium/base/base_switches.cc index 546e7924a92..9554233b41c 100644 --- a/chromium/base/base_switches.cc +++ b/chromium/base/base_switches.cc @@ -10,11 +10,17 @@ namespace switches { // Disables the crash reporting. const char kDisableBreakpad[] = "disable-breakpad"; +// Comma-separated list of feature names to disable. See also kEnableFeatures. +const char kDisableFeatures[] = "disable-features"; + // Indicates that crash reporting should be enabled. On platforms where helper // processes cannot access to files needed to make this decision, this flag is // generated internally. const char kEnableCrashReporter[] = "enable-crash-reporter"; +// Comma-separated list of feature names to enable. See also kDisableFeatures. +const char kEnableFeatures[] = "enable-features"; + // Makes memory allocators keep track of their allocations and context, so a // detailed breakdown of memory usage can be presented in chrome://tracing when // the memory-infra category is enabled. @@ -113,4 +119,10 @@ const char kEnableCrashReporterForTesting[] = "enable-crash-reporter-for-testing"; #endif +#if defined(OS_ANDROID) +// Calls madvise(MADV_RANDOM) on executable code right after the library is +// loaded, from all processes. +const char kMadviseRandomExecutableCode[] = "madvise-random-executable-code"; +#endif + } // namespace switches |