| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 251b2e804be568694c9dfb7f3337b5f04cb17d74..f34ab865baa62328bec9f752d55b627c02b6e57f 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -908,9 +908,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")},
|
| #endif
|
| #if defined(OS_CHROMEOS)
|
| - {"mash",
|
| - IDS_FLAGS_USE_MASH_NAME,
|
| - IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS,
|
| + {"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS,
|
| SINGLE_VALUE_TYPE("mash")},
|
| {"allow-touchpad-three-finger-click",
|
| IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
|
| @@ -2103,6 +2101,10 @@ const FeatureEntry kFeatureEntries[] = {
|
| {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME,
|
| IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop,
|
| MULTI_VALUE_TYPE(kSecurityVerboseChoices)},
|
| + {"expensive-background-timer-throttling",
|
| + IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_NAME,
|
| + IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_DESCRIPTION, kOsAll,
|
| + FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)},
|
| // NOTE: Adding new command-line switches requires adding corresponding
|
| // entries to enum "LoginCustomFlags" in histograms.xml. See note in
|
| // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
|
|
|