| Index: chrome/browser/permissions/grouped_permission_infobar_delegate.cc
|
| diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
|
| index 46795c43fa3350fc94c9536e35f385514b60bdf6..2f4350d4e15f65cfbdbec77096964b11812bb802 100644
|
| --- a/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
|
| +++ b/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
|
| @@ -3,6 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "chrome/browser/permissions/grouped_permission_infobar_delegate.h"
|
| +#include "chrome/browser/permissions/permission_util.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/url_formatter/elide_url.h"
|
| #include "grit/theme_resources.h"
|
| @@ -13,7 +14,8 @@ GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate(
|
| const std::vector<ContentSettingsType>& types)
|
| : requesting_origin_(requesting_origin),
|
| types_(types),
|
| - accept_states_(types_.size(), true) {}
|
| + accept_states_(types_.size(), true),
|
| + persist_(true) {}
|
|
|
| GroupedPermissionInfoBarDelegate::~GroupedPermissionInfoBarDelegate() {}
|
|
|
| @@ -22,6 +24,12 @@ GroupedPermissionInfoBarDelegate::GetInfoBarType() const {
|
| return PAGE_ACTION_TYPE;
|
| }
|
|
|
| +bool GroupedPermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
|
| + if (GetPermissionCount() >= 2)
|
| + return false;
|
| + return PermissionUtil::ShouldShowPersistenceToggle();
|
| +}
|
| +
|
| int GroupedPermissionInfoBarDelegate::GetButtons() const {
|
| if (GetPermissionCount() >= 2)
|
| return ConfirmInfoBarDelegate::InfoBarButton::BUTTON_OK;
|
|
|