Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Unified Diff: chrome/browser/permissions/permission_dialog_delegate.cc

Issue 2493013002: Replace the use of WindowAndroid with Tab in permissions code. (Closed)
Patch Set: Comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()),

Powered by Google App Engine
This is Rietveld 408576698