Remove notification blocked message flag

Notification blocked message was fully launched at https://crrev.com/c/3687498. grouped_permission_infobar_delegate_android has been already removed. https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc Bug: 1354758 Change-Id: I952372d9cea2ab90c8af0e8b6b931fbd2bf2ad14 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4287947 Reviewed-by: Aishwarya Rajesh <aishwaryarj@google.com> Commit-Queue: Lijin Shen <lazzzis@google.com> Reviewed-by: Elias Klim <elklm@chromium.org> Cr-Commit-Position: refs/heads/main@{#1109621}
chromium · Feb 27, 2024 · 1279854 · 1279854
1 parent 8490ac2
commit 1279854
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 38 deletions.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -7500,11 +7500,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kMessagesForAndroidInfrastructureDescription,
      kOsAndroid,
      FEATURE_VALUE_TYPE(messages::kMessagesForAndroidInfrastructure)},
-    {"messages-for-android-notification-blocked",
-     flag_descriptions::kMessagesForAndroidNotificationBlockedName,
-     flag_descriptions::kMessagesForAndroidNotificationBlockedDescription,
-     kOsAndroid,
-     FEATURE_VALUE_TYPE(messages::kMessagesForAndroidNotificationBlocked)},
     {"messages-for-android-offer-notification",
      flag_descriptions::kMessagesForAndroidOfferNotificationName,
      flag_descriptions::kMessagesForAndroidOfferNotificationDescription,

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -4802,11 +4802,6 @@
     "owners": [ "lazzzis", "aishwaryarj" ],
     "expiry_milestone": 112
   },
-  {
-    "name": "messages-for-android-notification-blocked",
-    "owners": [ "pavely", "lazzzis" ],
-    "expiry_milestone": 105
-  },
   {
     "name": "messages-for-android-offer-notification",
     "owners": [ "vishwasuppoor", "siashah" ],

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -3779,11 +3779,6 @@ const char kMessagesForAndroidInfrastructureName[] = "Messages infrastructure";
 const char kMessagesForAndroidInfrastructureDescription[] =
     "When enabled, will initialize Messages UI infrastructure";
 
-const char kMessagesForAndroidNotificationBlockedName[] =
-    "Notification Blocked Messages UI";
-const char kMessagesForAndroidNotificationBlockedDescription[] =
-    "When enabled, notification blocked prompt will use the new Messages UI.";
-
 extern const char kMessagesForAndroidOfferNotificationName[] =
     "Offer Notification Messages UI";
 extern const char kMessagesForAndroidOfferNotificationDescription[] =

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -2164,9 +2164,6 @@ extern const char kMessagesForAndroidAdsBlockedDescription[];
 extern const char kMessagesForAndroidInfrastructureName[];
 extern const char kMessagesForAndroidInfrastructureDescription[];
 
-extern const char kMessagesForAndroidNotificationBlockedName[];
-extern const char kMessagesForAndroidNotificationBlockedDescription[];
-
 extern const char kMessagesForAndroidOfferNotificationName[];
 extern const char kMessagesForAndroidOfferNotificationDescription[];
 

diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -502,8 +502,7 @@ ChromePermissionsClient::MaybeCreateMessageUI(
     content::WebContents* web_contents,
     ContentSettingsType type,
     base::WeakPtr<permissions::PermissionPromptAndroid> prompt) {
-  if (messages::IsNotificationBlockedMessagesUiEnabled() &&
-      ShouldUseQuietUI(web_contents, type)) {
+  if (ShouldUseQuietUI(web_contents, type)) {
     auto delegate =
         std::make_unique<NotificationBlockedMessageDelegate::Delegate>(
             std::move(prompt));

diff --git a/components/messages/android/messages_feature.cc b/components/messages/android/messages_feature.cc
@@ -40,10 +40,6 @@ BASE_FEATURE(kMessagesForAndroidInfrastructure,
              "MessagesForAndroidInfrastructure",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
-BASE_FEATURE(kMessagesForAndroidNotificationBlocked,
-             "MessagesForAndroidNotificationBlocked",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-
 BASE_FEATURE(kMessagesForAndroidOfferNotification,
              "MessagesForAndroidOfferNotification",
              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -84,11 +80,6 @@ bool IsSaveCardMessagesUiEnabled() {
          base::FeatureList::IsEnabled(kMessagesForAndroidSaveCard);
 }
 
-bool IsNotificationBlockedMessagesUiEnabled() {
-  return base::FeatureList::IsEnabled(kMessagesForAndroidInfrastructure) &&
-         base::FeatureList::IsEnabled(kMessagesForAndroidNotificationBlocked);
-}
-
 bool IsPermissionUpdateMessagesUiEnabled() {
   return base::FeatureList::IsEnabled(kMessagesForAndroidInfrastructure) &&
          base::FeatureList::IsEnabled(kMessagesForAndroidPermissionUpdate);

diff --git a/components/messages/android/messages_feature.h b/components/messages/android/messages_feature.h
@@ -18,10 +18,6 @@ BASE_DECLARE_FEATURE(kMessagesForAndroidAdsBlocked);
 // implementations also fallback to Infobar implementations.
 BASE_DECLARE_FEATURE(kMessagesForAndroidInfrastructure);
 
-// Feature that controls whether notifiation blocked prompts use Messages or
-// Infobars infrastructure.
-BASE_DECLARE_FEATURE(kMessagesForAndroidNotificationBlocked);
-
 // Feature that controls whether offer notifications use Messages or Infobars
 // infrastructure.
 BASE_DECLARE_FEATURE(kMessagesForAndroidOfferNotification);
@@ -44,8 +40,6 @@ BASE_DECLARE_FEATURE(kMessagesForAndroidStackingAnimation);
 
 bool IsAdsBlockedMessagesUiEnabled();
 
-bool IsNotificationBlockedMessagesUiEnabled();
-
 bool IsOfferNotificationMessagesUiEnabled();
 
 bool IsPermissionUpdateMessagesUiEnabled();

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
@@ -59784,8 +59784,6 @@ from previous Chrome versions.
   <int value="-1196814719" label="TrafficCountersEnabled:disabled"/>
   <int value="-1195194959" label="XGEOVisibleNetworks:disabled"/>
   <int value="-1195034892" label="ContinuousSearch:disabled"/>
-  <int value="-1194794230"
-      label="MessagesForAndroidNotificationBlocked:disabled"/>
   <int value="-1194129602" label="ClientSideDetectionModelOnAndroid:disabled"/>
   <int value="-1193375480" label="DownloadBubble:enabled"/>
   <int value="-1192790333" label="ArcUseHighMemoryDalvikProfile:disabled"/>
@@ -63391,7 +63389,6 @@ from previous Chrome versions.
   <int value="857716462" label="FeedInteractiveRefresh:enabled"/>
   <int value="859031214"
       label="ExperimentalAccessibilityGoogleTtsLanguagePacks:enabled"/>
-  <int value="859220075" label="MessagesForAndroidNotificationBlocked:enabled"/>
   <int value="859449217" label="MagnifierPanningImprovements:enabled"/>
   <int value="859495772"
       label="UsernameFirstFlowFallbackCrowdsourcing:disabled"/>