From b7d9dad58e5a3f87a6c767412941700bc8010044 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sat, 12 May 2018 14:32:03 +0200
Subject: Remove MOZ_B2G leftovers and some dead B2G-only components.

---
 toolkit/components/jsdownloads/src/DownloadIntegration.jsm | 7 +------
 toolkit/components/jsdownloads/src/DownloadUIHelper.jsm    | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'toolkit/components/jsdownloads/src')

diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
index 7439d9d11..4069bca74 100644
--- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
@@ -300,12 +300,7 @@ this.DownloadIntegration = {
         aDownload.hasBlockedData) {
       return true;
     }
-#ifdef MOZ_B2G
-    // On B2G we keep a few days of history.
-    let maxTime = Date.now() -
-      Services.prefs.getIntPref("dom.downloads.max_retention_days") * 24 * 60 * 60 * 1000;
-    return aDownload.startTime > maxTime;
-#elif defined(MOZ_WIDGET_ANDROID)
+#if defined(MOZ_WIDGET_ANDROID)
     // On Android we store all history.
     return true;
 #else
diff --git a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm b/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
index f5102b4a8..5bd351ee9 100644
--- a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
@@ -106,12 +106,7 @@ XPCOMUtils.defineLazyGetter(DownloadUIHelper, "strings", function () {
  */
 this.DownloadPrompter = function (aParent)
 {
-  if (AppConstants.MOZ_B2G) {
-    // On B2G there is no prompter implementation.
-    this._prompter = null;
-  } else {
-    this._prompter = Services.ww.getNewPrompter(aParent);
-  }
+  this._prompter = Services.ww.getNewPrompter(aParent);
 }
 
 this.DownloadPrompter.prototype = {
-- 
cgit v1.2.3