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

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

Issue 2923393002: Make UI with PermissionRequestManager enabled match PermissionQueueController (Closed)
Patch Set: address comments Created 3 years, 6 months 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 52eb39d2e1a961ea0082555303422139254e5956..c3962c7414f82842e02345243a83a9914ad49d92 100644
--- a/chrome/browser/permissions/permission_dialog_delegate.cc
+++ b/chrome/browser/permissions/permission_dialog_delegate.cc
@@ -157,9 +157,8 @@ void PermissionDialogDelegate::CreateJavaDelegate(JNIEnv* env) {
j_delegate_.Reset(Java_PermissionDialogDelegate_create(
env, reinterpret_cast<uintptr_t>(this), tab_->GetJavaObject(),
base::android::ToJavaIntArray(env, content_settings_types).obj(),
- ResourceMapper::MapFromChromiumId(
- permission_prompt_->GetIconIdForPermission(0)),
- ConvertUTF16ToJavaString(env, permission_prompt_->GetMessageText(0)),
+ ResourceMapper::MapFromChromiumId(permission_prompt_->GetIconId()),
+ ConvertUTF16ToJavaString(env, permission_prompt_->GetMessageText()),
ConvertUTF16ToJavaString(env, permission_prompt_->GetLinkText()),
primaryButtonText, secondaryButtonText,
permission_prompt_->ShouldShowPersistenceToggle()));

Powered by Google App Engine
This is Rietveld 408576698