nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1388215 - Fix broken browser.js after merge. r=bustage-fix on a CLOSED TREE

Browse source 
--HG--
extra : amend_source : 6f5cdb02d4784af2bdaf9571c2516fa33c0fe99a
This commit is contained in:
Sebastian Hengst 2017-08-10 18:23:23 +02:00
parent 40fff72904
commit 6a9d58f37b
2 changed files with 49 additions and 49 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

94
browser/base/content/browser.js
View file

@ -22,53 +22,53 @@ XPCOMUtils.defineLazyGetter(this, "extensionNameFromURI", () => {
// lazy module getters // lazy module getters
XPCOMUtils.defineLazyModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, {
["AboutHome", "resource:///modules/AboutHome.jsm"], AboutHome: "resource:///modules/AboutHome.jsm",
["BrowserUITelemetry", "resource:///modules/BrowserUITelemetry.jsm"], BrowserUITelemetry: "resource:///modules/BrowserUITelemetry.jsm",
["BrowserUsageTelemetry", "resource:///modules/BrowserUsageTelemetry.jsm"], BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
["BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"], BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
["CastingApps", "resource:///modules/CastingApps.jsm"], CastingApps: "resource:///modules/CastingApps.jsm",
["CharsetMenu", "resource://gre/modules/CharsetMenu.jsm"], CharsetMenu: "resource://gre/modules/CharsetMenu.jsm",
["Color", "resource://gre/modules/Color.jsm"], Color: "resource://gre/modules/Color.jsm",
["ContentSearch", "resource:///modules/ContentSearch.jsm"], ContentSearch: "resource:///modules/ContentSearch.jsm",
["ContextualIdentityService", "resource://gre/modules/ContextualIdentityService.jsm"], ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.jsm",
["CustomizableUI", "resource:///modules/CustomizableUI.jsm"], CustomizableUI: "resource:///modules/CustomizableUI.jsm",
["Deprecated", "resource://gre/modules/Deprecated.jsm"], Deprecated: "resource://gre/modules/Deprecated.jsm",
["DownloadsCommon", "resource:///modules/DownloadsCommon.jsm"], DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
["E10SUtils", "resource:///modules/E10SUtils.jsm"], E10SUtils: "resource:///modules/E10SUtils.jsm",
["ExtensionsUI", "resource:///modules/ExtensionsUI.jsm"], ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"], FormValidationHandler: "resource:///modules/FormValidationHandler.jsm",
["LightweightThemeManager", "resource://gre/modules/LightweightThemeManager.jsm"], LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
["Log", "resource://gre/modules/Log.jsm"], Log: "resource://gre/modules/Log.jsm",
["LoginManagerParent", "resource://gre/modules/LoginManagerParent.jsm"], LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm",
["NewTabUtils", "resource://gre/modules/NewTabUtils.jsm"], NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
["PageActions", "resource:///modules/PageActions.jsm"], PageActions: "resource:///modules/PageActions.jsm",
["PageThumbs", "resource://gre/modules/PageThumbs.jsm"], PageThumbs: "resource://gre/modules/PageThumbs.jsm",
["PluralForm", "resource://gre/modules/PluralForm.jsm"], PluralForm: "resource://gre/modules/PluralForm.jsm",
["PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"], PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
["PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"], PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
["ReaderMode", "resource://gre/modules/ReaderMode.jsm"], ReaderMode: "resource://gre/modules/ReaderMode.jsm",
["ReaderParent", "resource:///modules/ReaderParent.jsm"], ReaderParent: "resource:///modules/ReaderParent.jsm",
["RecentWindow", "resource:///modules/RecentWindow.jsm"], RecentWindow: "resource:///modules/RecentWindow.jsm",
["SafeBrowsing", "resource://gre/modules/SafeBrowsing.jsm"], SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"], SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"], ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
["SimpleServiceDiscovery", "resource://gre/modules/SimpleServiceDiscovery.jsm"], SimpleServiceDiscovery: "resource://gre/modules/SimpleServiceDiscovery.jsm",
["SitePermissions", "resource:///modules/SitePermissions.jsm"], SitePermissions: "resource:///modules/SitePermissions.jsm",
["Social", "resource:///modules/Social.jsm"], Social: "resource:///modules/Social.jsm",
["TabCrashHandler", "resource:///modules/ContentCrashHandlers.jsm"], TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
["TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"], TelemetryStopwatch: "resource://gre/modules/TelemetryStopwatch.jsm",
["Translation", "resource:///modules/translation/Translation.jsm"], Translation: "resource:///modules/translation/Translation.jsm",
["UITour", "resource:///modules/UITour.jsm"], UITour: "resource:///modules/UITour.jsm",
["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"], UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
["Utils", "resource://gre/modules/sessionstore/Utils.jsm"], Utils: "resource://gre/modules/sessionstore/Utils.jsm",
["Weave", "resource://services-sync/main.js"], Weave: "resource://services-sync/main.js",
["WebNavigationFrames", "resource://gre/modules/WebNavigationFrames.jsm"], WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
["fxAccounts", "resource://gre/modules/FxAccounts.jsm"], fxAccounts: "resource://gre/modules/FxAccounts.jsm",
["gDevTools", "resource://devtools/client/framework/gDevTools.jsm"], gDevTools: "resource://devtools/client/framework/gDevTools.jsm",
["gDevToolsBrowser", "resource://devtools/client/framework/gDevTools.jsm"], gDevToolsBrowser: "resource://devtools/client/framework/gDevTools.jsm",
["webrtcUI", "resource:///modules/webrtcUI.jsm"], webrtcUI: "resource:///modules/webrtcUI.jsm",
["ZoomUI", "resource:///modules/ZoomUI.jsm"], ZoomUI: "resource:///modules/ZoomUI.jsm",
}); });
if (AppConstants.MOZ_CRASHREPORTER) { if (AppConstants.MOZ_CRASHREPORTER) {

4
npm-shrinkwrap.json generated
View file

@ -6,7 +6,7 @@
"acorn": { "acorn": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
"integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==" "integrity": "sha1-U/4WERH5EquZnuiHqQoLxSgi/XU="
}, },
"acorn-jsx": { "acorn-jsx": {
"version": "3.0.1", "version": "3.0.1",
@ -986,7 +986,7 @@
"sax": { "sax": {
"version": "1.2.4", "version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
}, },
"shelljs": { "shelljs": {
"version": "0.7.8", "version": "0.7.8",