corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1382968) for breaking browser_addons_debug_webextension.js a=backout

Browse Source 
Backed out changeset e25b4bd21ac8 (bug 1382968)
Backed out changeset 5a2260bc98ca (bug 1382968)
Backed out changeset 869a9b46b5cc (bug 1382968)

MozReview-Commit-ID: DSKWAHxdXI
This commit is contained in:
Wes Kocher
2017-08-08 09:17:56 -07:00
parent 028c402fa7
commit 85ba4e7ea1
17 changed files with 119 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/processsingleton/MainProcessSingleton.js
View File

@@ -18,6 +18,12 @@ MainProcessSingleton.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
logConsoleMessage(message) {
let logMsg = message.data;
logMsg.wrappedJSObject = logMsg;
Services.obs.notifyObservers(logMsg, "console-api-log-event");
},
// Called when a webpage calls window.external.AddSearchProvider
addSearchEngine({ target: browser, data: { pageURL, engineURL } }) {
pageURL = NetUtil.newURI(pageURL);
@@ -67,12 +73,14 @@ MainProcessSingleton.prototype = {
// before other frame scripts.
Services.mm.loadFrameScript("chrome://global/content/browser-content.js", true);
Services.ppmm.loadProcessScript("chrome://global/content/process-content.js", true);
Services.ppmm.addMessageListener("Console:Log", this.logConsoleMessage);
Services.mm.addMessageListener("Search:AddEngine", this.addSearchEngine);
Services.ppmm.loadProcessScript("resource:///modules/ContentObservers.js", true);
break;
}
case "xpcom-shutdown":
Services.ppmm.removeMessageListener("Console:Log", this.logConsoleMessage);
Services.mm.removeMessageListener("Search:AddEngine", this.addSearchEngine);
break;
}