Using crowd deny string for mini-infobar when the reason for the...

...quiet ui is kTriggeredByCrowdDeny

Bug: 1030633
Change-Id: Ib548aea95a949b061654fe374581a5c6c910360f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1951007
Commit-Queue: Andy Paicu <andypaicu@chromium.org>
Reviewed-by: Kamila Hasanbega <hkamila@google.com>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721994}

chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

@@ -7,6 +7,7 @@
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/permissions/notification_permission_ui_selector.h"
 #include "chrome/browser/permissions/permission_prompt_android.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
@@ -56,8 +57,20 @@ base::string16 GroupedPermissionInfoBarDelegate::GetCompactLinkText() const {
 }
 
 base::string16 GroupedPermissionInfoBarDelegate::GetDescriptionText() const {
-  return l10n_util::GetStringUTF16(
-      IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_MESSAGE);
+  auto* manager = PermissionRequestManager::FromWebContents(
+      permission_prompt_->web_contents());
+
+  switch (manager->ReasonForUsingQuietUi()) {
+    case NotificationPermissionUiSelector::QuietUiReason::kEnabledInPrefs:
+      return l10n_util::GetStringUTF16(
+          IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_MESSAGE);
+    case NotificationPermissionUiSelector::QuietUiReason::kTriggeredByCrowdDeny:
+      return l10n_util::GetStringUTF16(
+          IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CROWD_DENY_DESCRIPTION);
+  }
+
+  NOTREACHED();
+  return base::string16();
 }
 
 int GroupedPermissionInfoBarDelegate::GetIconId() const {

chrome/browser/permissions/permission_prompt_android.h

@@ -47,6 +47,8 @@ class PermissionPromptAndroid : public PermissionPrompt,
   base::string16 GetTitleText() const;
   base::string16 GetMessageText() const;
 
+  const content::WebContents* web_contents() { return web_contents_; }
+
   // InfoBar::Manager:
   void OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override;
   void OnManagerShuttingDown(infobars::InfoBarManager* manager) override;

chrome/browser/permissions/permission_request_manager.cc

@@ -574,7 +574,7 @@ void PermissionRequestManager::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
-bool PermissionRequestManager::ShouldCurrentRequestUseQuietUI() {
+bool PermissionRequestManager::ShouldCurrentRequestUseQuietUI() const {
   if (!IsRequestInProgress())
     return false;
 
@@ -585,11 +585,11 @@ bool PermissionRequestManager::ShouldCurrentRequestUseQuietUI() {
 }
 
 PermissionRequestManager::QuietUiReason
-PermissionRequestManager::ReasonForUsingQuietUi() {
+PermissionRequestManager::ReasonForUsingQuietUi() const {
   return *current_request_quiet_ui_reason_;
 }
 
-bool PermissionRequestManager::IsRequestInProgress() {
+bool PermissionRequestManager::IsRequestInProgress() const {
   return !requests_.empty();
 }
 

chrome/browser/permissions/permission_request_manager.h

@@ -82,10 +82,16 @@ class PermissionRequestManager
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  bool ShouldCurrentRequestUseQuietUI();
-  QuietUiReason ReasonForUsingQuietUi();
-
-  bool IsRequestInProgress();
+  // Notification permission requests might use a quiet UI when the
+  // "quiet-notification-prompts" feature is enabled. This is done either
+  // directly by the user in notifications settings, or via automatic logic that
+  // might trigger the current request to use the quiet UI.
+  bool ShouldCurrentRequestUseQuietUI() const;
+  // If |ShouldCurrentRequestUseQuietUI| return true, this will provide a reason
+  // as to why the quiet UI needs to be used.
+  QuietUiReason ReasonForUsingQuietUi() const;
+
+  bool IsRequestInProgress() const;
 
   // Do NOT use this methods in production code. Use this methods in browser
   // tests that need to accept or deny permissions when requested in