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 9ddf9045b472c209aa55f9893ebcab814c597afc..7679128e4db466c3e46784b57c43f31b6c42f065 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 |
@@ -25,8 +25,8 @@ |
GroupedPermissionInfoBar(String message, String buttonOk, String buttonCancel, |
int[] permissionIcons, String[] permissionText, WindowAndroid windowAndroid, |
- int[] contentSettings, boolean showPersistenceToggle) { |
- super(0, null, message, null, buttonOk, buttonCancel, showPersistenceToggle); |
+ int[] contentSettings) { |
+ super(0, null, message, null, buttonOk, buttonCancel); |
mPermissionIcons = permissionIcons; |
mPermissionText = permissionText; |
mWindowAndroid = windowAndroid; |
@@ -35,6 +35,7 @@ |
@Override |
public void createContent(InfoBarLayout layout) { |
+ super.createContent(layout); |
InfoBarControlLayout control = layout.addControlLayout(); |
if (mPermissionIcons.length == 1) { |
@@ -46,9 +47,6 @@ |
R.color.light_normal_color, mPermissionText[i], i, true); |
} |
} |
- |
- // Call this last to ensure that if a persistence toggle is added, it's added last. |
- super.createContent(layout); |
} |
@Override |
@@ -85,11 +83,6 @@ |
super.onButtonClicked(isPrimaryButton); |
} |
- @CalledByNative |
- protected boolean isPersistSwitchOn() { |
- return super.isPersistSwitchOn(); |
- } |
- |
/** |
* Create an infobar for a given set of permission requests. |
* |
@@ -101,16 +94,13 @@ |
* @param permissionText String to display for each permission request. |
* @param windowAndroid The window which owns the infobar. |
* @param contentSettings The list of ContentSettingsTypes requested by the infobar. |
- * @param showPersistenceToggle Whether or not a toggle to opt-out of persisting a decision |
- * should be displayed. |
*/ |
@CalledByNative |
private static InfoBar create(String message, String buttonOk, String buttonCancel, |
int[] permissionIcons, String[] permissionText, WindowAndroid windowAndroid, |
- int[] contentSettings, boolean showPersistenceToggle) { |
- GroupedPermissionInfoBar infobar = |
- new GroupedPermissionInfoBar(message, buttonOk, buttonCancel, permissionIcons, |
- permissionText, windowAndroid, contentSettings, showPersistenceToggle); |
+ int[] contentSettings) { |
+ GroupedPermissionInfoBar infobar = new GroupedPermissionInfoBar(message, buttonOk, |
+ buttonCancel, permissionIcons, permissionText, windowAndroid, contentSettings); |
return infobar; |
} |