| 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 af595628b7095ecb5e2dca3fc0b71410f4cf5687..361d3a1b62e72bc12a681064e05de3cd43297b6b 100644
|
| --- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| +++ b/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/permission_prompt_android.h"
|
| #include "chrome/browser/permissions/permission_request.h"
|
| #include "chrome/browser/permissions/permission_util.h"
|
| #include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h"
|
| @@ -63,6 +64,27 @@ base::string16 GroupedPermissionInfoBarDelegate::GetMessageText() const {
|
| url_formatter::FormatUrlForSecurityDisplay(requesting_origin_));
|
| }
|
|
|
| +bool GroupedPermissionInfoBarDelegate::Accept() {
|
| + if (permission_prompt_)
|
| + permission_prompt_->Accept();
|
| + return true;
|
| +}
|
| +
|
| +bool GroupedPermissionInfoBarDelegate::Cancel() {
|
| + if (permission_prompt_)
|
| + permission_prompt_->Deny();
|
| + return true;
|
| +}
|
| +
|
| +void GroupedPermissionInfoBarDelegate::SetPermissionPrompt(
|
| + PermissionPromptAndroid* permission_prompt) {
|
| + permission_prompt_ = permission_prompt;
|
| +}
|
| +
|
| +void GroupedPermissionInfoBarDelegate::ResetPermissionPrompt() {
|
| + permission_prompt_ = nullptr;
|
| +}
|
| +
|
| bool GroupedPermissionInfoBarDelegate::GetAcceptState(size_t position) {
|
| DCHECK_LT(position, requests_.size());
|
| return accept_states_[position];
|
| @@ -74,7 +96,8 @@ GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate(
|
| : requesting_origin_(requesting_origin),
|
| requests_(requests),
|
| accept_states_(requests_.size(), true),
|
| - persist_(true) {}
|
| + persist_(true),
|
| + permission_prompt_(nullptr) {}
|
|
|
| infobars::InfoBarDelegate::InfoBarIdentifier
|
| GroupedPermissionInfoBarDelegate::GetIdentifier() const {
|
| @@ -104,3 +127,8 @@ base::string16 GroupedPermissionInfoBarDelegate::GetButtonLabel(
|
| return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
|
| : IDS_PERMISSION_DENY);
|
| }
|
| +
|
| +GroupedPermissionInfoBarDelegate*
|
| +GroupedPermissionInfoBarDelegate::AsGroupedPermissionInfoBarDelegate() {
|
| + return this;
|
| +}
|
|
|