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

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

Issue 2332663002: Revert of Enable the optional permission prompt persistence toggle on grouped infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-infobardelegate-clean
Patch Set: Created 4 years, 3 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 16 matching lines...) Expand all
27 const base::android::JavaParamRef<jobject>& obj, 27 const base::android::JavaParamRef<jobject>& obj,
28 const base::android::JavaParamRef<jbooleanArray>& permissions) { 28 const base::android::JavaParamRef<jbooleanArray>& permissions) {
29 29
30 for (int i = 0; i < GetDelegate()->GetPermissionCount(); i++) { 30 for (int i = 0; i < GetDelegate()->GetPermissionCount(); 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) {
38 // Check if the delegate asked us to display a persistence toggle. If so,
39 // inform it of the toggle state.
40 GroupedPermissionInfoBarDelegate* delegate = GetDelegate();
41 if (delegate->ShouldShowPersistenceToggle()) {
42 delegate->set_persist(Java_GroupedPermissionInfoBar_isPersistSwitchOn(
43 base::android::AttachCurrentThread(), GetJavaInfoBar()));
44 }
45
46 ConfirmInfoBar::ProcessButton(action);
47 }
48
49 base::android::ScopedJavaLocalRef<jobject> 37 base::android::ScopedJavaLocalRef<jobject>
50 GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) { 38 GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
51 GroupedPermissionInfoBarDelegate* delegate = GetDelegate(); 39 GroupedPermissionInfoBarDelegate* delegate = GetDelegate();
52 40
53 base::android::ScopedJavaLocalRef<jstring> message_text = 41 base::android::ScopedJavaLocalRef<jstring> message_text =
54 base::android::ConvertUTF16ToJavaString( 42 base::android::ConvertUTF16ToJavaString(
55 env, delegate->GetMessageText()); 43 env, delegate->GetMessageText());
56 base::android::ScopedJavaLocalRef<jstring> ok_button_text = 44 base::android::ScopedJavaLocalRef<jstring> ok_button_text =
57 base::android::ConvertUTF16ToJavaString( 45 base::android::ConvertUTF16ToJavaString(
58 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)); 46 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK));
(...skipping 10 matching lines...) Expand all
69 permission_icons.push_back( 57 permission_icons.push_back(
70 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i))); 58 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i)));
71 content_settings_types.push_back(delegate->GetContentSettingType(i)); 59 content_settings_types.push_back(delegate->GetContentSettingType(i));
72 } 60 }
73 61
74 return Java_GroupedPermissionInfoBar_create( 62 return Java_GroupedPermissionInfoBar_create(
75 env, message_text, ok_button_text, cancel_button_text, 63 env, message_text, ok_button_text, cancel_button_text,
76 base::android::ToJavaIntArray(env, permission_icons), 64 base::android::ToJavaIntArray(env, permission_icons),
77 base::android::ToJavaArrayOfStrings(env, permission_strings), 65 base::android::ToJavaArrayOfStrings(env, permission_strings),
78 GetWindowAndroid(), 66 GetWindowAndroid(),
79 base::android::ToJavaIntArray(env, content_settings_types), 67 base::android::ToJavaIntArray(env, content_settings_types));
80 delegate->ShouldShowPersistenceToggle());
81 } 68 }
82 69
83 void GroupedPermissionInfoBar::SetJavaInfoBar( 70 void GroupedPermissionInfoBar::SetJavaInfoBar(
84 const base::android::JavaRef<jobject>& java_info_bar) { 71 const base::android::JavaRef<jobject>& java_info_bar) {
85 InfoBarAndroid::SetJavaInfoBar(java_info_bar); 72 InfoBarAndroid::SetJavaInfoBar(java_info_bar);
86 JNIEnv* env = base::android::AttachCurrentThread(); 73 JNIEnv* env = base::android::AttachCurrentThread();
87 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar, 74 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar,
88 reinterpret_cast<intptr_t>(this)); 75 reinterpret_cast<intptr_t>(this));
89 } 76 }
90 77
91 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() { 78 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() {
92 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate()); 79 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate());
93 } 80 }
94 81
95 std::unique_ptr<infobars::InfoBar> 82 std::unique_ptr<infobars::InfoBar>
96 GroupedPermissionInfoBarDelegate::CreateInfoBar( 83 GroupedPermissionInfoBarDelegate::CreateInfoBar(
97 infobars::InfoBarManager* infobar_manager, 84 infobars::InfoBarManager* infobar_manager,
98 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate) { 85 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate) {
99 return std::unique_ptr<infobars::InfoBar>( 86 return std::unique_ptr<infobars::InfoBar>(
100 new GroupedPermissionInfoBar(std::move(delegate))); 87 new GroupedPermissionInfoBar(std::move(delegate)));
101 } 88 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/infobars/grouped_permission_infobar.h ('k') | content/test/data/android/media_permissions.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698