Commit f0e2d8fa authored by Sebastien Marchand's avatar Sebastien Marchand Committed by Commit Bot

RC: Remove a static initializer.

See https://chromium-review.googlesource.com/c/chromium/src/+/1231633 for more details about this issue.

Bug: 844426
Change-Id: Icad060f8105602a2e0805e55f6ffd8b11ce5effa
Reviewed-on: https://chromium-review.googlesource.com/1231815Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Commit-Queue: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592159}
parent cc5c6348
...@@ -1218,13 +1218,13 @@ const FeatureEntry::FeatureVariation ...@@ -1218,13 +1218,13 @@ const FeatureEntry::FeatureVariation
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
const FeatureEntry::FeatureParam kProactiveTabFreezeAndDiscard_FreezeOnly[] = { const FeatureEntry::FeatureParam kProactiveTabFreezeAndDiscard_FreezeOnly[] = {
{resource_coordinator::ProactiveTabFreezeAndDiscardParams:: {resource_coordinator::
kShouldProactivelyDiscard.name, kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam,
"false"}}; "false"}};
const FeatureEntry::FeatureParam const FeatureEntry::FeatureParam
kProactiveTabFreezeAndDiscard_FreezeAndDiscard[] = { kProactiveTabFreezeAndDiscard_FreezeAndDiscard[] = {
{resource_coordinator::ProactiveTabFreezeAndDiscardParams:: {resource_coordinator::
kShouldProactivelyDiscard.name, kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam,
"true"}}; "true"}};
const FeatureEntry::FeatureVariation kProactiveTabFreezeAndDiscardVariations[] = const FeatureEntry::FeatureVariation kProactiveTabFreezeAndDiscardVariations[] =
{{"Freeze only", kProactiveTabFreezeAndDiscard_FreezeOnly, {{"Freeze only", kProactiveTabFreezeAndDiscard_FreezeOnly,
...@@ -4235,7 +4235,7 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -4235,7 +4235,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_WITH_PARAMS_VALUE_TYPE( FEATURE_WITH_PARAMS_VALUE_TYPE(
features::kProactiveTabFreezeAndDiscard, features::kProactiveTabFreezeAndDiscard,
kProactiveTabFreezeAndDiscardVariations, kProactiveTabFreezeAndDiscardVariations,
features::kProactiveTabFreezeAndDiscard.name)}, resource_coordinator::kProactiveTabFreezeAndDiscardFeatureName)},
{"site-characteristics-database", {"site-characteristics-database",
flag_descriptions::kSiteCharacteristicsDatabaseName, flag_descriptions::kSiteCharacteristicsDatabaseName,
flag_descriptions::kSiteCharacteristicsDatabaseDescription, kOsDesktop, flag_descriptions::kSiteCharacteristicsDatabaseDescription, kOsDesktop,
......
...@@ -30,7 +30,8 @@ const base::Feature kInfiniteSessionRestore{"InfiniteSessionRestore", ...@@ -30,7 +30,8 @@ const base::Feature kInfiniteSessionRestore{"InfiniteSessionRestore",
// Enables proactive tab freezing and discarding. // Enables proactive tab freezing and discarding.
const base::Feature kProactiveTabFreezeAndDiscard{ const base::Feature kProactiveTabFreezeAndDiscard{
"ProactiveTabFreezeAndDiscard", base::FEATURE_DISABLED_BY_DEFAULT}; resource_coordinator::kProactiveTabFreezeAndDiscardFeatureName,
base::FEATURE_DISABLED_BY_DEFAULT};
// Enables the site characteristics database. // Enables the site characteristics database.
const base::Feature kSiteCharacteristicsDatabase{ const base::Feature kSiteCharacteristicsDatabase{
...@@ -78,6 +79,11 @@ int GetModerateThresholdTabCountBasedOnSystemMemory( ...@@ -78,6 +79,11 @@ int GetModerateThresholdTabCountBasedOnSystemMemory(
} // namespace } // namespace
const char kProactiveTabFreezeAndDiscardFeatureName[] =
"ProactiveTabFreezeAndDiscard";
const char kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam[] =
"ShouldProactivelyDiscard";
// Instantiate the feature parameters for proactive tab discarding. // Instantiate the feature parameters for proactive tab discarding.
constexpr base::FeatureParam<bool> constexpr base::FeatureParam<bool>
ProactiveTabFreezeAndDiscardParams::kShouldProactivelyDiscard; ProactiveTabFreezeAndDiscardParams::kShouldProactivelyDiscard;
......
...@@ -25,6 +25,13 @@ extern const base::Feature kTabRanker; ...@@ -25,6 +25,13 @@ extern const base::Feature kTabRanker;
namespace resource_coordinator { namespace resource_coordinator {
// The name of the ProactiveTabFreezeAndDiscard feature.
extern const char kProactiveTabFreezeAndDiscardFeatureName[];
// The name of the |ShouldProactivelyDiscard| parameter of the
// ProactiveTabFreezeAndDiscard feature.
extern const char kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam[];
// Parameters used by the proactive tab discarding feature. // Parameters used by the proactive tab discarding feature.
// //
// Proactive discarding has 5 key parameters: // Proactive discarding has 5 key parameters:
...@@ -69,8 +76,8 @@ struct ProactiveTabFreezeAndDiscardParams { ...@@ -69,8 +76,8 @@ struct ProactiveTabFreezeAndDiscardParams {
// feature. // feature.
static constexpr base::FeatureParam<bool> kShouldProactivelyDiscard{ static constexpr base::FeatureParam<bool> kShouldProactivelyDiscard{
&features::kProactiveTabFreezeAndDiscard, "ShouldProactivelyDiscard", &features::kProactiveTabFreezeAndDiscard,
false}; kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam, false};
static constexpr base::FeatureParam<bool> kShouldPeriodicallyUnfreeze{ static constexpr base::FeatureParam<bool> kShouldPeriodicallyUnfreeze{
&features::kProactiveTabFreezeAndDiscard, "ShouldPeriodicallyUnfreeze", &features::kProactiveTabFreezeAndDiscard, "ShouldPeriodicallyUnfreeze",
false}; false};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment