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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java

Issue 1596713003: Discourage creation of Java infobars without InfoBarDelegates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java
index 02ec4b2b06a47f5a528693e7a0f366d634146448..6947d3d16ec538b59e2f11004dfabc222e8f6a8c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java
@@ -38,9 +38,6 @@ public class ConfirmInfoBar extends InfoBar {
/** Text shown on the link, e.g. "Learn more". */
private final String mLinkText;
- /** Notified when one of the buttons is clicked. */
- private final InfoBarListeners.Confirm mConfirmListener;
-
private WindowAndroid mWindowAndroid;
/**
@@ -50,14 +47,12 @@ public class ConfirmInfoBar extends InfoBar {
*/
private SparseArray<String> mContentSettingsToPermissionsMap;
- public ConfirmInfoBar(InfoBarListeners.Confirm confirmListener, int iconDrawableId,
- Bitmap iconBitmap, String message, String linkText, String primaryButtonText,
- String secondaryButtonText) {
- super(confirmListener, iconDrawableId, iconBitmap, message);
+ protected ConfirmInfoBar(int iconDrawableId, Bitmap iconBitmap, String message,
+ String linkText, String primaryButtonText, String secondaryButtonText) {
+ super(iconDrawableId, iconBitmap, message);
mPrimaryButtonText = primaryButtonText;
mSecondaryButtonText = secondaryButtonText;
mLinkText = linkText;
- mConfirmListener = confirmListener;
}
/**
@@ -215,10 +210,6 @@ public class ConfirmInfoBar extends InfoBar {
}
private void onButtonClickedInternal(boolean isPrimaryButton) {
- if (mConfirmListener != null) {
- mConfirmListener.onConfirmInfoBarButtonClicked(this, isPrimaryButton);
- }
-
int action = isPrimaryButton ? ActionType.OK : ActionType.CANCEL;
onButtonClicked(action);
}
@@ -244,7 +235,7 @@ public class ConfirmInfoBar extends InfoBar {
int drawableId = ResourceId.mapToDrawableId(enumeratedIconId);
ConfirmInfoBar infoBar = new ConfirmInfoBar(
- null, drawableId, iconBitmap, message, linkText, buttonOk, buttonCancel);
+ drawableId, iconBitmap, message, linkText, buttonOk, buttonCancel);
infoBar.setContentSettings(windowAndroid, contentSettings);
return infoBar;

Powered by Google App Engine
This is Rietveld 408576698