| Index: chrome/common/chrome_features.cc
|
| diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
| index 90879c4ff5c6ee0ecf749bae087082cad21a89df..14d9ffda44ad25e5f75d048961c8cfaa33cf33f5 100644
|
| --- a/chrome/common/chrome_features.cc
|
| +++ b/chrome/common/chrome_features.cc
|
| @@ -108,10 +108,12 @@ const base::Feature kMaterialDesignHistory{
|
| const base::Feature kMaterialDesignSettings{
|
| "MaterialDesignSettings", base::FEATURE_DISABLED_BY_DEFAULT};
|
|
|
| +#if defined(ENABLE_PLUGINS)
|
| // Prefer HTML content by hiding Flash from the list of plugins.
|
| // https://crbug.com/626728
|
| const base::Feature kPreferHtmlOverPlugins{"PreferHtmlOverPlugins",
|
| base::FEATURE_DISABLED_BY_DEFAULT};
|
| +#endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| // Runtime flag that indicates whether this leak detector should be enabled in
|
| @@ -120,6 +122,12 @@ const base::Feature kRuntimeMemoryLeakDetector{
|
| "RuntimeMemoryLeakDetector", base::FEATURE_DISABLED_BY_DEFAULT};
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| +#if defined(ENABLE_PLUGINS)
|
| +// Disables Plugin Power Saver when Flash is in ALLOW mode.
|
| +const base::Feature kRunAllFlashInAllowMode{"RunAllFlashInAllowMode",
|
| + base::FEATURE_DISABLED_BY_DEFAULT};
|
| +#endif
|
| +
|
| const base::Feature kSafeSearchUrlReporting{"SafeSearchUrlReporting",
|
| base::FEATURE_DISABLED_BY_DEFAULT};
|
|
|
|
|