Index: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java |
index c368bbc5dbcaacd6ff49664ef36820c6ba129d93..acba9d90f9569ea9bc5e5c10e59c514bb663d3de 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java |
@@ -17,6 +17,8 @@ import org.chromium.chrome.browser.download.DownloadNotificationService; |
import org.chromium.chrome.browser.download.DownloadUtils; |
import org.chromium.chrome.browser.offlinepages.downloads.OfflinePageDownloadItem; |
import org.chromium.chrome.browser.widget.DateDividedAdapter.TimedItem; |
+import org.chromium.components.offline_items_collection.OfflineItem.Progress; |
+import org.chromium.components.offline_items_collection.OfflineItemProgressUnit; |
import org.chromium.components.url_formatter.UrlFormatter; |
import org.chromium.content_public.browser.DownloadState; |
import org.chromium.ui.widget.Toast; |
@@ -148,8 +150,8 @@ public abstract class DownloadHistoryItemWrapper extends TimedItem { |
/** @return The file extension type. See list at the top of the file. */ |
public abstract int getFileExtensionType(); |
- /** @return How much of the download has completed, or -1 if there is no progress. */ |
- abstract int getDownloadProgress(); |
+ /** @return How much of the download has completed, or null if there is no progress. */ |
+ abstract Progress getDownloadProgress(); |
/** @return Whether the download has an unknown file size. */ |
abstract boolean isIndeterminate(); |
@@ -305,8 +307,8 @@ public abstract class DownloadHistoryItemWrapper extends TimedItem { |
} |
@Override |
- public int getDownloadProgress() { |
- return mItem.getDownloadInfo().getPercentCompleted(); |
+ public Progress getDownloadProgress() { |
+ return mItem.getDownloadInfo().getProgress(); |
} |
@Override |
@@ -406,7 +408,7 @@ public abstract class DownloadHistoryItemWrapper extends TimedItem { |
DownloadInfo oldInfo = mItem.getDownloadInfo(); |
DownloadInfo newInfo = newItem.getDownloadInfo(); |
- if (oldInfo.getPercentCompleted() != newInfo.getPercentCompleted()) return true; |
+ if (oldInfo.getProgress().equals(newInfo.getProgress())) return true; |
if (oldInfo.getBytesReceived() != newInfo.getBytesReceived()) return true; |
if (oldInfo.state() != newInfo.state()) return true; |
if (oldInfo.isPaused() != newInfo.isPaused()) return true; |
@@ -493,9 +495,9 @@ public abstract class DownloadHistoryItemWrapper extends TimedItem { |
} |
@Override |
- public int getDownloadProgress() { |
+ public Progress getDownloadProgress() { |
// Only completed offline page downloads are shown. |
- return 100; |
+ return new Progress(100, 100L, OfflineItemProgressUnit.PERCENTAGE); |
} |
@Override |