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

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

Issue 346853005: Update infobar assets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't break downstream infobar users Created 6 years, 6 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/InfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java
index 3b6ee18baa648f4c925890fb1073e43e16e792a9..a95bb7995dee3e53c3ec1193819495b9b329153e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java
@@ -40,7 +40,6 @@ public abstract class InfoBar implements InfoBarView {
public static final int BACKGROUND_TYPE_INFO = 0;
public static final int BACKGROUND_TYPE_WARNING = 1;
- private final int mBackgroundType;
private final int mIconDrawableId;
private InfoBarListeners.Dismiss mListener;
@@ -66,13 +65,11 @@ public abstract class InfoBar implements InfoBarView {
/**
* @param listener Listens to when buttons have been clicked on the InfoBar.
- * @param backgroundType Background type to use (INFO or WARNING).
* @param iconDrawableId ID of the resource to use for the Icon. If 0, no icon will be shown.
*/
- public InfoBar(InfoBarListeners.Dismiss listener, int backgroundType, int iconDrawableId) {
+ public InfoBar(InfoBarListeners.Dismiss listener, int iconDrawableId) {
mListener = listener;
mId = generateId();
- mBackgroundType = backgroundType;
mIconDrawableId = iconDrawableId;
mExpireOnNavigation = true;
}
@@ -92,17 +89,19 @@ public abstract class InfoBar implements InfoBarView {
/**
* Change the pointer to the native-side counterpart of this InfoBar. Native-side code is
* responsible for managing the cleanup of the pointer.
- * @param nativeInfoBarPtr Pointer to the NativeInfoBar.
+ * @param newInfoBarPtr Pointer to the NativeInfoBar.
*/
protected void replaceNativePointer(long newInfoBarPtr) {
mNativeInfoBarPtr = newInfoBarPtr;
}
- // Determine if the infobar should be dismissed when |url| is loaded. Calling
- // setExpireOnNavigation(true/false) causes this method always to return true/false.
- // This only applies to java-only infobars. C++ infobars will use the same logic
- // as other platforms so they are not attempted to be dismissed twice.
- // It should really be removed once all infobars have a C++ counterpart.
+ /**
+ * Determine if the infobar should be dismissed when |url| is loaded. Calling
+ * setExpireOnNavigation(true/false) causes this method always to return true/false.
+ * This only applies to java-only infobars. C++ infobars will use the same logic
+ * as other platforms so they are not attempted to be dismissed twice.
+ * It should really be removed once all infobars have a C++ counterpart.
+ */
public final boolean shouldExpire(String url) {
return mExpireOnNavigation && mNativeInfoBarPtr == 0;
}
@@ -147,7 +146,7 @@ public abstract class InfoBar implements InfoBarView {
*/
protected final View createView() {
assert mContext != null;
- return new InfoBarLayout(mContext, this, mBackgroundType, mIconDrawableId);
+ return new InfoBarLayout(mContext, this, mIconDrawableId);
}
/**
@@ -178,8 +177,8 @@ public abstract class InfoBar implements InfoBarView {
protected ContentWrapperView getContentWrapper(boolean createIfNotFound) {
if (mContentView == null && createIfNotFound) {
- mContentView = new ContentWrapperView(getContext(), this, mBackgroundType,
- createView(), getInfoBarContainer().areInfoBarsOnTop());
+ mContentView = new ContentWrapperView(getContext(), this, createView(),
+ getInfoBarContainer().areInfoBarsOnTop());
mContentView.setFocusable(false);
}
return mContentView;

Powered by Google App Engine
This is Rietveld 408576698