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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h" 5 #include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "chrome/browser/android/resource_mapper.h" 10 #include "chrome/browser/android/resource_mapper.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 ConfirmInfoBar::ProcessButton(action); 46 ConfirmInfoBar::ProcessButton(action);
47 } 47 }
48 48
49 base::android::ScopedJavaLocalRef<jobject> 49 base::android::ScopedJavaLocalRef<jobject>
50 GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) { 50 GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
51 GroupedPermissionInfoBarDelegate* delegate = GetDelegate(); 51 GroupedPermissionInfoBarDelegate* delegate = GetDelegate();
52 52
53 base::android::ScopedJavaLocalRef<jstring> message_text = 53 base::android::ScopedJavaLocalRef<jstring> message_text =
54 base::android::ConvertUTF16ToJavaString( 54 base::android::ConvertUTF16ToJavaString(
55 env, delegate->GetMessageText()); 55 env, delegate->GetMessageText());
56 base::android::ScopedJavaLocalRef<jstring> link_text =
57 base::android::ConvertUTF16ToJavaString(env, delegate->GetLinkText());
56 base::android::ScopedJavaLocalRef<jstring> ok_button_text = 58 base::android::ScopedJavaLocalRef<jstring> ok_button_text =
57 base::android::ConvertUTF16ToJavaString( 59 base::android::ConvertUTF16ToJavaString(
58 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)); 60 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK));
59 base::android::ScopedJavaLocalRef<jstring> cancel_button_text = 61 base::android::ScopedJavaLocalRef<jstring> cancel_button_text =
60 base::android::ConvertUTF16ToJavaString( 62 base::android::ConvertUTF16ToJavaString(
61 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL)); 63 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL));
62 64
63 std::vector<base::string16> permission_strings; 65 std::vector<base::string16> permission_strings;
64 std::vector<int> permission_icons; 66 std::vector<int> permission_icons;
65 std::vector<int> content_settings_types; 67 std::vector<int> content_settings_types;
66 68
67 for (size_t i = 0; i < delegate->PermissionCount(); i++) { 69 for (size_t i = 0; i < delegate->PermissionCount(); i++) {
68 permission_strings.push_back(delegate->GetMessageTextFragment(i)); 70 permission_strings.push_back(delegate->GetMessageTextFragment(i));
69 permission_icons.push_back( 71 permission_icons.push_back(
70 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i))); 72 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i)));
71 content_settings_types.push_back(delegate->GetContentSettingType(i)); 73 content_settings_types.push_back(delegate->GetContentSettingType(i));
72 } 74 }
73 75
74 return Java_GroupedPermissionInfoBar_create( 76 return Java_GroupedPermissionInfoBar_create(
75 env, GetTab()->GetJavaObject(), 77 env, GetTab()->GetJavaObject(),
76 base::android::ToJavaIntArray(env, content_settings_types), message_text, 78 base::android::ToJavaIntArray(env, content_settings_types), message_text,
77 ok_button_text, cancel_button_text, 79 link_text, ok_button_text, cancel_button_text,
78 delegate->ShouldShowPersistenceToggle(), 80 delegate->ShouldShowPersistenceToggle(),
79 base::android::ToJavaArrayOfStrings(env, permission_strings), 81 base::android::ToJavaArrayOfStrings(env, permission_strings),
80 base::android::ToJavaIntArray(env, permission_icons)); 82 base::android::ToJavaIntArray(env, permission_icons));
81 } 83 }
82 84
83 void GroupedPermissionInfoBar::SetJavaInfoBar( 85 void GroupedPermissionInfoBar::SetJavaInfoBar(
84 const base::android::JavaRef<jobject>& java_info_bar) { 86 const base::android::JavaRef<jobject>& java_info_bar) {
85 InfoBarAndroid::SetJavaInfoBar(java_info_bar); 87 InfoBarAndroid::SetJavaInfoBar(java_info_bar);
86 JNIEnv* env = base::android::AttachCurrentThread(); 88 JNIEnv* env = base::android::AttachCurrentThread();
87 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar, 89 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar,
88 reinterpret_cast<intptr_t>(this)); 90 reinterpret_cast<intptr_t>(this));
89 } 91 }
90 92
91 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() { 93 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() {
92 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate()); 94 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate());
93 } 95 }
OLDNEW
« 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