[Smart Lock, UI] Add ability to have an icon to the SnanackBar.

chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarPopupWindow.java

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..87a785f85f49c25b855411d6704338d2be6d49f1 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 mIconView;
     private final int mAnimationDuration;
 
     /**
@@ -40,6 +43,7 @@ class SnackbarPopupWindow extends PopupWindow {
         mAnimationDuration = view.getResources().getInteger(
                 android.R.integer.config_mediumAnimTime);
         mActionButtonView.setOnClickListener(listener);
+        mIconView = (ImageView) view.findViewById(R.id.snackbar_icon);
 
         // Set width and height of popup window
         boolean isTablet = DeviceFormFactor.isTablet(parent.getContext());
@@ -94,6 +98,13 @@ class SnackbarPopupWindow extends PopupWindow {
         } else {
             mActionButtonView.setVisibility(View.GONE);
         }
+        Bitmap icon = snackbar.getIcon();
+        if (icon != null) {
+            mIconView.setVisibility(View.VISIBLE);
+            mIconView.setImageBitmap(icon);
+        } else {
+            mIconView.setVisibility(View.GONE);

[gone, 2015/11/10 00:35:04]

Can you change this to make mIconView visible by default, then remove mIconView
instead of setting it to GONE?  If it's removed from the view hierarchy then you
don't have to deal with it, memory or layout-wise.

+        }
     }
 
     private void setViewText(TextView view, CharSequence text, boolean animate) {