| 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 77f92e5b4bbba4c256e3c7fa9eb05e4173d07d39..fa742519a5b9aec29dd9cc88e0a02b56b6b04fd8 100644
|
| --- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| +++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| @@ -34,7 +34,7 @@ size_t GroupedPermissionInfoBarDelegate::PermissionCount() const {
|
| }
|
|
|
| bool GroupedPermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
|
| - return PermissionUtil::ShouldShowPersistenceToggle();
|
| + return permission_prompt_->ShouldShowPersistenceToggle();
|
| }
|
|
|
| ContentSettingsType GroupedPermissionInfoBarDelegate::GetContentSettingType(
|
| @@ -66,14 +66,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;
|
| }
|
|
|
|
|