wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 07:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #65 - Remove AppConstants from netwerk/

Browse source
This commit is contained in:
Matt A. Tobin 2020-02-01 21:59:08 -05:00 • committed by Roy Tam
commit ef27cc7fd0
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
netwerk/protocol/http/UserAgentUpdates.jsm
View file

@ -10,7 +10,6 @@ const Ci = Components.interfaces;
const Cc = Components.classes; const Cc = Components.classes;
const Cu = Components.utils; const Cu = Components.utils;
Cu.import("resource://gre/modules/AppConstants.jsm");
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@ -144,13 +143,14 @@ this.UserAgentUpdates = {
// try to load next one if the previous load failed // try to load next one if the previous load failed
return prevLoad ? prevLoad.then(null, tryNext) : tryNext(); return prevLoad ? prevLoad.then(null, tryNext) : tryNext();
}, null).then(null, (ex) => { }, null).then(null, (ex) => {
if (AppConstants.platform !== "android") { #ifndef MOZ_WIDGET_ANDROID
// All previous (non-Android) load attempts have failed, so we bail.
throw new Error("UserAgentUpdates: Failed to load " + FILE_UPDATES +
ex + "\n" + ex.stack);
}
// Make one last attempt to read from the Fennec APK root. // Make one last attempt to read from the Fennec APK root.
return readChannel("resource://android/" + FILE_UPDATES); return readChannel("resource://android/" + FILE_UPDATES);
#else
// All previous (non-Android) load attempts have failed, so we bail.
throw new Error("UserAgentUpdates: Failed to load " + FILE_UPDATES +
ex + "\n" + ex.stack);
#endif
}).then((update) => { }).then((update) => {
// Apply update if loading was successful // Apply update if loading was successful
this._applyUpdate(update); this._applyUpdate(update);

7
netwerk/protocol/http/moz.build
View file

@ -99,10 +99,9 @@ IPDL_SOURCES += [
'PHttpChannel.ipdl', 'PHttpChannel.ipdl',
] ]
EXTRA_JS_MODULES += [ EXTRA_JS_MODULES += ['UserAgentOverrides.jsm']
'UserAgentOverrides.jsm',
'UserAgentUpdates.jsm', EXTRA_PP_JS_MODULES += ['UserAgentUpdates.jsm']
]
include('/ipc/chromium/chromium-config.mozbuild') include('/ipc/chromium/chromium-config.mozbuild')