Remove ATG and declutter from chrome://flags
Bug: 40925230
Change-Id: Icf4f4f456fd6fba1a9a334dbd906f82453e53b0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6265764
Reviewed-by: Shibalik Mohapatra <shibalik@chromium.org>
Commit-Queue: Emily Shack <emshack@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1420165}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6980302f..863575d 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1764,20 +1764,6 @@
std::size(kMinimumTabWidthSettingFull), nullptr}};
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
-const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = {
- {"stale_threshold_duration", "10s"},
- {"declutter_timer_interval", "10s"},
- {"nudge_timer_interval", "30s"},
-};
-
-const FeatureEntry::FeatureVariation kTabstripDeclutterVariations[] = {
- {"Quick Mode", kTabstripDeclutterQuickModeParams,
- std::size(kTabstripDeclutterQuickModeParams)},
-};
-#endif
-
#if !BUILDFLAG(IS_ANDROID)
const FeatureEntry::FeatureParam kTabstripComboButtonBackground[] = {
@@ -10830,29 +10816,6 @@
FEATURE_VALUE_TYPE(language::kTranslateOpenSettings)},
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
- {"tab-organization", flag_descriptions::kTabOrganizationName,
- flag_descriptions::kTabOrganizationDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kTabOrganization)},
-
- {"tab-organization-settings-visibility",
- flag_descriptions::kTabOrganizationSettingsVisibilityName,
- flag_descriptions::kTabOrganizationSettingsVisibilityDescription,
- kOsDesktop,
- FEATURE_VALUE_TYPE(optimization_guide::features::internal::
- kTabOrganizationSettingsVisibility)},
-
- {"tabstrip-declutter", flag_descriptions::kTabstripDeclutterName,
- flag_descriptions::kTabstripDeclutterDescription, kOsDesktop,
- FEATURE_WITH_PARAMS_VALUE_TYPE(features::kTabstripDeclutter,
- kTabstripDeclutterVariations,
- "TabstripDeclutter")},
- {"tabstrip-dedupe", flag_descriptions::kTabstripDedupeName,
- flag_descriptions::kTabstripDedupeDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kTabstripDedupe)},
-#endif
-
#if !BUILDFLAG(IS_ANDROID)
{"autofill-remove-payments-butter-dropdown",
flag_descriptions::kAutofillRemovePaymentsButterDropdownName,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 9a6bfae..a624c11a 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -5983,11 +5983,6 @@
"expiry_milestone": 136
},
{
- "name": "multi-tab-organization",
- "owners": [ "emshack@chromium.org", "chrome-desktop-ui-sea@google.com" ],
- "expiry_milestone": 150
- },
- {
"name": "multi-zone-rgb-keyboard",
"owners": [ "jasontt@chromium.org", "assistive-eng@google.com"],
"expiry_milestone": 120
@@ -8439,26 +8434,6 @@
"expiry_milestone": 130
},
{
- "name": "tab-organization",
- "owners": [ "emshack@chromium.org", "chrome-desktop-ui-sea@google.com" ],
- "expiry_milestone": 150
- },
- {
- "name": "tab-organization-settings-visibility",
- "owners": [ "emshack@chromium.org", "chrome-desktop-ui-sea@google.com" ],
- "expiry_milestone": 150
- },
- {
- "name": "tab-reorganization",
- "owners": [ "emshack@chromium.org", "chrome-desktop-ui-sea@google.com" ],
- "expiry_milestone": 150
- },
- {
- "name": "tab-reorganization-divider",
- "owners": [ "emshack@chromium.org", "chrome-desktop-ui-sea@google.com" ],
- "expiry_milestone": 150
- },
- {
"name": "tab-resumption",
"owners": [ "ewannpv@chromium.org", "gambard@chromium.org", "bling-flags@google.com" ],
"expiry_milestone": 130
@@ -8544,20 +8519,6 @@
"expiry_milestone": 150
},
{
- "name": "tabstrip-declutter",
- "owners": [
- "emshack@chromium.org",
- "shibalik@chromium.org",
- "chrome-desktop-ui-sea@google.com"
- ],
- "expiry_milestone": 150
- },
- {
- "name": "tabstrip-dedupe",
- "owners": [ "emshack@chromium.org", "shibalik@chromium.org", "chrome-desktop-ui-sea@google.com" ],
- "expiry_milestone": 160
- },
- {
"name": "tailored-non-modal-db-promo",
"owners": [
"pabouchard@google.com",
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 1a8485eba..debbe0f 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -5252,26 +5252,6 @@
"Enable access to the Smart Card API. See "
"https://github.com/WICG/web-smart-card#readme for more information.";
-const char kTabOrganizationName[] = "Tab Organization";
-const char kTabOrganizationDescription[] =
- "Enables the Auto Tab Groups feature, which can be found within the Tab "
- "Search bubble.";
-
-const char kTabOrganizationSettingsVisibilityName[] =
- "Tab Organization Settings Visibility";
-const char kTabOrganizationSettingsVisibilityDescription[] =
- "Shows Tab Organization in the settings UI";
-
-const char kTabstripDeclutterName[] = "Tab Declutter";
-const char kTabstripDeclutterDescription[] =
- "Enables the Tab Declutter feature, which can be found within the Tab "
- "Search bubble.";
-
-const char kTabstripDedupeName[] = "Tab Deduplication";
-const char kTabstripDedupeDescription[] =
- "Enables the Tab Deduplication feature, which can be found within the Tab "
- "Search bubble.";
-
const char kWebAppSyncGeneratedIconBackgroundFixName[] =
"Web App Sync Generated Icon Background Fix";
const char kWebAppSyncGeneratedIconBackgroundFixDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index ba7e900..996f2dc 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -3079,18 +3079,6 @@
extern const char kSmartCardWebApiName[];
extern const char kSmartCardWebApiDescription[];
-extern const char kTabOrganizationName[];
-extern const char kTabOrganizationDescription[];
-
-extern const char kTabOrganizationSettingsVisibilityName[];
-extern const char kTabOrganizationSettingsVisibilityDescription[];
-
-extern const char kTabstripDeclutterName[];
-extern const char kTabstripDeclutterDescription[];
-
-extern const char kTabstripDedupeName[];
-extern const char kTabstripDedupeDescription[];
-
extern const char kWebAppSyncGeneratedIconBackgroundFixName[];
extern const char kWebAppSyncGeneratedIconBackgroundFixDescription[];
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index c62be4b1..b1b343f 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -8833,7 +8833,6 @@
<int value="-2086690409"
label="EnableExtensionsPermissionsForSupervisedUsersOnDesktop:enabled"/>
<int value="-2086380381" label="FedCmIdpSigninStatusEnabled:disabled"/>
- <int value="-2086191354" label="TabReorganization:disabled"/>
<int value="-2085842174" label="SupportF11AndF12KeyShortcuts:enabled"/>
<int value="-2085212970" label="FastPairHID:enabled"/>
<int value="-2085198282"
@@ -9587,7 +9586,6 @@
<int value="-1804027916"
label="PrivateNetworkAccessForWorkersWarningOnly:disabled"/>
<int value="-1802905985" label="OmniboxExpandedStateSuggestIcons:enabled"/>
- <int value="-1802806823" label="TabReorganizationDivider:disabled"/>
<int value="-1802559277" label="RunTasksByBatches:disabled"/>
<int value="-1802502753" label="enable-manual-password-generation:enabled"/>
<int value="-1802237221" label="UseFrameIntervalDecider:disabled"/>
@@ -10657,7 +10655,6 @@
<int value="-1377186702" label="DesktopIOSPromotion:disabled"/>
<int value="-1376510363" label="ServiceWorkerScriptFullCodeCache:disabled"/>
<int value="-1376258171" label="InstanceSwitcher:enabled"/>
- <int value="-1376148942" label="TabOrganizationSettingsVisibility:enabled"/>
<int value="-1376006534" label="WinUseBrowserSpellChecker:disabled"/>
<int value="-1375111024" label="enable-fixed-position-compositing"/>
<int value="-1374377956" label="SeparateWebAppShortcutBadgeIcon:disabled"/>
@@ -11997,7 +11994,6 @@
<int value="-850821337" label="WebContentsForceDark:enabled"/>
<int value="-849792130" label="UserMediaCaptureOnFocus:disabled"/>
<int value="-848691867" label="DesktopPWAWindowing:enabled"/>
- <int value="-848407281" label="TabReorganizationDivider:enabled"/>
<int value="-847735582" label="NotificationsViaHelperApp:enabled"/>
<int value="-847216521" label="ChromeDuplex:enabled"/>
<int value="-846670837" label="QuickAppAccessTestUI:enabled"/>
@@ -14982,7 +14978,6 @@
<int value="336429189" label="DisallowUnsafeHttpDownloads:disabled"/>
<int value="336830575" label="DeviceForceScheduledReboot:enabled"/>
<int value="337637199" label="HttpsFirstModeIncognito:disabled"/>
- <int value="337894107" label="TabstripDedupe:enabled"/>
<int value="338662897" label="AndroidNightModeTabReparenting:disabled"/>
<int value="339388667" label="SyncAndroidPromosWithTitle:enabled"/>
<int value="339419844" label="EmojiSuggestAddition:enabled"/>
@@ -15564,7 +15559,6 @@
<int value="570445904" label="WGIGamepadTriggerRumble:disabled"/>
<int value="570469494" label="LoginDetection:disabled"/>
<int value="570882482" label="CrOSDspBasedAecAllowed:enabled"/>
- <int value="571127047" label="TabOrganizationSettingsVisibility:disabled"/>
<int value="571349694" label="AllowAllSitesToInitiateMirroring:enabled"/>
<int value="571562912" label="InstallableAmbientBadgeMessage:disabled"/>
<int value="573385109" label="SharedClipboardUI:enabled"/>
@@ -16468,7 +16462,6 @@
<int value="928840332" label="TrafficCountersForWiFiTesting:disabled"/>
<int value="928900043" label="OmniboxLooseMaxLimitOnDedicatedRows:disabled"/>
<int value="928991555" label="DefaultViewportIsDeviceWidth:disabled"/>
- <int value="929061943" label="TabstripDeclutter:disabled"/>
<int value="929462705" label="disable-link-disambiguation-popup"/>
<int value="929599043" label="PeripheralNotification:enabled"/>
<int value="930187600" label="WebAssemblyExperimentalJSPI:enabled"/>
@@ -16536,7 +16529,6 @@
<int value="957191538" label="EcheSWADebugMode:enabled"/>
<int value="957333504" label="OmniboxSteadyStateHeight:enabled"/>
<int value="957458620" label="MediaRouterOTRInstance:enabled"/>
- <int value="960173644" label="TabOrganization:disabled"/>
<int value="960413971" label="GlanceablesV2CalendarView:disabled"/>
<int value="960696967" label="TabResumptionModuleAndroid:enabled"/>
<int value="960883599" label="IPH_SupervisedUserProfileSignin:enabled"/>
@@ -17016,7 +17008,6 @@
label="SignedExchangePrefetchCacheForNavigations:disabled"/>
<int value="1146944555" label="CrosExpandSodaLanguages:enabled"/>
<int value="1147703885" label="SecondaryGoogleAccountUsage:enabled"/>
- <int value="1147801492" label="TabstripDedupe:disabled"/>
<int value="1147924185" label="enable-navigation-predictor-renderer-warmup"/>
<int value="1148284632" label="NewTabPageUIMd:disabled"/>
<int value="1148637402"
@@ -17074,7 +17065,6 @@
<int value="1177255376" label="enable-builtin-hls:enabled"/>
<int value="1177628103" label="GaiaActionButtons:disabled"/>
<int value="1178640449" label="ProductivityLauncher:disabled"/>
- <int value="1178857553" label="TabstripDeclutter:enabled"/>
<int value="1179013979"
label="OmniboxUIExperimentMaxAutocompleteMatches:enabled"/>
<int value="1179295522" label="WebAssemblyRelaxedSimd:enabled"/>
@@ -18056,7 +18046,6 @@
<int value="1536921097" label="NavigationMojoResponse:disabled"/>
<int value="1537685016" label="NtpDriveModuleSegmentation:disabled"/>
<int value="1537693783" label="KioskEnableAppService:enabled"/>
- <int value="1538052363" label="TabReorganization:enabled"/>
<int value="1538685213" label="DownloadHomeV2:enabled"/>
<int value="1538690515" label="OneGoogleBarOnLocalNtp:enabled"/>
<int value="1539225325" label="AndroidOpenPdfInlineBackport:enabled"/>
@@ -18923,7 +18912,6 @@
<int value="1862126613" label="DesktopPWAsRunOnOsLogin:enabled"/>
<int value="1862207743" label="enable-android-spellchecker"/>
<int value="1862358479" label="GameDashboardGamesInTest:disabled"/>
- <int value="1862628690" label="MultiTabOrganization:disabled"/>
<int value="1863622457" label="WebAuthentication:enabled"/>
<int value="1864062646" label="ChromeWhatsNewUI:disabled"/>
<int value="1864412948" label="AvatarsCloudMigration:disabled"/>
@@ -19397,7 +19385,6 @@
<int value="2053479012" label="PersistDeviceBoundSessions:disabled"/>
<int value="2055184887" label="LocalHistoryZeroSuggestBeyondNTP:enabled"/>
<int value="2056572020" label="EnableUsernameCorrection:disabled"/>
- <int value="2057112994" label="TabOrganization:enabled"/>
<int value="2058148069" label="UseMessagesStagingUrl:enabled"/>
<int value="2058283872" label="CCTModuleCache:disabled"/>
<int value="2058425230" label="LauncherNudgeSessionReset:enabled"/>
@@ -19569,7 +19556,6 @@
<int value="2114894984" label="DelayCompetingLowPriorityRequests:enabled"/>
<int value="2116535245" label="PasswordEditDialogWithDetails:disabled"/>
<int value="2117485960" label="SupportPepperVideoDecoderDevAPI:disabled"/>
- <int value="2117507147" label="MultiTabOrganization:enabled"/>
<int value="2118287149" label="HelpAppSearchServiceIntegration:enabled"/>
<int value="2118374092" label="MessagesForAndroidReaderMode:disabled"/>
<int value="2119575519" label="ComposeUiRefinement:enabled"/>
