Revert "Revert of Implement GetDisplayed on android M+ (patchset #3 id:60001 of https://codereview.…

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;
@@ skipping 148 matching lines @@
         for (Action action : mActions) {
             addActionToBuilder(builder, action);
         }
         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));
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            builder.setExtras(mExtras);
+        }
 
         Notification notification = builder.build();
         notification.bigContentView = bigView;
         return notification;
     }
 
     /**
      * If there are actions, shows the button related views, and adds a button for each action.
      */
     private void addActionButtons(RemoteViews bigView) {
@@ skipping 136 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;
     }
 }