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

Unified 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 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 5c8afd1db2543e749a7ea43b567fdfc596df7492..ffd4fc60f23935e1624accb23f51158a7e8176d7 100644
--- a/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
+++ b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
@@ -8,6 +8,7 @@
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
#include "chrome/browser/android/resource_mapper.h"
+#include "chrome/browser/android/tab_android.h"
#include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
#include "jni/GroupedPermissionInfoBar_jni.h"
@@ -71,12 +72,12 @@ GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
}
return Java_GroupedPermissionInfoBar_create(
- env, message_text, ok_button_text, cancel_button_text,
- base::android::ToJavaIntArray(env, permission_icons),
+ env, GetTab()->GetJavaObject(),
+ base::android::ToJavaIntArray(env, content_settings_types), message_text,
+ ok_button_text, cancel_button_text,
+ delegate->ShouldShowPersistenceToggle(),
base::android::ToJavaArrayOfStrings(env, permission_strings),
- GetWindowAndroid(),
- base::android::ToJavaIntArray(env, content_settings_types),
- delegate->ShouldShowPersistenceToggle());
+ base::android::ToJavaIntArray(env, permission_icons));
}
void GroupedPermissionInfoBar::SetJavaInfoBar(
« 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