Add selection and poster support to MediaNotificationManager

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
index 90d84a2ff446879ed14ee893c6d36a637013e66c..b9fc49c583b796eab93e8cd723cdbc5d8aa5f254 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
@@ -31,7 +31,6 @@ import android.widget.RemoteViews;
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.tab.Tab;
 
 import javax.annotation.Nullable;
 
@@ -201,7 +200,20 @@ public class MediaNotificationManager {
         }
     }
 
-    // Two classes to specify the right notification id in the intent.
+    /**
+     * This class is used internally but have to be public to be able to launch the service.
+     */
+    public static final class CastListenerService extends ListenerService {
+        private static final int NOTIFICATION_ID = R.id.remote_notification;
+
+        @Override
+        @Nullable
+        protected MediaNotificationManager getManager() {
+            return MediaNotificationManager.getManager(NOTIFICATION_ID);
+        }
+    }
+
+    // Three classes to specify the right notification id in the intent.
 
     /**
      * This class is used internally but have to be public to be able to launch the service.
@@ -223,12 +235,24 @@ public class MediaNotificationManager {
         }
     }
 
+    /**
+     * This class is used internally but have to be public to be able to launch the service.
+     */
+    public static final class CastMediaButtonReceiver extends MediaButtonReceiver {
+        @Override
+        public String getServiceClassName() {
+            return CastListenerService.class.getName();
+        }
+    }
+
     private Intent createIntent(Context context) {
         Intent intent = null;
         if (mMediaNotificationInfo.id == PlaybackListenerService.NOTIFICATION_ID) {
             intent = new Intent(context, PlaybackListenerService.class);
         } else if (mMediaNotificationInfo.id == PresentationListenerService.NOTIFICATION_ID) {
             intent = new Intent(context, PresentationListenerService.class);
+        }  else if (mMediaNotificationInfo.id == CastListenerService.NOTIFICATION_ID) {
+            intent = new Intent(context, CastListenerService.class);
         }
         return intent;
     }
@@ -248,6 +272,10 @@ public class MediaNotificationManager {
             return PresentationMediaButtonReceiver.class.getName();
         }
 
+        if (mMediaNotificationInfo.id == CastListenerService.NOTIFICATION_ID) {
+            return CastMediaButtonReceiver.class.getName();
+        }
+
         assert false;
         return null;
     }
@@ -348,7 +376,7 @@ public class MediaNotificationManager {
 
     private Bitmap mNotificationIcon;
 
-    private final Bitmap mMediaSessionIcon;
+    private final Bitmap mDefaultMediaSessionImage;
 
     // |mMediaNotificationInfo| should be not null if and only if the notification is showing.
     private MediaNotificationInfo mMediaNotificationInfo;
@@ -383,8 +411,8 @@ public class MediaNotificationManager {
 
         // The MediaSession icon is a plain color.
         int size = context.getResources().getDimensionPixelSize(R.dimen.media_session_icon_size);
-        mMediaSessionIcon = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
-        mMediaSessionIcon.eraseColor(ApiCompatibilityUtils.getColor(
+        mDefaultMediaSessionImage = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        mDefaultMediaSessionImage.eraseColor(ApiCompatibilityUtils.getColor(
                 context.getResources(), R.color.media_session_icon_color));
     }
 
@@ -506,19 +534,29 @@ public class MediaNotificationManager {
     private MediaMetadataCompat createMetadata() {
         MediaMetadataCompat.Builder metadataBuilder = new MediaMetadataCompat.Builder();
 
+        // Choose the image to use as the icon.
+        Bitmap mediaSessionImage = mMediaNotificationInfo.image == null ? mDefaultMediaSessionImage
+                : mMediaNotificationInfo.image;
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE,
                     mMediaNotificationInfo.title);
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE,
                     mMediaNotificationInfo.origin);
             metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON,
-                    mMediaSessionIcon);
+                    mediaSessionImage);
+            // METADATA_KEY_ART is optional and should only be used if we can provide something
+            // better than the default image.
+            if (mMediaNotificationInfo.image != null) {
+                metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART,
+                        mMediaNotificationInfo.image);
+            }

[mlamouri (slow - plz ping), 2016/02/04 08:01:11]

FWIW, when the regular media notification will start using this, it will likely
be bound to some size restrictions. Not sure from where the poster is coming but
I assume it's big enough.

[aberent, 2016/02/04 09:58:47]

It comes from the video element's poster attribute, so we actually have very
little control of its size. We do give it a maximum size of 1M pixels to reduce
the danger of OOM errors when we read it and copy it from a C++ bitmap to a Java
bitmap, see https://code.google.com/p/chromium/issues/detail?id=529871.

         } else {
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_TITLE,
                     mMediaNotificationInfo.title);
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST,
                     mMediaNotificationInfo.origin);
-            metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, mMediaSessionIcon);
+            metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, mediaSessionImage);
         }
 
         return metadataBuilder.build();
@@ -549,12 +587,8 @@ public class MediaNotificationManager {
             mNotificationBuilder.setOngoing(!mMediaNotificationInfo.isPaused);
         }
 
-        int tabId = mMediaNotificationInfo.tabId;
-        Intent tabIntent = Tab.createBringTabToFrontIntent(tabId);
-        if (tabIntent != null) {
-            mNotificationBuilder
-                    .setContentIntent(PendingIntent.getActivity(mContext, tabId, tabIntent, 0));
-        }
+        mNotificationBuilder.setContentIntent(
+                PendingIntent.getActivity(mContext, 0, mMediaNotificationInfo.contentIntent, 0));
 
         mNotificationBuilder.setContent(createContentView());
         mNotificationBuilder.setVisibility(