Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backout changeset 51e974db8866 for xpcshell-test bustage CLOSED TREE

Browse Source
This commit is contained in:
Shane Caraveo 2013-06-26 13:20:38 -04:00
parent 455a64976b
commit 5b035d4a70
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolkit/components/social/SocialService.jsm
View File

@ -143,7 +143,10 @@ XPCOMUtils.defineLazyGetter(SocialServiceInternal, "providers", function () {
for (let manifest of this.manifests) {
try {
if (ActiveProviders.has(manifest.origin)) {
let provider = new SocialProvider(manifest);
let activationType = getOriginActivationType(manifest.origin);
let blessed = activationType == "builtin" ||
activationType == "whitelist";
let provider = new SocialProvider(manifest, blessed);
providers[provider.origin] = provider;
}
} catch (err) {
@ -655,7 +658,7 @@ this.SocialService = {
* @param {jsobj} object representing the manifest file describing this provider
* @param {bool} boolean indicating whether this provider is "built in"
*/
function SocialProvider(input) {
function SocialProvider(input, blessed = false) {
if (!input.name)
throw new Error("SocialProvider must be passed a name");
if (!input.origin)
@ -679,11 +682,7 @@ function SocialProvider(input) {
this.ambientNotificationIcons = {};
this.errorState = null;
this.frecency = 0;
let activationType = getOriginActivationType(input.origin);
this.blessed = activationType == "builtin" ||
activationType == "whitelist";
this.blessed = blessed;
try {
this.domain = etld.getBaseDomainFromHost(originUri.host);
} catch(e) {