Add flavor of quiet UI to show on abusive sites.

This patch adds a flavor of the quiet notification permission UI to be
shown on sites known to trick or force users to accept the notification
permission.

Bug: 1081233
Change-Id: I4ed49fc1b260c261824efe7741f155ed2f7d643a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2199150Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768775}

chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java

@@ -29,8 +29,14 @@ public class PermissionInfoBar
     /** The content settings types corresponding to the permission requested in this infobar. */
     protected int[] mContentSettingsTypes;
 
-    /** Whether the last clicked button was the "Manage" (secondary) button. */
-    protected boolean mManageButtonLastClicked;
+    /** Whether the secondary button should act as a "Manage" button to open settings. */
+    protected boolean mSecondaryButtonShouldOpenSettings;
+
+    /**
+     * Whether the last clicked button opened settings, requiring the dialog to stay interactive
+     * when the user switches back.
+     */
+    protected boolean mLastClickOpenedSettings;
 
     /** Whether the infobar should be shown as a compact mini-infobar or a classic expanded one. */
     private boolean mIsExpanded;
@@ -46,12 +52,14 @@ public class PermissionInfoBar
 
     protected PermissionInfoBar(WindowAndroid window, int[] contentSettingsTypes,
             int iconDrawableId, String compactMessage, String compactLinkText, String message,
-            String description, String primaryButtonText, String secondaryButtonText) {
+            String description, String primaryButtonText, String secondaryButtonText,
+            boolean secondaryButtonShouldOpenSettings) {
         super(iconDrawableId, R.color.infobar_icon_drawable_color, null /* iconBitmap */, message,
                 null /* linkText */, primaryButtonText, secondaryButtonText);
         mWindow = window;
         mContentSettingsTypes = contentSettingsTypes;
-        mManageButtonLastClicked = false;
+        mSecondaryButtonShouldOpenSettings = secondaryButtonShouldOpenSettings;
+        mLastClickOpenedSettings = false;
         mIsExpanded = false;
         mCompactLinkText = compactLinkText;
         mCompactMessage = compactMessage;
@@ -75,12 +83,12 @@ public class PermissionInfoBar
     public boolean areControlsEnabled() {
         // The controls need to be enbled after the user clicks `manage` since they will return to
         // the page and the infobar still needs to be kept active.
-        return super.areControlsEnabled() || mManageButtonLastClicked;
+        return super.areControlsEnabled() || mLastClickOpenedSettings;
     }
 
     @Override
     public void onButtonClicked(final boolean isPrimaryButton) {
-        mManageButtonLastClicked = !isPrimaryButton;
+        mLastClickOpenedSettings = false;
         if (getContext() == null) {
             onButtonClickedInternal(isPrimaryButton);
             return;
@@ -93,9 +101,10 @@ public class PermissionInfoBar
                         mWindow, mContentSettingsTypes.clone(), this)) {
                 return;
             }
-        } else {
+        } else if (mSecondaryButtonShouldOpenSettings) {
             launchNotificationsSettingsPage();
         }
+
         onButtonClickedInternal(isPrimaryButton);
     }
 
@@ -130,6 +139,7 @@ public class PermissionInfoBar
     }
 
     private void launchNotificationsSettingsPage() {
+        mLastClickOpenedSettings = true;
         Bundle fragmentArguments = new Bundle();
         fragmentArguments.putString(SingleCategorySettings.EXTRA_CATEGORY,
                 SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.NOTIFICATIONS));
@@ -147,15 +157,19 @@ public class PermissionInfoBar
      * @param compactLinkText       Text of link displayed right to the message in compact state.
      * @param message               Primary message in the extended state.
      * @param description           Secondary message (description) in the expanded state.
