Migrate web notifications to ChromeNotificationBuilder

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.notifications;
 
 import android.app.Notification;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.StrictMode;
 import android.os.SystemClock;
 import android.text.format.DateFormat;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.RemoteViews;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.ui.base.LocalizationUtils;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Builds a notification using the given inputs. Uses RemoteViews to provide a custom layout.
  */
 public class CustomNotificationBuilder extends NotificationBuilderBase {
     /**
@@ skipping 93 matching lines @@
             view.setViewVisibility(smallIconId, View.VISIBLE);
             if (mSmallIconBitmap != null) {
                 view.setImageViewBitmap(smallIconId, mSmallIconBitmap);
             } else {
                 view.setImageViewResource(smallIconId, mSmallIconId);
             }
         }
         addActionButtons(bigView);
         configureSettingsButton(bigView);
 
-        // Note: this is not a NotificationCompat builder so be mindful of the
+        // Note: under the hood this is not a NotificationCompat builder so be mindful of the
         // API level of methods you call on the builder.
-        Notification.Builder builder = new Notification.Builder(mContext);
+        // TODO(crbug.com/697104) We should probably use a Compat builder.
+        ChromeNotificationBuilder builder =
+                ((ChromeApplication) mContext.getApplicationContext())
+                        .createChromeNotificationBuilder(false /* preferCompat */,
+                                NotificationConstants.CATEGORY_ID_SITES,
+                                mContext.getString(
+                                        org.chromium.chrome.R.string.notification_category_sites),
+                                NotificationConstants.CATEGORY_GROUP_ID_GENERAL,
+                                mContext.getString(org.chromium.chrome.R.string
+                                                           .notification_category_group_general));
         builder.setTicker(mTickerText);
         builder.setContentIntent(mContentIntent);
         builder.setDeleteIntent(mDeleteIntent);
         builder.setDefaults(mDefaults);
         builder.setVibrate(mVibratePattern);
         builder.setWhen(mTimestamp);
         builder.setOnlyAlertOnce(!mRenotify);
-        ApiCompatibilityUtils.setContentViewForNotificationBuilder(builder, compactView);
+        builder.setContent(compactView);
 
         // Some things are duplicated in the builder to ensure the notification shows correctly on
         // Wear devices and custom lock screens.
         builder.setContentTitle(mTitle);
         builder.setContentText(mBody);
         builder.setSubText(mOrigin);
         builder.setLargeIcon(getNormalizedLargeIcon());
         setSmallIconOnBuilder(builder, mSmallIconId, mSmallIconBitmap);
         for (Action action : mActions) {
             addActionToBuilder(builder, action);
         }
         if (mSettingsAction != null) {
             addActionToBuilder(builder, mSettingsAction);
         }
         setGroupOnBuilder(builder, mOrigin);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            // Notification.Builder.setPublicVersion was added in Android L.
-            builder.setPublicVersion(createPublicNotification(mContext));
-        }
+        builder.setPublicVersion(createPublicNotification(mContext));
 
-        return ApiCompatibilityUtils.notificationWithBigContentView(builder, bigView);
+        return builder.buildWithBigContentView(bigView);
     }
 
     /**
      * If there are actions, shows the button related views, and adds a button for each action.
      */
     private void addActionButtons(RemoteViews bigView) {
         // Remove the existing buttons in case an existing notification is being updated.
         bigView.removeAllViews(R.id.buttons);
 
         // Always set the visibility of the views associated with the action buttons. The current
@@ skipping 132 matching lines @@
     }
 
     /**
      * Whether to use the Material look and feel or fall back to Holo.
      */
     @VisibleForTesting
     static boolean useMaterial() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     }
 }