| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index e02974453324332f5209c5ea401768cec0b05b25..af1c7133e9e5c44621883388074b9ac7b868f86d 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -615,25 +615,11 @@ const Experiment kExperiments[] = {
|
| SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)
|
| },
|
| {
|
| - "enable-shadow-dom",
|
| - IDS_FLAGS_SHADOW_DOM_NAME,
|
| - IDS_FLAGS_SHADOW_DOM_DESCRIPTION,
|
| + "enable-experimental-webkit-features",
|
| + IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_NAME,
|
| + IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_DESCRIPTION,
|
| kOsAll,
|
| - SINGLE_VALUE_TYPE(switches::kEnableShadowDOM)
|
| - },
|
| - {
|
| - "enable-style-scoped",
|
| - IDS_FLAGS_STYLE_SCOPED_NAME,
|
| - IDS_FLAGS_STYLE_SCOPED_DESCRIPTION,
|
| - kOsAll,
|
| - SINGLE_VALUE_TYPE(switches::kEnableStyleScoped)
|
| - },
|
| - {
|
| - "enable-css-regions",
|
| - IDS_FLAGS_CSS_REGIONS_NAME,
|
| - IDS_FLAGS_CSS_REGIONS_DESCRIPTION,
|
| - kOsAll,
|
| - SINGLE_VALUE_TYPE(switches::kEnableCssRegions)
|
| + SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebKitFeatures)
|
| },
|
| {
|
| "enable-css-shaders",
|
| @@ -643,13 +629,6 @@ const Experiment kExperiments[] = {
|
| SINGLE_VALUE_TYPE(switches::kEnableCssShaders)
|
| },
|
| {
|
| - "enable-css-variables",
|
| - IDS_FLAGS_CSS_VARIABLES_NAME,
|
| - IDS_FLAGS_CSS_VARIABLES_DESCRIPTION,
|
| - kOsAll,
|
| - SINGLE_VALUE_TYPE(switches::kEnableCssVariables)
|
| - },
|
| - {
|
| "enable-extension-activity-ui",
|
| IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_NAME,
|
| IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_DESCRIPTION,
|
|
|