| Index: chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| index aa098ea1d1af49814b4bbb048c567e46a5df76db..655505a4a992fa8e453c1f8a14909e28eae8559c 100644
|
| --- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| +++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| @@ -35,7 +35,7 @@ size_t GroupedPermissionInfoBarDelegate::PermissionCount() const {
|
| }
|
|
|
| bool GroupedPermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
|
| - return PermissionUtil::ShouldShowPersistenceToggle();
|
| + return permission_prompt_->ShouldShowPersistenceToggle();
|
| }
|
|
|
| ContentSettingsType GroupedPermissionInfoBarDelegate::GetContentSettingType(
|
| @@ -67,14 +67,20 @@ base::string16 GroupedPermissionInfoBarDelegate::GetMessageText() const {
|
| }
|
|
|
| bool GroupedPermissionInfoBarDelegate::Accept() {
|
| - if (permission_prompt_)
|
| + if (permission_prompt_) {
|
| + if (permission_prompt_->ShouldShowPersistenceToggle())
|
| + permission_prompt_->TogglePersist(persist_);
|
| permission_prompt_->Accept();
|
| + }
|
| return true;
|
| }
|
|
|
| bool GroupedPermissionInfoBarDelegate::Cancel() {
|
| - if (permission_prompt_)
|
| + if (permission_prompt_) {
|
| + if (permission_prompt_->ShouldShowPersistenceToggle())
|
| + permission_prompt_->TogglePersist(persist_);
|
| permission_prompt_->Deny();
|
| + }
|
| return true;
|
| }
|
|
|
|
|