diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml index 9238c5a0032f..9c288e1e7273 100644 --- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -2077,7 +2077,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. delta /= 1000; - // This code is taken from nsDownloadManager.cpp + // This algorithm is the same used by the downloads code. let speed = (aProgress - this.notification.lastProgress) / delta; if (this.notification.speed) speed = speed * 0.9 + this.notification.speed * 0.1; diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index 1f648f8cf100..0556914f3e24 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -634,17 +634,11 @@ XPCOMUtils.defineLazyGetter(DownloadsCommon, "isWinVistaOrHigher", function() { /** * Retrieves the list of past and completed downloads from the underlying - * Download Manager data, and provides asynchronous notifications allowing to + * Downloads API data, and provides asynchronous notifications allowing to * build a consistent view of the available data. * - * This object responds to real-time changes in the underlying Download Manager - * data. For example, the deletion of one or more downloads is notified through - * the nsIObserver interface, while any state or progress change is notified - * through the nsIDownloadProgressListener interface. - * - * Note that using this object does not automatically start the Download Manager - * service. Consumers will see an empty list of downloads until the service is - * actually started. This is useful to display a neutral progress indicator in + * Note that using this object does not automatically initialize the list of + * downloads. This is useful to display a neutral progress indicator in * the main browser window until the autostart timeout elapses. * * Note that DownloadsData and PrivateDownloadsData are two equivalent singleton diff --git a/browser/components/preferences/in-content-old/main.js b/browser/components/preferences/in-content-old/main.js index 86aac95ae03b..b0948e49b303 100644 --- a/browser/components/preferences/in-content-old/main.js +++ b/browser/components/preferences/in-content-old/main.js @@ -507,15 +507,6 @@ var gMainPane = { iconUrlSpec = fph.getURLSpecFromFile(currentDirPref.value); } else if (folderListPref.value == 1) { // 'Downloads' - // In 1.5, this pointed to a folder we created called 'My Downloads' - // and was available as an option in the 1.5 drop down. On XP this - // was in My Documents, on OSX it was in User Docs. In 2.0, we did - // away with the drop down option, although the special label was - // still supported for the folder if it existed. Because it was - // not exposed it was rarely used. - // With 3.0, a new desktop folder - 'Downloads' was introduced for - // platforms and versions that don't support a default system downloads - // folder. See nsDownloadManager for details. downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); iconUrlSpec = fph.getURLSpecFromFile(await this._indexToFolder(1)); } else { diff --git a/browser/components/preferences/in-content/applications.js b/browser/components/preferences/in-content/applications.js index e09109f3a70c..33b10e1012a0 100644 --- a/browser/components/preferences/in-content/applications.js +++ b/browser/components/preferences/in-content/applications.js @@ -2019,15 +2019,6 @@ var gApplicationsPane = { iconUrlSpec = fph.getURLSpecFromFile(currentDirPref.value); } else if (folderListPref.value == 1) { // 'Downloads' - // In 1.5, this pointed to a folder we created called 'My Downloads' - // and was available as an option in the 1.5 drop down. On XP this - // was in My Documents, on OSX it was in User Docs. In 2.0, we did - // away with the drop down option, although the special label was - // still supported for the folder if it existed. Because it was - // not exposed it was rarely used. - // With 3.0, a new desktop folder - 'Downloads' was introduced for - // platforms and versions that don't support a default system downloads - // folder. See nsDownloadManager for details. downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); iconUrlSpec = fph.getURLSpecFromFile(await this._indexToFolder(1)); } else { diff --git a/toolkit/components/places/SQLFunctions.cpp b/toolkit/components/places/SQLFunctions.cpp index da12939c7447..f69cf06ebfc8 100644 --- a/toolkit/components/places/SQLFunctions.cpp +++ b/toolkit/components/places/SQLFunctions.cpp @@ -25,8 +25,6 @@ using namespace mozilla::storage; -// Keep the GUID-related parts of this file in sync with toolkit/downloads/SQLFunctions.cpp! - //////////////////////////////////////////////////////////////////////////////// //// Anonymous Helpers diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 992656edcca6..d4e15ae72ff7 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -273,7 +273,7 @@ static bool GetFilenameAndExtensionFromChannel(nsIChannel* aChannel, * Obtains the directory to use. This tends to vary per platform, and * needs to be consistent throughout our codepaths. For platforms where * helper apps use the downloads directory, this should be kept in - * sync with nsDownloadManager.cpp + * sync with DownloadIntegration.jsm. * * Optionally skip availability of the directory and storage. */ @@ -2427,7 +2427,7 @@ NS_IMETHODIMP nsExternalAppHandler::LaunchWithApplication(nsIFile * aApplication // was specified in mSuggestedFileName after the download is done prior to // launching the helper app. So that any existing file of that name won't be // overwritten we call CreateUnique(). Also note that we use the same - // directory as originally downloaded so nsDownload can rename in place + // directory as originally downloaded so the download can be renamed in place // later. nsCOMPtr fileToUse; (void) GetDownloadDirectory(getter_AddRefs(fileToUse));