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

Unified Diff: chrome/browser/ui/android/infobars/permission_infobar.cc

Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars (Closed)
Patch Set: Merge branch 'master' into use_permission_type_for_infobar Created 4 years, 2 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/ui/android/infobars/permission_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/permission_infobar.cc b/chrome/browser/ui/android/infobars/permission_infobar.cc
index fb122e3a308302c76b312ae060412b3796a67e52..ab50d432efe780bae15ac7147b34de67869d9b76 100644
--- a/chrome/browser/ui/android/infobars/permission_infobar.cc
+++ b/chrome/browser/ui/android/infobars/permission_infobar.cc
@@ -55,13 +55,13 @@ ScopedJavaLocalRef<jobject> PermissionInfoBar::CreateRenderInfoBar(
java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
}
- std::vector<int> content_settings{delegate->content_settings()};
+ std::vector<int> permissions{delegate->permission_types()};
raymes 2016/10/17 01:11:12 nit: permission_types
return Java_PermissionInfoBar_create(
env, GetWindowAndroid().obj(), GetEnumeratedIconId(), java_bitmap.obj(),
message_text.obj(), link_text.obj(), ok_button_text.obj(),
cancel_button_text.obj(),
- base::android::ToJavaIntArray(env, content_settings).obj(),
+ base::android::ToJavaIntArray(env, permissions).obj(),
delegate->ShouldShowPersistenceToggle());
}

Powered by Google App Engine
This is Rietveld 408576698