Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java

Issue 2271913002: [Downloads] Remove externally deleted items from downloads history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [Downloads] Remove externally deleted items from downloads history Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
index 3c9edc29be30306eb710207e6a68f626b7f7d64d..d6824c8eaf35b712de1377e4ec8a5b263847a7b5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
@@ -33,6 +33,7 @@ import org.chromium.base.metrics.RecordUserAction;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BasicNativePage;
import org.chromium.chrome.browser.download.DownloadManagerService;
+import org.chromium.chrome.browser.download.DownloadUtils;
import org.chromium.chrome.browser.download.ui.DownloadHistoryItemWrapper.OfflinePageItemWrapper;
import org.chromium.chrome.browser.offlinepages.downloads.OfflinePageDownloadBridge;
import org.chromium.chrome.browser.profiles.Profile;
@@ -40,7 +41,6 @@ import org.chromium.chrome.browser.widget.FadingShadow;
import org.chromium.chrome.browser.widget.FadingShadowView;
import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
import org.chromium.ui.base.DeviceFormFactor;
-import org.chromium.ui.widget.Toast;
import java.util.ArrayList;
import java.util.List;
@@ -296,7 +296,6 @@ public class DownloadManagerUi implements OnMenuItemClickListener, BackendProvid
for (int i = 0; i < selectedItems.size(); i++) {
DownloadHistoryItemWrapper wrappedItem = selectedItems.get(i);
- if (wrappedItem.hasBeenExternallyRemoved()) continue;
if (wrappedItem instanceof OfflinePageItemWrapper) {
if (offlinePagesString.length() != 0) {
@@ -348,14 +347,6 @@ public class DownloadManagerUi implements OnMenuItemClickListener, BackendProvid
}
}
- // If there are no non-deleted items to share, return early.
- if (itemUris.size() == 0 && offlinePagesString.length() == 0) {
- Toast.makeText(mActivity, mActivity.getString(R.string.download_cant_share_deleted),
- Toast.LENGTH_SHORT).show();
- RecordUserAction.record("Android.DownloadManager.Share.Deleted");
- return;
- }
-
// Use Action_SEND if there is only one downloaded item or only text to share.
if (itemUris.size() == 0 || (itemUris.size() == 1 && offlinePagesString.length() == 0)) {
intentAction = Intent.ACTION_SEND;
@@ -427,10 +418,8 @@ public class DownloadManagerUi implements OnMenuItemClickListener, BackendProvid
int remaining = mNumberOfFilesBeingDeleted.decrementAndGet();
if (remaining != 0) return;
- DownloadManagerService service =
- DownloadManagerService.getDownloadManagerService(
- mActivity.getApplicationContext());
- service.checkForExternallyRemovedDownloads(mIsOffTheRecord);
+ DownloadUtils.checkForExternallyRemovedDownloads(
+ mActivity.getApplicationContext(), mIsOffTheRecord);
}
});
}

Powered by Google App Engine
This is Rietveld 408576698