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

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

Issue 2919323002: Support "learn more" link for EME in PermissionRequestManager code-path on Android (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/ui/android/infobars/grouped_permission_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
index c8f147d09d8a32141da7b281fcc2f16c38518871..e570ccee7b4d2f0185b21a2a642947f081035f2b 100644
--- a/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
+++ b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
@@ -53,6 +53,8 @@ GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
base::android::ScopedJavaLocalRef<jstring> message_text =
base::android::ConvertUTF16ToJavaString(
env, delegate->GetMessageText());
+ base::android::ScopedJavaLocalRef<jstring> link_text =
+ base::android::ConvertUTF16ToJavaString(env, delegate->GetLinkText());
base::android::ScopedJavaLocalRef<jstring> ok_button_text =
base::android::ConvertUTF16ToJavaString(
env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK));
@@ -74,7 +76,7 @@ GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
return Java_GroupedPermissionInfoBar_create(
env, GetTab()->GetJavaObject(),
base::android::ToJavaIntArray(env, content_settings_types), message_text,
- ok_button_text, cancel_button_text,
+ link_text, ok_button_text, cancel_button_text,
delegate->ShouldShowPersistenceToggle(),
base::android::ToJavaArrayOfStrings(env, permission_strings),
base::android::ToJavaIntArray(env, permission_icons));
« no previous file with comments | « chrome/browser/permissions/permission_request_impl.cc ('k') | chrome/browser/ui/permission_bubble/mock_permission_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698