Bug 862148 - stop supporting installation of Sherlock plugins through Services.search.addEngine, r=adw.

This commit is contained in:
Florian Quèze
2015-09-23 12:05:36 +02:00
parent 144c19129b
commit a907b6cfb9
14 changed files with 48 additions and 192 deletions

View File

@@ -25,7 +25,7 @@ MainProcessSingleton.prototype = {
},
// Called when a webpage calls window.external.AddSearchProvider
addSearchEngine: function({ target: browser, data: { pageURL, engineURL, type } }) {
addSearchEngine: function({ target: browser, data: { pageURL, engineURL } }) {
pageURL = NetUtil.newURI(pageURL);
engineURL = NetUtil.newURI(engineURL, null, pageURL);
@@ -61,7 +61,7 @@ MainProcessSingleton.prototype = {
if (status != Cr.NS_OK)
return;
Services.search.addEngine(engineURL.spec, type, iconURL ? iconURL.spec : null, true);
Services.search.addEngine(engineURL.spec, null, iconURL ? iconURL.spec : null, true);
})
},