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

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

Issue 2493013002: Replace the use of WindowAndroid with Tab in permissions code. (Closed)
Patch Set: Comments Created 4 years, 1 month 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"
11 #include "chrome/browser/android/tab_android.h"
11 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h" 12 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h"
12 #include "jni/GroupedPermissionInfoBar_jni.h" 13 #include "jni/GroupedPermissionInfoBar_jni.h"
13 14
14 GroupedPermissionInfoBar::GroupedPermissionInfoBar( 15 GroupedPermissionInfoBar::GroupedPermissionInfoBar(
15 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate) 16 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate)
16 : ConfirmInfoBar(std::move(delegate)) {} 17 : ConfirmInfoBar(std::move(delegate)) {}
17 18
18 GroupedPermissionInfoBar::~GroupedPermissionInfoBar() { 19 GroupedPermissionInfoBar::~GroupedPermissionInfoBar() {
19 } 20 }
20 21
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 std::vector<int> content_settings_types; 65 std::vector<int> content_settings_types;
65 66
66 for (size_t i = 0; i < delegate->permission_count(); i++) { 67 for (size_t i = 0; i < delegate->permission_count(); i++) {
67 permission_strings.push_back(delegate->GetMessageTextFragment(i)); 68 permission_strings.push_back(delegate->GetMessageTextFragment(i));
68 permission_icons.push_back( 69 permission_icons.push_back(
69 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i))); 70 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i)));
70 content_settings_types.push_back(delegate->GetContentSettingType(i)); 71 content_settings_types.push_back(delegate->GetContentSettingType(i));
71 } 72 }
72 73
73 return Java_GroupedPermissionInfoBar_create( 74 return Java_GroupedPermissionInfoBar_create(
74 env, message_text, ok_button_text, cancel_button_text, 75 env, GetTab()->GetJavaObject(),
75 base::android::ToJavaIntArray(env, permission_icons), 76 base::android::ToJavaIntArray(env, content_settings_types), message_text,
77 ok_button_text, cancel_button_text,
78 delegate->ShouldShowPersistenceToggle(),
76 base::android::ToJavaArrayOfStrings(env, permission_strings), 79 base::android::ToJavaArrayOfStrings(env, permission_strings),
77 GetWindowAndroid(), 80 base::android::ToJavaIntArray(env, permission_icons));
78 base::android::ToJavaIntArray(env, content_settings_types),
79 delegate->ShouldShowPersistenceToggle());
80 } 81 }
81 82
82 void GroupedPermissionInfoBar::SetJavaInfoBar( 83 void GroupedPermissionInfoBar::SetJavaInfoBar(
83 const base::android::JavaRef<jobject>& java_info_bar) { 84 const base::android::JavaRef<jobject>& java_info_bar) {
84 InfoBarAndroid::SetJavaInfoBar(java_info_bar); 85 InfoBarAndroid::SetJavaInfoBar(java_info_bar);
85 JNIEnv* env = base::android::AttachCurrentThread(); 86 JNIEnv* env = base::android::AttachCurrentThread();
86 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar, 87 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar,
87 reinterpret_cast<intptr_t>(this)); 88 reinterpret_cast<intptr_t>(this));
88 } 89 }
89 90
90 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() { 91 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() {
91 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate()); 92 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate());
92 } 93 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/infobars/confirm_infobar.cc ('k') | chrome/browser/ui/android/infobars/permission_infobar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698