| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index d05d6dc471928bf8de3203c8a4425cf0e3b13bc9..41a66cf407ac97bae18b0b28d8276443d1196416 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -521,6 +521,18 @@ const FeatureEntry::Choice kEnableOfflinePagesChoices[] = {
|
| {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOfflinePages,
|
| ""},
|
| };
|
| +
|
| +const FeatureEntry::Choice kHerbPrototypeChoices[] = {
|
| + {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", ""},
|
| + {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_ANISE,
|
| + switches::kTabManagementExperimentType, "anise"},
|
| + {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_BASIL,
|
| + switches::kTabManagementExperimentType, "basil"},
|
| + {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_CHIVE,
|
| + switches::kTabManagementExperimentType, "chive"},
|
| + {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_DILL,
|
| + switches::kTabManagementExperimentType, "dill"},
|
| +};
|
| #endif // defined(OS_ANDROID)
|
|
|
| // RECORDING USER METRICS FOR FLAGS:
|
| @@ -2043,6 +2055,10 @@ const FeatureEntry kFeatureEntries[] = {
|
| autofill::switches::kDisableOfferUploadCreditCards)},
|
| #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
|
| #if defined(OS_ANDROID)
|
| + {"tab-management-experiment-type",
|
| + IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME,
|
| + IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid,
|
| + MULTI_VALUE_TYPE(kHerbPrototypeChoices)},
|
| {"enable-tab-switcher-in-document-mode",
|
| IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME,
|
| IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid,
|
| @@ -2187,6 +2203,14 @@ bool SkipConditionalFeatureEntry(const FeatureEntry& entry) {
|
| channel != version_info::Channel::UNKNOWN) {
|
| return true;
|
| }
|
| + // Tab management prototypes are only available for local, Canary, and Dev
|
| + // channel builds.
|
| + if (!strcmp("tab-management-experiment-type", entry.internal_name) &&
|
| + channel != version_info::Channel::DEV &&
|
| + channel != version_info::Channel::CANARY &&
|
| + channel != version_info::Channel::UNKNOWN) {
|
| + return true;
|
| + }
|
| // enable-tab-switcher-in-document-mode is only available for Chromium
|
| // builds and the Canary channel.
|
| if (!strcmp("enable-tab-switcher-in-document-mode",
|
|
|