Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit a7b308c

Browse files
committed
Bug 1456686: Part 1 - Fix unused and shadowed explicit imports. r=standard8
These issues were previously ignored due to the nature of our global import rules. They need to be fixed before that rule can be updated. MozReview-Commit-ID: DCChktTc5TW --HG-- extra : rebase_source : cffb1c9762191c579d1397c8169e6e7635d229da extra : histedit_source : dea59ddd2daaae52069c5faceae9149a4f08dd73
1 parent 04176fe commit a7b308c

114 files changed

Lines changed: 59 additions & 348 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

accessible/jsat/Constants.jsm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
22

3-
var EXPORTED_SYMBOLS = ["Roles", "Events", "Relations",
4-
"Filters", "States", "Prefilters", "AndroidEvents"];
5-
63
const AndroidEvents = {
74
ANDROID_VIEW_CLICKED: 0x01,
85
ANDROID_VIEW_LONG_CLICKED: 0x02,
@@ -70,3 +67,6 @@ XPCOMUtils.defineLazyGetter(
7067
(val) => { return { base: 0, extended: val }; });
7168
return statesMap;
7269
});
70+
71+
var EXPORTED_SYMBOLS = ["Roles", "Events", "Relations",
72+
"Filters", "States", "Prefilters", "AndroidEvents"];

accessible/jsat/ContentControl.jsm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
6-
ChromeUtils.defineModuleGetter(this, "Services",
7-
"resource://gre/modules/Services.jsm");
86
ChromeUtils.defineModuleGetter(this, "Utils",
97
"resource://gre/modules/accessibility/Utils.jsm");
108
ChromeUtils.defineModuleGetter(this, "Logger",

accessible/jsat/Presentation.jsm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ ChromeUtils.defineModuleGetter(this, "PivotContext", // jshint ignore:line
1313
"resource://gre/modules/accessibility/Utils.jsm");
1414
ChromeUtils.defineModuleGetter(this, "UtteranceGenerator", // jshint ignore:line
1515
"resource://gre/modules/accessibility/OutputGenerator.jsm");
16-
ChromeUtils.defineModuleGetter(this, "Roles", // jshint ignore:line
17-
"resource://gre/modules/accessibility/Constants.jsm");
1816
ChromeUtils.defineModuleGetter(this, "States", // jshint ignore:line
1917
"resource://gre/modules/accessibility/Constants.jsm");
2018
ChromeUtils.defineModuleGetter(this, "AndroidEvents", // jshint ignore:line

browser/base/content/test/general/browser_bug521216.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function record(aName) {
1919
is(actual.toString(), expected.toString(),
2020
"got events and progress notifications in expected order");
2121

22+
// eslint-disable-next-line no-shadow
2223
executeSoon(function(tab) {
2324
gBrowser.removeTab(tab);
2425
gBrowser.removeTabsProgressListener(progressListener);

browser/base/content/test/sanitize/browser_sanitize-offlineData.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ function waitForUnregister(host) {
3939
if (registration.principal.URI.host != host) {
4040
return;
4141
}
42-
let swm = Cc["@mozilla.org/serviceworkers/manager;1"]
43-
.getService(Ci.nsIServiceWorkerManager);
4442
swm.removeListener(listener);
4543
resolve(registration);
4644
}

browser/base/content/test/webextensions/head.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const BASE = getRootDirectory(gTestPath)
44

55
ChromeUtils.import("resource:///modules/ExtensionsUI.jsm");
66
XPCOMUtils.defineLazyGetter(this, "Management", () => {
7+
// eslint-disable-next-line no-shadow
78
const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
89
return Management;
910
});

browser/components/customizableui/CustomizableWidgets.jsm

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
1414
XPCOMUtils.defineLazyModuleGetters(this, {
1515
BrowserUITelemetry: "resource:///modules/BrowserUITelemetry.jsm",
1616
PanelView: "resource:///modules/PanelMultiView.jsm",
17-
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
18-
PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
1917
RecentlyClosedTabsAndWindowsMenuUtils: "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm",
2018
ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
2119
CharsetMenu: "resource://gre/modules/CharsetMenu.jsm",
@@ -28,10 +26,6 @@ XPCOMUtils.defineLazyGetter(this, "CharsetBundle", function() {
2826
const kCharsetBundle = "chrome://global/locale/charsetMenu.properties";
2927
return Services.strings.createBundle(kCharsetBundle);
3028
});
31-
XPCOMUtils.defineLazyGetter(this, "BrandBundle", function() {
32-
const kBrandBundle = "chrome://branding/locale/brand.properties";
33-
return Services.strings.createBundle(kBrandBundle);
34-
});
3529

3630
const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
3731
const kPrefCustomizationDebug = "browser.uiCustomization.debug";

browser/components/customizableui/PanelMultiView.jsm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ var EXPORTED_SYMBOLS = [
106106

107107
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
108108
ChromeUtils.import("resource://gre/modules/Services.jsm");
109-
ChromeUtils.defineModuleGetter(this, "AppConstants",
110-
"resource://gre/modules/AppConstants.jsm");
111109
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
112110
"resource:///modules/CustomizableUI.jsm");
113111

browser/components/downloads/DownloadsCommon.jsm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
4444
Downloads: "resource://gre/modules/Downloads.jsm",
4545
DownloadUIHelper: "resource://gre/modules/DownloadUIHelper.jsm",
4646
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
47-
FileUtils: "resource://gre/modules/FileUtils.jsm",
48-
OS: "resource://gre/modules/osfile.jsm",
4947
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
5048
});
5149

browser/components/extensions/parent/ext-browsingData.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ ChromeUtils.defineModuleGetter(this, "setTimeout",
1616
ChromeUtils.defineModuleGetter(this, "ServiceWorkerCleanUp",
1717
"resource://gre/modules/ServiceWorkerCleanUp.jsm");
1818

19-
XPCOMUtils.defineLazyServiceGetter(this, "serviceWorkerManager",
20-
"@mozilla.org/serviceworkers/manager;1",
21-
"nsIServiceWorkerManager");
2219
XPCOMUtils.defineLazyServiceGetter(this, "quotaManagerService",
2320
"@mozilla.org/dom/quota-manager-service;1",
2421
"nsIQuotaManagerService");

0 commit comments

Comments
 (0)