Make UI with PermissionRequestManager enabled match PermissionQueueController

chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
 
 #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/permission_prompt_android.h"
@@ skipping 24 matching lines @@
 
 bool GroupedPermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
   return permission_prompt_->ShouldShowPersistenceToggle();
 }
 
 ContentSettingsType GroupedPermissionInfoBarDelegate::GetContentSettingType(
     size_t position) const {
   return permission_prompt_->GetContentSettingType(position);
 }
 
-int GroupedPermissionInfoBarDelegate::GetIconIdForPermission(
-    size_t position) const {
-  return permission_prompt_->GetIconIdForPermission(position);
-}
-
-base::string16 GroupedPermissionInfoBarDelegate::GetMessageTextFragment(
-    size_t position) const {
-  return permission_prompt_->GetMessageTextFragment(position);
+int GroupedPermissionInfoBarDelegate::GetIconId() const {
+  return permission_prompt_->GetIconId();
 }
 
 base::string16 GroupedPermissionInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetStringFUTF16(
-      IDS_PERMISSIONS_BUBBLE_PROMPT,
-      url_formatter::FormatUrlForSecurityDisplay(requesting_origin_));
+  return permission_prompt_->GetMessageText();
 }
 
 bool GroupedPermissionInfoBarDelegate::Accept() {
   if (permission_prompt_) {
     if (permission_prompt_->ShouldShowPersistenceToggle())
       permission_prompt_->TogglePersist(persist_);
     permission_prompt_->Accept();
   }
   return true;
 }
@@ skipping 29 matching lines @@
 GroupedPermissionInfoBarDelegate::GetIdentifier() const {
   return GROUPED_PERMISSION_INFOBAR_DELEGATE_ANDROID;
 }
 
 infobars::InfoBarDelegate::Type
 GroupedPermissionInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 int GroupedPermissionInfoBarDelegate::GetButtons() const {
-  // If there is only one permission in the infobar, we show both OK and CANCEL
-  // button to allow/deny it. If there are multiple, we only show OK button
-  // which means making decision for all permissions according to each accept
-  // toggle.
-  return (PermissionCount() > 1) ? BUTTON_OK : (BUTTON_OK | BUTTON_CANCEL);
+  return BUTTON_OK | BUTTON_CANCEL;
 }
 
 base::string16 GroupedPermissionInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
-  if (PermissionCount() > 1) {
-    return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_APP_OK
-                                                           : IDS_APP_CANCEL);
-  }
-
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
                                                          : IDS_PERMISSION_DENY);
 }
 
 GURL GroupedPermissionInfoBarDelegate::GetLinkURL() const {
   return permission_prompt_->GetLinkURL();
 }
 
 bool GroupedPermissionInfoBarDelegate::EqualsDelegate(
     infobars::InfoBarDelegate* delegate) const {
   // The PermissionRequestManager doesn't create duplicate infobars so a pointer
   // equality check is sufficient.
   return this == delegate;
 }