Notifications in sensitive contexts now display origin + small icon

chrome/android/java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java
index c5dba9603b17b2255cc51453051c99924a5d2683..1b17a27834cf40e0f427f6d05ec0bd32f672ef5c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java
@@ -79,6 +79,7 @@ public class CustomNotificationBuilder extends NotificationBuilderBase {
     private final Context mContext;
 
     public CustomNotificationBuilder(Context context) {
+        super(context.getResources());
         mContext = context;
     }
 
@@ -153,7 +154,7 @@ public class CustomNotificationBuilder extends NotificationBuilderBase {
         builder.setContentTitle(mTitle);
         builder.setContentText(mBody);
         builder.setSubText(mOrigin);
-        builder.setLargeIcon(mLargeIcon);
+        builder.setLargeIcon(getNormalizedLargeIcon());
         setSmallIconOnBuilder(builder, mSmallIconId, mSmallIconBitmap);
         for (Action action : mActions) {
             addActionToBuilder(builder, action);
@@ -161,6 +162,10 @@ public class CustomNotificationBuilder extends NotificationBuilderBase {
         if (mSettingsAction != null) {
             addActionToBuilder(builder, mSettingsAction);
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            // Notification.Builder.setPublicVersion was added in Android L.
+            builder.setPublicVersion(createPublicNotification(mContext));
+        }
 
         Notification notification = builder.build();
         notification.bigContentView = bigView;