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

Side by Side Diff: chrome/browser/ui/android/infobars/grouped_permission_infobar.cc

Issue 2757483002: Move requests from GroupedPermissionInfoBarDelegate to PermissionPromptAndroid (Closed)
Patch Set: rename inline function Created 3 years, 9 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
« no previous file with comments | « chrome/browser/permissions/permission_prompt_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "chrome/browser/android/tab_android.h" 11 #include "chrome/browser/android/tab_android.h"
12 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h" 12 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h"
13 #include "jni/GroupedPermissionInfoBar_jni.h" 13 #include "jni/GroupedPermissionInfoBar_jni.h"
14 14
15 GroupedPermissionInfoBar::GroupedPermissionInfoBar( 15 GroupedPermissionInfoBar::GroupedPermissionInfoBar(
16 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate) 16 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate)
17 : ConfirmInfoBar(std::move(delegate)) {} 17 : ConfirmInfoBar(std::move(delegate)) {}
18 18
19 GroupedPermissionInfoBar::~GroupedPermissionInfoBar() { 19 GroupedPermissionInfoBar::~GroupedPermissionInfoBar() {
20 } 20 }
21 21
22 bool GroupedPermissionInfoBar::Register(JNIEnv* env) { 22 bool GroupedPermissionInfoBar::Register(JNIEnv* env) {
23 return RegisterNativesImpl(env); 23 return RegisterNativesImpl(env);
24 } 24 }
25 25
26 void GroupedPermissionInfoBar::SetPermissionState( 26 void GroupedPermissionInfoBar::SetPermissionState(
27 JNIEnv* env, 27 JNIEnv* env,
28 const base::android::JavaParamRef<jobject>& obj, 28 const base::android::JavaParamRef<jobject>& obj,
29 const base::android::JavaParamRef<jbooleanArray>& permissions) { 29 const base::android::JavaParamRef<jbooleanArray>& permissions) {
30 for (size_t i = 0; i < GetDelegate()->permission_count(); i++) { 30 for (size_t i = 0; i < GetDelegate()->PermissionCount(); i++) {
31 jboolean value; 31 jboolean value;
32 env->GetBooleanArrayRegion(permissions.obj(), i, 1, &value); 32 env->GetBooleanArrayRegion(permissions.obj(), i, 1, &value);
33 GetDelegate()->ToggleAccept(i, value); 33 GetDelegate()->ToggleAccept(i, value);
34 } 34 }
35 } 35 }
36 36
37 void GroupedPermissionInfoBar::ProcessButton(int action) { 37 void GroupedPermissionInfoBar::ProcessButton(int action) {
38 // Check if the delegate asked us to display a persistence toggle. If so, 38 // Check if the delegate asked us to display a persistence toggle. If so,
39 // inform it of the toggle state. 39 // inform it of the toggle state.
40 GroupedPermissionInfoBarDelegate* delegate = GetDelegate(); 40 GroupedPermissionInfoBarDelegate* delegate = GetDelegate();
(...skipping 16 matching lines...) Expand all
57 base::android::ConvertUTF16ToJavaString( 57 base::android::ConvertUTF16ToJavaString(
58 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)); 58 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK));
59 base::android::ScopedJavaLocalRef<jstring> cancel_button_text = 59 base::android::ScopedJavaLocalRef<jstring> cancel_button_text =
60 base::android::ConvertUTF16ToJavaString( 60 base::android::ConvertUTF16ToJavaString(
61 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL)); 61 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL));
62 62
63 std::vector<base::string16> permission_strings; 63 std::vector<base::string16> permission_strings;
64 std::vector<int> permission_icons; 64 std::vector<int> permission_icons;
65 std::vector<int> content_settings_types; 65 std::vector<int> content_settings_types;
66 66
67 for (size_t i = 0; i < delegate->permission_count(); i++) { 67 for (size_t i = 0; i < delegate->PermissionCount(); i++) {
68 permission_strings.push_back(delegate->GetMessageTextFragment(i)); 68 permission_strings.push_back(delegate->GetMessageTextFragment(i));
69 permission_icons.push_back( 69 permission_icons.push_back(
70 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i))); 70 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i)));
71 content_settings_types.push_back(delegate->GetContentSettingType(i)); 71 content_settings_types.push_back(delegate->GetContentSettingType(i));
72 } 72 }
73 73
74 return Java_GroupedPermissionInfoBar_create( 74 return Java_GroupedPermissionInfoBar_create(
75 env, GetTab()->GetJavaObject(), 75 env, GetTab()->GetJavaObject(),
76 base::android::ToJavaIntArray(env, content_settings_types), message_text, 76 base::android::ToJavaIntArray(env, content_settings_types), message_text,
77 ok_button_text, cancel_button_text, 77 ok_button_text, cancel_button_text,
78 delegate->ShouldShowPersistenceToggle(), 78 delegate->ShouldShowPersistenceToggle(),
79 base::android::ToJavaArrayOfStrings(env, permission_strings), 79 base::android::ToJavaArrayOfStrings(env, permission_strings),
80 base::android::ToJavaIntArray(env, permission_icons)); 80 base::android::ToJavaIntArray(env, permission_icons));
81 } 81 }
82 82
83 void GroupedPermissionInfoBar::SetJavaInfoBar( 83 void GroupedPermissionInfoBar::SetJavaInfoBar(
84 const base::android::JavaRef<jobject>& java_info_bar) { 84 const base::android::JavaRef<jobject>& java_info_bar) {
85 InfoBarAndroid::SetJavaInfoBar(java_info_bar); 85 InfoBarAndroid::SetJavaInfoBar(java_info_bar);
86 JNIEnv* env = base::android::AttachCurrentThread(); 86 JNIEnv* env = base::android::AttachCurrentThread();
87 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar, 87 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar,
88 reinterpret_cast<intptr_t>(this)); 88 reinterpret_cast<intptr_t>(this));
89 } 89 }
90 90
91 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() { 91 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() {
92 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate()); 92 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate());
93 } 93 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_prompt_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698