Chromium Code Reviews| Index: chrome/browser/about_flags.cc |
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
| index c2471f3ff7965198965187d382a83ff05bf80010..99929c0efc076fbaf9ae52dd5069413d5d88dd87 100644 |
| --- a/chrome/browser/about_flags.cc |
| +++ b/chrome/browser/about_flags.cc |
| @@ -26,6 +26,7 @@ |
| #include "base/values.h" |
| #include "build/build_config.h" |
| #include "cc/base/switches.h" |
| +#include "chrome/browser/experiments/memory_ablation_experiment.h" |
| #include "chrome/browser/flag_descriptions.h" |
| #include "chrome/browser/ntp_snippets/ntp_snippets_features.h" |
| #include "chrome/browser/page_load_metrics/experiments/delay_navigation_throttle.h" |
| @@ -828,6 +829,21 @@ const FeatureEntry::FeatureVariation kDelayNavigationFeatureVariations[] = { |
| {"(0-5 second randomized delay)", kDelayNavigation5SecondDelayRandomize, |
| arraysize(kDelayNavigation5SecondDelayRandomize), nullptr}}; |
| +const FeatureEntry::FeatureParam kMemoryAblation1MiB[] = { |
| + {kMemoryAblationFeatureSizeParam, "1048576"}}; |
| +const FeatureEntry::FeatureParam kMemoryAblation2MiB[] = { |
| + {kMemoryAblationFeatureSizeParam, "2097152"}}; |
| +const FeatureEntry::FeatureParam kMemoryAblation5MiB[] = { |
| + {kMemoryAblationFeatureSizeParam, "5242880"}}; |
| +const FeatureEntry::FeatureParam kMemoryAblation10MiB[] = { |
| + {kMemoryAblationFeatureSizeParam, "10485760"}}; |
| + |
| +const FeatureEntry::FeatureVariation kMemoryAblationFeatureVariations[] = { |
| + {"1 MiB", kMemoryAblation1MiB, arraysize(kMemoryAblation1MiB), nullptr}, |
| + {"2 MiB", kMemoryAblation2MiB, arraysize(kMemoryAblation2MiB), nullptr}, |
| + {"5 MiB", kMemoryAblation5MiB, arraysize(kMemoryAblation5MiB), nullptr}, |
|
Primiano Tucci (use gerrit)
2017/04/10 18:05:04
I think 2 vs 5 isn't going to be a huge difference
DmitrySkiba
2017/04/10 19:30:59
Done. Removed 2, added 50. These values are just f
|
| + {"10 MiB", kMemoryAblation10MiB, arraysize(kMemoryAblation10MiB), nullptr}}; |
| + |
| #if defined(OS_ANDROID) |
| const FeatureEntry::FeatureParam kPersistentMenuItemEnabled[] = { |
| {"persistent_menu_item_enabled", "true"}}; |
| @@ -2591,6 +2607,12 @@ const FeatureEntry kFeatureEntries[] = { |
| kDelayNavigationFeatureVariations, |
| "DelayNavigation")}, |
| + {"memory-ablation", flag_descriptions::kMemoryAblationName, |
| + flag_descriptions::kMemoryAblationDescription, kOsAll, |
| + FEATURE_WITH_PARAMS_VALUE_TYPE(kMemoryAblationFeature, |
| + kMemoryAblationFeatureVariations, |
| + "MemoryAblation")}, |
| + |
| #if defined(OS_ANDROID) |
| {"enable-custom-context-menu", |
| flag_descriptions::kEnableCustomContextMenuName, |
| @@ -2608,10 +2630,8 @@ const FeatureEntry kFeatureEntries[] = { |
| #if defined(OS_CHROMEOS) |
| {"enable-zip-archiver-on-file-manager", |
| flag_descriptions::kEnableZipArchiverOnFileManagerName, |
| - flag_descriptions::kEnableZipArchiverOnFileManagerDescription, |
|
DmitrySkiba
2017/04/10 17:15:42
This was formatted by "git cl format" along with m
|
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE( |
| - chromeos::switches::kEnableZipArchiverOnFileManager)}, |
| + flag_descriptions::kEnableZipArchiverOnFileManagerDescription, kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableZipArchiverOnFileManager)}, |
| #endif // OS_CHROMEOS |
| // NOTE: Adding new command-line switches requires adding corresponding |