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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.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/InfoBarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
index 8443ae4e045f946dd82c45d9bcf1665511ae78b8..3dda3a85710c18eadac7ff6c75a289836eac3e18 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
@@ -107,26 +107,18 @@ public class InfoBarLayout extends ViewGroup implements View.OnClickListener {
* Constructs the layout for the specified InfoBar.
* @param context The context used to render.
* @param infoBarView InfoBarView that listens to events.
- * @param backgroundType Type of InfoBar background being shown.
* @param iconResourceId ID of the icon to use for the InfoBar.
*/
- public InfoBarLayout(Context context, InfoBarView infoBarView, int backgroundType,
- int iconResourceId) {
+ public InfoBarLayout(Context context, InfoBarView infoBarView, int iconResourceId) {
super(context);
mIndicesOfRows = new ArrayList<Integer>();
mLayoutRTL = LocalizationUtils.isLayoutRtl();
mInfoBarView = infoBarView;
// Determine what backgrounds we'll be needing for the buttons.
- if (backgroundType == InfoBar.BACKGROUND_TYPE_INFO) {
- mBackgroundFloating = R.drawable.infobar_button_normal_floating;
- mBackgroundFullLeft = R.drawable.infobar_button_normal_full_left;
- mBackgroundFullRight = R.drawable.infobar_button_normal_full_right;
- } else {
- mBackgroundFloating = R.drawable.infobar_button_warning_floating;
- mBackgroundFullLeft = R.drawable.infobar_button_warning_full_left;
- mBackgroundFullRight = R.drawable.infobar_button_warning_full_right;
- }
+ mBackgroundFloating = R.drawable.infobar_button_normal_floating;
+ mBackgroundFullLeft = R.drawable.infobar_button_normal_full_left;
+ mBackgroundFullRight = R.drawable.infobar_button_normal_full_right;
// Grab the dimensions.
mDimensionMinSize =
@@ -144,7 +136,7 @@ public class InfoBarLayout extends ViewGroup implements View.OnClickListener {
// Set up the close button.
mCloseButton.setId(R.id.infobar_close_button);
- mCloseButton.setImageResource(R.drawable.dismiss);
+ mCloseButton.setImageResource(R.drawable.infobar_close_button);
mCloseButton.setBackgroundResource(R.drawable.infobar_close_bg);
mCloseButton.setOnClickListener(this);

Powered by Google App Engine
This is Rietveld 408576698