-     * @param buttonOk              String to display on the OK button.
-     * @param buttonManage          String to display on the Manage button.
+     * @param primaryButtonText     String to display on the primary button.
+     * @param secondaryButtonText   String to display on the secondary button.
+     * @param secondaryButtonShouldOpenSettings  Whether the secondary button should open site
+     *         settings.
      */
     @CalledByNative
     private static PermissionInfoBar create(WindowAndroid window, int[] contentSettingsTypes,
             int iconId, String compactMessage, String compactLinkText, String message,
-            String description, String buttonOk, String buttonManage) {
+            String description, String primaryButtonText, String secondaryButtonText,
+            boolean secondaryButtonShouldOpenSettings) {
         PermissionInfoBar infoBar = new PermissionInfoBar(window, contentSettingsTypes, iconId,
-                compactMessage, compactLinkText, message, description, buttonOk, buttonManage);
+                compactMessage, compactLinkText, message, description, primaryButtonText,
+                secondaryButtonText, secondaryButtonShouldOpenSettings);
 
         return infoBar;
     }

chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

@@ -24,6 +24,11 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/strings/grit/ui_strings.h"
 
+namespace {
+using QuietUiReason =
+    permissions::NotificationPermissionUiSelector::QuietUiReason;
+}  // namespace
+
 GroupedPermissionInfoBarDelegate::~GroupedPermissionInfoBarDelegate() {
   permissions::PermissionUmaUtil::RecordInfobarDetailsExpanded(
       details_expanded_);
@@ -59,25 +64,45 @@ base::string16 GroupedPermissionInfoBarDelegate::GetCompactLinkText() const {
       IDS_NOTIFICATION_QUIET_PERMISSION_MINI_INFOBAR_DETAILS_LINK);
 }
 
+// TODO(crbug.com/1082737): Many methods of this class switches on the quiet UI
+// reason. Refactor this into separate subclasses instead.
 base::string16 GroupedPermissionInfoBarDelegate::GetDescriptionText() const {
   auto* manager = permissions::PermissionRequestManager::FromWebContents(
       permission_prompt_->web_contents());
 
   switch (manager->ReasonForUsingQuietUi()) {
-    case permissions::NotificationPermissionUiSelector::QuietUiReason::
-        kEnabledInPrefs:
+    case QuietUiReason::kEnabledInPrefs:
       return l10n_util::GetStringUTF16(
           IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_MESSAGE);
-    case permissions::NotificationPermissionUiSelector::QuietUiReason::
-        kTriggeredByCrowdDeny:
+    case QuietUiReason::kTriggeredByCrowdDeny:
       return l10n_util::GetStringUTF16(
           IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CROWD_DENY_DESCRIPTION);
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      return l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ABUSIVE_DESCRIPTION);
   }
 
   NOTREACHED();
   return base::string16();
 }
 
+bool GroupedPermissionInfoBarDelegate::ShouldSecondaryButtonOpenSettings()
+    const {
+  auto* manager = permissions::PermissionRequestManager::FromWebContents(
+      permission_prompt_->web_contents());
+
+  switch (manager->ReasonForUsingQuietUi()) {
+    case QuietUiReason::kEnabledInPrefs:
+    case QuietUiReason::kTriggeredByCrowdDeny:
+      return true;
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      return false;
+  }
+
+  NOTREACHED();
+  return false;
+}
+
 int GroupedPermissionInfoBarDelegate::GetIconId() const {
   return IDR_ANDROID_INFOBAR_NOTIFICATIONS_OFF;
 }
@@ -99,14 +124,40 @@ base::string16 GroupedPermissionInfoBarDelegate::GetMessageText() const {
 }
 
 bool GroupedPermissionInfoBarDelegate::Accept() {
-  if (permission_prompt_)
-    permission_prompt_->Accept();
+  if (!permission_prompt_)
+    return true;
+
+  auto* manager = permissions::PermissionRequestManager::FromWebContents(
+      permission_prompt_->web_contents());
+  switch (manager->ReasonForUsingQuietUi()) {
+    case QuietUiReason::kEnabledInPrefs:
+    case QuietUiReason::kTriggeredByCrowdDeny:
+      permission_prompt_->Accept();
+      break;
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      permission_prompt_->Deny();
+      break;
+  }
   return true;
 }
 
 bool GroupedPermissionInfoBarDelegate::Cancel() {
-  // The infobar needs to be kept open after the "Manage" button is clicked.
-  return false;
+  if (!permission_prompt_)
+    return true;
+
+  auto* manager = permissions::PermissionRequestManager::FromWebContents(
+      permission_prompt_->web_contents());
+  switch (manager->ReasonForUsingQuietUi()) {
+    case QuietUiReason::kEnabledInPrefs:
+    case QuietUiReason::kTriggeredByCrowdDeny:
+      // The infobar needs to be kept open after the "Manage" button is clicked.
+      return false;
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      permission_prompt_->Accept();
+      return true;
+  }
+  NOTREACHED();
+  return true;
 }
 
 // static
