Add support for pulling icons for OfflineItems

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfo.java

 // Copyright 2013 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.download;
 
+import android.graphics.Bitmap;
+
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.components.offline_items_collection.ContentId;
 import org.chromium.components.offline_items_collection.LegacyHelpers;
 import org.chromium.components.offline_items_collection.OfflineItem;
 import org.chromium.components.offline_items_collection.OfflineItemState;
+import org.chromium.components.offline_items_collection.OfflineItemVisuals;
 import org.chromium.content_public.browser.DownloadState;
 
 /**
  * Class representing the state of a single download.
  */
 public final class DownloadInfo {
     private final String mUrl;
     private final String mUserAgent;
     private final String mMimeType;
     private final String mCookie;
@@ skipping 13 matching lines @@
     private final boolean mIsPaused;
     private final boolean mIsOffTheRecord;
     private final boolean mIsOfflinePage;
     private final int mState;
     private final long mLastAccessTime;
 
     // New variables to assist with the migration to OfflineItems.
     private final ContentId mContentId;
     private final boolean mIsOpenable;
     private final boolean mIsTransient;
+    private final Bitmap mIcon;
 
     private DownloadInfo(Builder builder) {
         mUrl = builder.mUrl;
         mUserAgent = builder.mUserAgent;
         mMimeType = builder.mMimeType;
         mCookie = builder.mCookie;
         mFileName = builder.mFileName;
         mDescription = builder.mDescription;
         mFilePath = builder.mFilePath;
         mReferrer = builder.mReferrer;
@@ skipping 12 matching lines @@
         mState = builder.mState;
         mLastAccessTime = builder.mLastAccessTime;
 
         if (builder.mContentId != null) {
             mContentId = builder.mContentId;
         } else {
             mContentId = LegacyHelpers.buildLegacyContentId(mIsOfflinePage, mDownloadGuid);
         }
         mIsOpenable = builder.mIsOpenable;
         mIsTransient = builder.mIsTransient;
+        mIcon = builder.mIcon;
     }
 
     public String getUrl() {
         return mUrl;
     }
 
     public String getUserAgent() {
         return mUserAgent;
     }
 
@@ skipping 88 matching lines @@
     }
 
     public boolean getIsOpenable() {
         return mIsOpenable;
     }
 
     public boolean getIsTransient() {
         return mIsTransient;
     }
 
+    public Bitmap getIcon() {
+        return mIcon;
+    }
+
     /**
      * Helper method to build a {@link DownloadInfo} from an {@link OfflineItem}.
      * @param item The {@link OfflineItem} to mimic.
      * @return     A {@link DownloadInfo} containing the relevant fields from {@code item}.
      */
-    public static DownloadInfo fromOfflineItem(OfflineItem item) {
+    public static DownloadInfo fromOfflineItem(OfflineItem item, OfflineItemVisuals visuals) {
         int state;
         switch (item.state) {
             case OfflineItemState.COMPLETE:
                 state = DownloadState.COMPLETE;
                 break;
             case OfflineItemState.CANCELLED:
                 state = DownloadState.CANCELLED;
                 break;
             case OfflineItemState.INTERRUPTED:
                 state = DownloadState.INTERRUPTED;
@@ skipping 17 matching lines @@
                 .setLastAccessTime(item.lastAccessedTimeMs)
                 .setIsOpenable(item.isOpenable)
                 .setOriginalUrl(item.originalUrl)
                 .setIsOffTheRecord(item.isOffTheRecord)
                 .setState(state)
                 .setIsPaused(item.state == OfflineItemState.PAUSED)
                 .setIsResumable(item.isResumable)
                 .setBytesReceived(item.receivedBytes)
                 .setPercentCompleted(item.percentCompleted)
                 .setTimeRemainingInMillis(item.timeRemainingMs)
+                .setIcon(visuals != null ? visuals.icon : null)

[nyquist, 2017/04/13 05:08:24]

Do you find this way just as easy to read as:
.setIcon(visuals == null ? null : visuals.icon)
?
If so, please keep it :-)

[David Trainor- moved to gerrit, 2017/04/13 07:20:23]

Happy to change :).

                 .build();
     }
 
     /**
      * Helper class for building the DownloadInfo object.
      */
     public static class Builder {
         private String mUrl;
         private String mUserAgent;
         private String mMimeType;
@@ skipping 12 matching lines @@
         private long mTimeRemainingInMillis;
         private boolean mIsResumable = true;
         private boolean mIsPaused;
         private boolean mIsOffTheRecord;
         private boolean mIsOfflinePage;
         private int mState = DownloadState.IN_PROGRESS;
         private long mLastAccessTime;
         private ContentId mContentId;
         private boolean mIsOpenable = true;
         private boolean mIsTransient;
+        private Bitmap mIcon;
 
         public Builder setUrl(String url) {
             mUrl = url;
             return this;
         }
 
         public Builder setUserAgent(String userAgent) {
             mUserAgent = userAgent;
             return this;
         }
@@ skipping 107 matching lines @@
         public Builder setIsOpenable(boolean isOpenable) {
             mIsOpenable = isOpenable;
             return this;
         }
 
         public Builder setIsTransient(boolean isTransient) {
             mIsTransient = isTransient;
             return this;
         }
 
+        public Builder setIcon(Bitmap icon) {
+            mIcon = icon;
+            return this;
+        }
+
         public DownloadInfo build() {
             return new DownloadInfo(this);
         }
 
         /**
          * Create a builder from the DownloadInfo object.
          * @param downloadInfo DownloadInfo object from which builder fields are populated.
          * @return A builder initialized with fields from downloadInfo object.
          */
         public static Builder fromDownloadInfo(final DownloadInfo downloadInfo) {
@@ skipping 12 matching lines @@
                     .setHasUserGesture(downloadInfo.hasUserGesture())
                     .setContentDisposition(downloadInfo.getContentDisposition())
                     .setIsGETRequest(downloadInfo.isGETRequest())
                     .setPercentCompleted(downloadInfo.getPercentCompleted())
                     .setTimeRemainingInMillis(downloadInfo.getTimeRemainingInMillis())
                     .setIsResumable(downloadInfo.isResumable())
                     .setIsPaused(downloadInfo.isPaused())
                     .setIsOffTheRecord(downloadInfo.isOffTheRecord())
                     .setIsOfflinePage(downloadInfo.isOfflinePage())
                     .setState(downloadInfo.state())
-                    .setLastAccessTime(downloadInfo.getLastAccessTime());
+                    .setLastAccessTime(downloadInfo.getLastAccessTime())
+                    .setIcon(downloadInfo.getIcon());
             return builder;
         }
     }
 
     @CalledByNative
     private static DownloadInfo createDownloadInfo(String downloadGuid, String fileName,
             String filePath, String url, String mimeType, long bytesReceived, boolean isIncognito,
             int state, int percentCompleted, boolean isPaused, boolean hasUserGesture,
             boolean isResumable, String originalUrl, String referrerUrl, long timeRemainingInMs,
             long lastAccessTime) {
@@ skipping 13 matching lines @@
                 .setOriginalUrl(originalUrl)
                 .setPercentCompleted(percentCompleted)
                 .setReferrer(referrerUrl)
                 .setState(state)
                 .setTimeRemainingInMillis(timeRemainingInMs)
                 .setLastAccessTime(lastAccessTime)
                 .setUrl(url)
                 .build();
     }
 }