Prototype handling of Intents in Custom Tabs

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b8b4d86643b5fd10c96e8521a3ba4b401924c389..2c347eb994f86f79fb90c4e0eb88a1d5270b9619 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -521,6 +521,14 @@ 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::kHerbFlavor, "anise"},
+    {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_BASIL, switches::kHerbFlavor, "basil"},
+    {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_CHIVE, switches::kHerbFlavor, "chive"},
+    {IDS_FLAGS_HERB_PROTOTYPE_FLAVOR_DILL, switches::kHerbFlavor, "dill"},
+};
 #endif  // defined(OS_ANDROID)
 
 // RECORDING USER METRICS FOR FLAGS:
@@ -2052,6 +2060,10 @@ const FeatureEntry kFeatureEntries[] = {
          autofill::switches::kDisableOfferUploadCreditCards)},
 #endif  // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
 #if defined(OS_ANDROID)
+    {"herb-prototype-choices",
+     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,
@@ -2196,6 +2208,14 @@ bool SkipConditionalFeatureEntry(const FeatureEntry& entry) {
       channel != version_info::Channel::UNKNOWN) {
     return true;
   }
+  // enable-herb-prototype is only available for local, Canary, and Dev channel
+  // builds.
+  if (!strcmp(switches::kHerbFlavor, 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",