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..d4b04aa424bb87bef2af5f98b192b1d0b3a9a184 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2052,6 +2052,10 @@ const FeatureEntry kFeatureEntries[] = {
          autofill::switches::kDisableOfferUploadCreditCards)},
 #endif  // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
 #if defined(OS_ANDROID)
+    {"enable-herb-prototype",
+     IDS_FLAGS_ENABLE_HERB_PROTOTYPE_NAME,
+     IDS_FLAGS_ENABLE_HERB_PROTOTYPE_DESCRIPTION, kOsAndroid,
+     SINGLE_VALUE_TYPE(switches::kEnableHerbPrototype)},
     {"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 +2200,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::kEnableHerbPrototype, 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",