@@ -146,10 +197,25 @@ int GroupedPermissionInfoBarDelegate::GetButtons() const {
 
 base::string16 GroupedPermissionInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
-  return l10n_util::GetStringUTF16(
-      (button == BUTTON_OK)
-          ? IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ALLOW_BUTTON
-          : IDS_NOTIFICATION_BUTTON_MANAGE);
+  auto* manager = permissions::PermissionRequestManager::FromWebContents(
+      permission_prompt_->web_contents());
+
+  switch (manager->ReasonForUsingQuietUi()) {
+    case QuietUiReason::kEnabledInPrefs:
+    case QuietUiReason::kTriggeredByCrowdDeny:
+      return l10n_util::GetStringUTF16(
+          (button == BUTTON_OK)
+              ? IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ALLOW_BUTTON
+              : IDS_NOTIFICATION_BUTTON_MANAGE);
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      return l10n_util::GetStringUTF16(
+          (button == BUTTON_OK)
+              ? IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CONTINUE_BLOCKING_BUTTON
+              : IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_COMPACT_ALLOW_BUTTON);
+  }
+
+  NOTREACHED();
+  return base::string16();
 }
 
 bool GroupedPermissionInfoBarDelegate::EqualsDelegate(

chrome/browser/permissions/grouped_permission_infobar_delegate_android.h

@@ -48,6 +48,9 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
   // Returns the secondary string to show in the infobar in the expanded state.
   base::string16 GetDescriptionText() const;
 
+  // Whether the secondary button should open site settings.
+  bool ShouldSecondaryButtonOpenSettings() const;
+
   // ConfirmInfoBarDelegate:
   int GetIconId() const override;
   bool LinkClicked(WindowOpenDisposition disposition) override;

chrome/browser/ui/android/infobars/grouped_permission_infobar.cc

@@ -30,8 +30,9 @@ ScopedJavaLocalRef<jobject> CreateRenderInfoBarHelper(
     const base::string16& compact_link_text,
     const base::string16& message_text,
     const base::string16& description_text,
-    const base::string16& ok_button_text,
-    const base::string16& cancel_button_text,
+    const base::string16& primary_button_text,
+    const base::string16& secondary_button_text,
+    bool secondary_button_should_open_settings,
     const std::vector<int>& content_settings) {
   ScopedJavaLocalRef<jstring> compact_message_text_java =
       base::android::ConvertUTF16ToJavaString(env, compact_message_text);
@@ -41,17 +42,18 @@ ScopedJavaLocalRef<jobject> CreateRenderInfoBarHelper(
       base::android::ConvertUTF16ToJavaString(env, message_text);
   ScopedJavaLocalRef<jstring> description_text_java =
       base::android::ConvertUTF16ToJavaString(env, description_text);
-  ScopedJavaLocalRef<jstring> ok_button_text_java =
-      base::android::ConvertUTF16ToJavaString(env, ok_button_text);
-  ScopedJavaLocalRef<jstring> cancel_button_text_java =
-      base::android::ConvertUTF16ToJavaString(env, cancel_button_text);
+  ScopedJavaLocalRef<jstring> primary_button_text_java =
+      base::android::ConvertUTF16ToJavaString(env, primary_button_text);
+  ScopedJavaLocalRef<jstring> secondary_button_text_java =
+      base::android::ConvertUTF16ToJavaString(env, secondary_button_text);
 
   ScopedJavaLocalRef<jintArray> content_settings_types =
       base::android::ToJavaIntArray(env, content_settings);
   return Java_PermissionInfoBar_create(
       env, window, content_settings_types, enumerated_icon_id,
       compact_message_text_java, compact_link_text_java, message_text_java,
-      description_text_java, ok_button_text_java, cancel_button_text_java);
+      description_text_java, primary_button_text_java,
+      secondary_button_text_java, secondary_button_should_open_settings);
 }
 
 }  // namespace
