| Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java
|
| index e7667418348b71db981690f4357c0498a5cb6eea..f1b70d18b607139fd3c096d3b40c165bc45c44f9 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java
|
| @@ -41,7 +41,6 @@ public class MediaSessionTabHelper implements MediaImageCallback {
|
| private static final String TAG = "MediaSession";
|
|
|
| private static final String UNICODE_PLAY_CHARACTER = "\u25B6";
|
| - private static final int MINIMAL_FAVICON_SIZE = 114;
|
| private static final int HIDE_NOTIFICATION_DELAY_MILLIS = 1000;
|
|
|
| private Tab mTab;
|
| @@ -352,8 +351,9 @@ public class MediaSessionTabHelper implements MediaImageCallback {
|
| private MediaSessionTabHelper(Tab tab) {
|
| mTab = tab;
|
| mTab.addObserver(mTabObserver);
|
| - mMediaImageManager = new MediaImageManager(
|
| - MINIMAL_FAVICON_SIZE, MediaNotificationManager.getIdealMediaImageSize());
|
| + mMediaImageManager =
|
| + new MediaImageManager(MediaNotificationManager.MINIMAL_MEDIA_IMAGE_SIZE_PX,
|
| + MediaNotificationManager.getIdealMediaImageSize());
|
| if (mTab.getWebContents() != null) setWebContents(tab.getWebContents());
|
|
|
| Activity activity = getActivityFromTab(mTab);
|
| @@ -417,9 +417,7 @@ public class MediaSessionTabHelper implements MediaImageCallback {
|
| private boolean updateFavicon(Bitmap icon) {
|
| if (icon == null) return false;
|
|
|
| - if (icon.getWidth() < MINIMAL_FAVICON_SIZE || icon.getHeight() < MINIMAL_FAVICON_SIZE) {
|
| - return false;
|
| - }
|
| + if (!MediaNotificationManager.isBitmapSuitableAsMediaImage(icon)) return false;
|
| if (mFavicon != null && (icon.getWidth() < mFavicon.getWidth()
|
| || icon.getHeight() < mFavicon.getHeight())) {
|
| return false;
|
|
|