Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java |
index 7679128e4db466c3e46784b57c43f31b6c42f065..8ccf47b891d4b62635340dd4d47950cd8523ba3a 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java |
@@ -9,6 +9,7 @@ import android.support.v7.widget.SwitchCompat; |
import org.chromium.base.annotations.CalledByNative; |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.ResourceId; |
+import org.chromium.chrome.browser.tab.Tab; |
import org.chromium.ui.base.WindowAndroid; |
import java.util.ArrayList; |
@@ -20,9 +21,10 @@ public class GroupedPermissionInfoBar extends PermissionInfoBar { |
private final int[] mPermissionIcons; |
private final String[] mPermissionText; |
private final int[] mContentSettings; |
- private final WindowAndroid mWindowAndroid; |
private long mNativeGroupedPermissionInfoBar; |
+ private WindowAndroid mWindowAndroid; |
+ |
GroupedPermissionInfoBar(String message, String buttonOk, String buttonCancel, |
int[] permissionIcons, String[] permissionText, WindowAndroid windowAndroid, |
int[] contentSettings) { |
@@ -50,6 +52,11 @@ public class GroupedPermissionInfoBar extends PermissionInfoBar { |
} |
@Override |
+ public void onTabReparented(Tab tab) { |
+ mWindowAndroid = tab.getWindowAndroid(); |
+ } |
+ |
+ @Override |
public void onButtonClicked(final boolean isPrimaryButton) { |
if (isPrimaryButton) { |
boolean[] toggleStatus = new boolean[mPermissionIcons.length]; |