@@ -70,9 +72,12 @@ GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
   base::string16 compact_link_text = delegate->GetCompactLinkText();
   base::string16 message_text = delegate->GetMessageText();
   base::string16 description_text = delegate->GetDescriptionText();
-  base::string16 ok_button_text = GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK);
-  base::string16 cancel_button_text =
+  base::string16 primary_button_text =
+      GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK);
+  base::string16 secondary_button_text =
       GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL);
+  const bool secondary_button_should_open_settings =
+      delegate->ShouldSecondaryButtonOpenSettings();
 
   int permission_icon =
       ResourceMapper::MapToJavaDrawableId(delegate->GetIconId());
@@ -87,7 +92,8 @@ GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
       env, permission_icon,
       GetTab()->web_contents()->GetTopLevelNativeWindow()->GetJavaObject(),
       compact_message_text, compact_link_text, message_text, description_text,
-      ok_button_text, cancel_button_text, content_settings_types);
+      primary_button_text, secondary_button_text,
+      secondary_button_should_open_settings, content_settings_types);
 }
 
 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() {

chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

@@ -13,11 +13,16 @@
 #include "components/google/core/common/google_util.h"
 #include "components/subresource_filter/core/browser/subresource_filter_constants.h"
 
-// The URL for when the user clicks "learn more" on the mixed scripting page
+// The URL for when the user clicks "Learn more" on the mixed scripting page
 // icon bubble.
-const char kInsecureScriptHelpUrl[] =
+constexpr char kInsecureScriptHelpUrl[] =
     "https://support.google.com/chrome/?p=unauthenticated";
 
+// The URL for when the user clicks the "Learn more" on the quiet notification
+// permission prompt.
+constexpr char kNotificationsHelpUrl[] =
+    "https://support.google.com/chrome/answer/3220216";
+
 BrowserContentSettingBubbleModelDelegate::
     BrowserContentSettingBubbleModelDelegate(Browser* browser)
     : browser_(browser) {}
@@ -57,6 +62,9 @@ void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage(
     case ContentSettingsType::MIXEDSCRIPT:
       learn_more_url = GURL(kInsecureScriptHelpUrl);
       break;
+    case ContentSettingsType::NOTIFICATIONS:
+      learn_more_url = GURL(kNotificationsHelpUrl);
+      break;
     default:
       return;
   }

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -85,6 +85,8 @@ using content_settings::TabSpecificContentSettings;
 
 namespace {
 
+using QuietUiReason = permissions::PermissionRequestManager::QuietUiReason;
+
 #if defined(OS_MACOSX)
 static constexpr char kCameraSettingsURI[] =
     "x-apple.systempreferences:com.apple.preference.security?Privacy_"
@@ -1622,30 +1624,48 @@ ContentSettingNotificationsBubbleModel::ContentSettingNotificationsBubbleModel(
     : ContentSettingBubbleModel(delegate, web_contents) {
   set_title(l10n_util::GetStringUTF16(
       IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_TITLE));
-  set_done_button_text(l10n_util::GetStringUTF16(
-      IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ALLOW_BUTTON));
-  set_show_learn_more(false);
 
   // TODO(crbug.com/1030633): This block is more defensive than it needs to be
   // because ContentSettingImageModelBrowserTest exercises it without setting up
   // the correct PermissionRequestManager state. Fix that.
   permissions::PermissionRequestManager* manager =
       permissions::PermissionRequestManager::FromWebContents(web_contents);
-  int message_resource_id =
-      IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_DESCRIPTION;
-  if (manager->ShouldCurrentRequestUseQuietUI() &&
-      manager->ReasonForUsingQuietUi() ==
-          permissions::PermissionRequestManager::QuietUiReason::
-              kTriggeredByCrowdDeny) {
-    message_resource_id =
-        IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CROWD_DENY_DESCRIPTION;
-    base::RecordAction(
-        base::UserMetricsAction("Notifications.Quiet.StaticIconClicked"));
-  } else {
-    base::RecordAction(
-        base::UserMetricsAction("Notifications.Quiet.AnimatedIconClicked"));
+  if (!manager->ShouldCurrentRequestUseQuietUI())
+    return;
+  switch (manager->ReasonForUsingQuietUi()) {
+    case QuietUiReason::kEnabledInPrefs:
+      set_message(l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_DESCRIPTION));
+      set_done_button_text(l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ALLOW_BUTTON));
+      set_show_learn_more(false);
+      base::RecordAction(
+          base::UserMetricsAction("Notifications.Quiet.AnimatedIconClicked"));
+      break;
+    case QuietUiReason::kTriggeredByCrowdDeny:
+      set_message(l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CROWD_DENY_DESCRIPTION));
+      set_done_button_text(l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ALLOW_BUTTON));
+      set_show_learn_more(false);
+      base::RecordAction(
+          base::UserMetricsAction("Notifications.Quiet.StaticIconClicked"));
+      break;
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      set_message(l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ABUSIVE_DESCRIPTION));
+      // TODO(crbug.com/1082738): It is rather confusing to have the `Cancel`
+      // button allow the permission, but we want the primary to block.
+      set_cancel_button_text(l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_COMPACT_ALLOW_BUTTON));
+      set_done_button_text(l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CONTINUE_BLOCKING_BUTTON));
+      set_show_learn_more(true);
+      set_manage_text_style(ManageTextStyle::kNone);
+      base::RecordAction(
+          base::UserMetricsAction("Notifications.Quiet.StaticIconClicked"));
+      break;
   }
