| Index: chrome/common/chrome_features.cc
|
| diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
| index 2dad452135cb89516776af3dcf788b5bad3d3069..6ef92934d4d53404f70aa1195e9dc78702e4be56 100644
|
| --- a/chrome/common/chrome_features.cc
|
| +++ b/chrome/common/chrome_features.cc
|
| @@ -84,35 +84,24 @@ const base::Feature kLinuxObsoleteSystemIsEndOfTheLine{
|
| "LinuxObsoleteSystemIsEndOfTheLine", base::FEATURE_DISABLED_BY_DEFAULT};
|
| #endif
|
|
|
| +// Enables or disables the Material Design version of chrome://bookmarks.
|
| +const base::Feature kMaterialDesignBookmarks{"MaterialDesignBookmarks",
|
| + base::FEATURE_DISABLED_BY_DEFAULT};
|
| +
|
| #if defined(ENABLE_EXTENSIONS)
|
| // Enabled or disabled the Material Design version of chrome://extensions.
|
| const base::Feature kMaterialDesignExtensions{
|
| "MaterialDesignExtensions", base::FEATURE_DISABLED_BY_DEFAULT};
|
| #endif
|
|
|
| -// Enables YouTube Flash videos to be overridden.
|
| -const base::Feature kOverrideYouTubeFlashEmbed{
|
| - "OverrideYouTubeFlashEmbed", base::FEATURE_ENABLED_BY_DEFAULT};
|
| -
|
| -// Enables the Print Scaling feature in print preview.
|
| -#if defined(ENABLE_PRINT_PREVIEW)
|
| -const base::Feature kPrintScaling{"PrintScaling",
|
| - base::FEATURE_DISABLED_BY_DEFAULT};
|
| -#endif
|
| -
|
| -// Enables or disables push subscriptions keeping Chrome running in the
|
| -// background when closed.
|
| -const base::Feature kPushMessagingBackgroundMode{
|
| - "PushMessagingBackgroundMode", base::FEATURE_DISABLED_BY_DEFAULT};
|
| -
|
| // Enables or disables the Material Design version of chrome://history.
|
| -const base::Feature kMaterialDesignHistory{
|
| - "MaterialDesignHistory", base::FEATURE_ENABLED_BY_DEFAULT};
|
| +const base::Feature kMaterialDesignHistory{"MaterialDesignHistory",
|
| + base::FEATURE_ENABLED_BY_DEFAULT};
|
|
|
| // Enables or disables the Material Design version of chrome://settings.
|
| // Also affects chrome://help.
|
| -const base::Feature kMaterialDesignSettings{
|
| - "MaterialDesignSettings", base::FEATURE_DISABLED_BY_DEFAULT};
|
| +const base::Feature kMaterialDesignSettings{"MaterialDesignSettings",
|
| + base::FEATURE_DISABLED_BY_DEFAULT};
|
|
|
| // Enables or disables modal permission prompts.
|
| const base::Feature kModalPermissionPrompts{"ModalPermissionPrompts",
|
| @@ -125,6 +114,10 @@ const base::Feature kNativeNotifications{"NativeNotifications",
|
| base::FEATURE_DISABLED_BY_DEFAULT};
|
| #endif // defined(OS_MACOSX)
|
|
|
| +// Enables YouTube Flash videos to be overridden.
|
| +const base::Feature kOverrideYouTubeFlashEmbed{
|
| + "OverrideYouTubeFlashEmbed", base::FEATURE_ENABLED_BY_DEFAULT};
|
| +
|
| #if defined(ENABLE_PLUGINS)
|
| // Prefer HTML content by hiding Flash from the list of plugins.
|
| // https://crbug.com/626728
|
| @@ -132,6 +125,17 @@ const base::Feature kPreferHtmlOverPlugins{"PreferHtmlOverPlugins",
|
| base::FEATURE_DISABLED_BY_DEFAULT};
|
| #endif
|
|
|
| +// Enables the Print Scaling feature in print preview.
|
| +#if defined(ENABLE_PRINT_PREVIEW)
|
| +const base::Feature kPrintScaling{"PrintScaling",
|
| + base::FEATURE_DISABLED_BY_DEFAULT};
|
| +#endif
|
| +
|
| +// Enables or disables push subscriptions keeping Chrome running in the
|
| +// background when closed.
|
| +const base::Feature kPushMessagingBackgroundMode{
|
| + "PushMessagingBackgroundMode", base::FEATURE_DISABLED_BY_DEFAULT};
|
| +
|
| #if defined(OS_CHROMEOS)
|
| // Runtime flag that indicates whether this leak detector should be enabled in
|
| // the current instance of Chrome.
|
|
|