| Index: chrome/browser/permissions/permission_prompt_android.cc
|
| diff --git a/chrome/browser/permissions/permission_prompt_android.cc b/chrome/browser/permissions/permission_prompt_android.cc
|
| index 7e47372f443f4dc6e828f12d23e80b83059a97f4..9893147833314b1f6e2ca639c72794b6066951ed 100644
|
| --- a/chrome/browser/permissions/permission_prompt_android.cc
|
| +++ b/chrome/browser/permissions/permission_prompt_android.cc
|
| @@ -29,15 +29,14 @@ void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
|
| }
|
|
|
| void PermissionPromptAndroid::Show() {
|
| - // Grouped permission requests are not yet supported in dialogs.
|
| - // TODO(timloh): Handle grouped media permissions (camera + microphone).
|
| - if (delegate_->Requests().size() == 1) {
|
| - bool has_gesture = delegate_->Requests()[0]->GetGestureType() ==
|
| - PermissionRequestGestureType::GESTURE;
|
| - if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
|
| - PermissionDialogDelegate::Create(web_contents_, this);
|
| - return;
|
| - }
|
| + bool has_gesture = true;
|
| + for (const PermissionRequest* request : delegate_->Requests()) {
|
| + has_gesture &=
|
| + request->GetGestureType() == PermissionRequestGestureType::GESTURE;
|
| + }
|
| + if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
|
| + PermissionDialogDelegate::Create(web_contents_, this);
|
| + return;
|
| }
|
|
|
| InfoBarService* infobar_service =
|
|
|