-  set_message(l10n_util::GetStringUTF16(message_resource_id));
 }
 
 ContentSettingNotificationsBubbleModel::
@@ -1664,13 +1684,46 @@ void ContentSettingNotificationsBubbleModel::OnManageButtonClicked() {
       base::UserMetricsAction("Notifications.Quiet.ManageClicked"));
 }
 
+void ContentSettingNotificationsBubbleModel::OnLearnMoreClicked() {
+  if (delegate())
+    delegate()->ShowLearnMorePage(ContentSettingsType::NOTIFICATIONS);
+}
+
 void ContentSettingNotificationsBubbleModel::OnDoneButtonClicked() {
   permissions::PermissionRequestManager* manager =
       permissions::PermissionRequestManager::FromWebContents(web_contents());
-  manager->Accept();
 
-  base::RecordAction(
-      base::UserMetricsAction("Notifications.Quiet.ShowForSiteClicked"));
+  DCHECK(manager->ShouldCurrentRequestUseQuietUI());
+  switch (manager->ReasonForUsingQuietUi()) {
+    case QuietUiReason::kEnabledInPrefs:
+    case QuietUiReason::kTriggeredByCrowdDeny:
+      manager->Accept();
+      base::RecordAction(
+          base::UserMetricsAction("Notifications.Quiet.ShowForSiteClicked"));
+      break;
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      manager->Deny();
+      base::RecordAction(base::UserMetricsAction(
+          "Notifications.Quiet.ContinueBlockingClicked"));
+      break;
+  }
+}
+
+void ContentSettingNotificationsBubbleModel::OnCancelButtonClicked() {
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(web_contents());
+
+  switch (manager->ReasonForUsingQuietUi()) {
+    case QuietUiReason::kEnabledInPrefs:
+    case QuietUiReason::kTriggeredByCrowdDeny:
+      // No-op.
+      break;
+    case QuietUiReason::kTriggeredDueToAbusiveRequests:
+      manager->Accept();
+      base::RecordAction(
+          base::UserMetricsAction("Notifications.Quiet.ShowForSiteClicked"));
+      break;
+  }
 }
 
 // ContentSettingBubbleModel ---------------------------------------------------

chrome/browser/ui/content_settings/content_setting_bubble_model.h

