Index: chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarPopupWindow.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarPopupWindow.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarPopupWindow.java |
index 29ccd8abc2f5fcb3252265124a15c694bb7e2c96..75163e604cf3a25cef0925717ef8f700814b0776 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarPopupWindow.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarPopupWindow.java |
@@ -4,11 +4,13 @@ |
package org.chromium.chrome.browser.snackbar; |
+import android.graphics.Bitmap; |
import android.graphics.drawable.GradientDrawable; |
import android.view.LayoutInflater; |
import android.view.View; |
import android.view.View.OnClickListener; |
import android.view.ViewGroup; |
+import android.widget.ImageView; |
import android.widget.PopupWindow; |
import android.widget.TextView; |
@@ -23,6 +25,7 @@ import org.chromium.ui.base.DeviceFormFactor; |
class SnackbarPopupWindow extends PopupWindow { |
private final TemplatePreservingTextView mMessageView; |
private final TextView mActionButtonView; |
+ private final ImageView mProfileImageView; |
private final int mAnimationDuration; |
/** |
@@ -40,6 +43,7 @@ class SnackbarPopupWindow extends PopupWindow { |
mAnimationDuration = view.getResources().getInteger( |
android.R.integer.config_mediumAnimTime); |
mActionButtonView.setOnClickListener(listener); |
+ mProfileImageView = (ImageView) view.findViewById(R.id.snackbar_profile_image); |
// Set width and height of popup window |
boolean isTablet = DeviceFormFactor.isTablet(parent.getContext()); |
@@ -94,6 +98,12 @@ class SnackbarPopupWindow extends PopupWindow { |
} else { |
mActionButtonView.setVisibility(View.GONE); |
} |
+ Bitmap profileImage = snackbar.getProfileImage(); |
+ if (profileImage != null) { |
+ mProfileImageView.setImageBitmap(profileImage); |
+ } else { |
+ ((ViewGroup) view).removeView(mProfileImageView); |
+ } |
} |
private void setViewText(TextView view, CharSequence text, boolean animate) { |