| 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 ebaa1b406584155abfc482ac1ba4fea975637836..b8a66c86aca713c16b55c76419a8be5a7aa1dd26 100644
|
| --- a/chrome/browser/permissions/permission_dialog_delegate.cc
|
| +++ b/chrome/browser/permissions/permission_dialog_delegate.cc
|
| @@ -94,12 +94,13 @@ ScopedJavaLocalRef<jobject> PermissionDialogDelegate::CreateJavaDelegate(
|
| TabAndroid* tab = TabAndroid::FromWebContents(web_contents());
|
| DCHECK(tab);
|
|
|
| - std::vector<int> content_settings{infobar_delegate_->content_settings()};
|
| + std::vector<int> content_settings_types{
|
| + infobar_delegate_->content_settings_types()};
|
|
|
| return Java_PermissionDialogDelegate_create(
|
| env, reinterpret_cast<uintptr_t>(this),
|
| tab->GetJavaObject(),
|
| - base::android::ToJavaIntArray(env, content_settings).obj(),
|
| + base::android::ToJavaIntArray(env, content_settings_types).obj(),
|
| ResourceMapper::MapFromChromiumId(infobar_delegate_->GetIconId()),
|
| ConvertUTF16ToJavaString(env, infobar_delegate_->GetMessageText()),
|
| ConvertUTF16ToJavaString(env, infobar_delegate_->GetLinkText()),
|
|
|