@@ -161,6 +161,7 @@ class ContentSettingBubbleModel {
     MediaMenuMap media_menus;
     bool show_learn_more = false;
     base::string16 done_button_text;
+    base::string16 cancel_button_text;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(BubbleContent);
@@ -191,6 +192,7 @@ class ContentSettingBubbleModel {
   virtual void OnMediaMenuClicked(blink::mojom::MediaStreamType type,
                                   const std::string& selected_device_id) {}
   virtual void OnDoneButtonClicked() {}
+  virtual void OnCancelButtonClicked() {}
   // Called by the view code when the bubble is closed
   virtual void CommitChanges() {}
 
@@ -273,6 +275,9 @@ class ContentSettingBubbleModel {
   void set_done_button_text(const base::string16& done_button_text) {
     bubble_content_.done_button_text = done_button_text;
   }
+  void set_cancel_button_text(const base::string16& cancel_button_text) {
+    bubble_content_.cancel_button_text = cancel_button_text;
+  }
   rappor::RapporServiceImpl* rappor_service() const { return rappor_service_; }
 
  private:
@@ -423,7 +428,9 @@ class ContentSettingNotificationsBubbleModel
 
   // ContentSettingBubbleModel:
   void OnManageButtonClicked() override;
+  void OnLearnMoreClicked() override;
   void OnDoneButtonClicked() override;
+  void OnCancelButtonClicked() override;
   ContentSettingNotificationsBubbleModel* AsNotificationsBubbleModel() override;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingNotificationsBubbleModel);

chrome/browser/ui/views/content_setting_bubble_contents.cc

@@ -382,7 +382,11 @@ ContentSettingBubbleContents::ContentSettingBubbleContents(
   DCHECK(content_setting_bubble_model_);
   const base::string16& done_text =
       content_setting_bubble_model_->bubble_content().done_button_text;
-  DialogDelegate::SetButtons(ui::DIALOG_BUTTON_OK);
+  const base::string16& cancel_text =
+      content_setting_bubble_model_->bubble_content().cancel_button_text;
+  DialogDelegate::SetButtons(
+      cancel_text.empty() ? ui::DIALOG_BUTTON_OK
+                          : (ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL));
   DialogDelegate::SetButtonLabel(
       ui::DIALOG_BUTTON_OK,
       done_text.empty() ? l10n_util::GetStringUTF16(IDS_DONE) : done_text);
@@ -390,6 +394,13 @@ ContentSettingBubbleContents::ContentSettingBubbleContents(
   DialogDelegate::SetAcceptCallback(
       base::BindOnce(&ContentSettingBubbleModel::OnDoneButtonClicked,
                      base::Unretained(content_setting_bubble_model_.get())));
+
+  if (!cancel_text.empty()) {
+    DialogDelegate::SetButtonLabel(ui::DIALOG_BUTTON_CANCEL, cancel_text);
+    DialogDelegate::SetCancelCallback(
+        base::BindOnce(&ContentSettingBubbleModel::OnCancelButtonClicked,
+                       base::Unretained(content_setting_bubble_model_.get())));
+  }
 }
 
 ContentSettingBubbleContents::~ContentSettingBubbleContents() {

chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc

@@ -207,10 +207,12 @@ void ContentSettingBubbleDialogTest::ShowUi(const std::string& name) {
 
   if (base::StartsWith(name, "notifications_quiet",
                        base::CompareCase::SENSITIVE)) {
-    TriggerQuietNotificationPermissionRequest(
-        name == "notifications_quiet_crowd_deny"
-            ? QuietUiReason::kTriggeredByCrowdDeny
-            : QuietUiReason::kEnabledInPrefs);
+    QuietUiReason reason = QuietUiReason::kEnabledInPrefs;
+    if (name == "notifications_quiet_crowd_deny")
+      reason = QuietUiReason::kTriggeredByCrowdDeny;
+    else if (name == "notifications_quiet_abusive")
+      reason = QuietUiReason::kTriggeredDueToAbusiveRequests;
+    TriggerQuietNotificationPermissionRequest(reason);
     ShowDialogBubble(ImageType::NOTIFICATIONS_QUIET_PROMPT);
     return;
   }
@@ -322,3 +324,8 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleDialogTest,
                        InvokeUi_notifications_quiet_crowd_deny) {
   ShowAndVerifyUi();
 }
+
+IN_PROC_BROWSER_TEST_F(ContentSettingBubbleDialogTest,
+                       InvokeUi_notifications_quiet_abusive) {
+  ShowAndVerifyUi();
+}

components/permissions/notification_permission_ui_selector.h

@@ -24,6 +24,7 @@ class NotificationPermissionUiSelector {
   enum class QuietUiReason {
     kEnabledInPrefs,
     kTriggeredByCrowdDeny,
+    kTriggeredDueToAbusiveRequests,
   };
 
   using DecisionMadeCallback =