| Index: chrome/browser/permissions/permission_dialog_delegate.cc
|
| diff --git a/chrome/browser/permissions/permission_dialog_delegate.cc b/chrome/browser/permissions/permission_dialog_delegate.cc
|
| index c3962c7414f82842e02345243a83a9914ad49d92..ff6fbc95e6e1586d53e522af8ed4e846d0c5c158 100644
|
| --- a/chrome/browser/permissions/permission_dialog_delegate.cc
|
| +++ b/chrome/browser/permissions/permission_dialog_delegate.cc
|
| @@ -148,11 +148,11 @@ void PermissionDialogDelegate::CreateJavaDelegate(JNIEnv* env) {
|
| return;
|
| }
|
|
|
| - // TODO(timloh): Handle grouped media permissions (camera + microphone).
|
| - DCHECK_EQ(1u, permission_prompt_->PermissionCount());
|
| -
|
| - std::vector<int> content_settings_types{
|
| - permission_prompt_->GetContentSettingType(0)};
|
| + std::vector<int> content_settings_types;
|
| + for (size_t i = 0; i < permission_prompt_->PermissionCount(); ++i) {
|
| + content_settings_types.push_back(
|
| + permission_prompt_->GetContentSettingType(i));
|
| + }
|
|
|
| j_delegate_.Reset(Java_PermissionDialogDelegate_create(
|
| env, reinterpret_cast<uintptr_t>(this), tab_->GetJavaObject(),
|
|
|