Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 817955 - Only install identity modules in modules/identity. r=benadida,r=jparsons

Browse Source 
--HG--
extra : rebase_source : 027b0cae0a29d00c34424e542fe4d57192aab5b1
This commit is contained in:
Mike Hommey 2012-12-05 09:25:21 +01:00
parent 9c465795b8
commit d26003ab92
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/components/SignInToWebsite.jsm
View File

@ -76,7 +76,7 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/IdentityUtils.jsm");
Cu.import("resource://gre/modules/identity/IdentityUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "IdentityService",
"resource://gre/modules/identity/MinimalIdentity.jsm");

2
dom/identity/DOMIdentity.jsm
View File

@ -11,7 +11,7 @@ this.EXPORTED_SYMBOLS = ["DOMIdentity"];
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/IdentityUtils.jsm");
Cu.import("resource://gre/modules/identity/IdentityUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "IdentityService",
#ifdef MOZ_B2G_VERSION

2
dom/identity/nsDOMIdentity.js
View File

@ -16,7 +16,7 @@ const MAX_RP_CALLS = 100;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/IdentityUtils.jsm");
Cu.import("resource://gre/modules/identity/IdentityUtils.jsm");
// This is the child process corresponding to nsIDOMIdentity
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",

6
toolkit/identity/Makefile.in
View File

@ -41,12 +41,10 @@ EXTRA_JS_MODULES = \
Sandbox.jsm \
$(NULL)
JS_MODULES_PATH = $(FINAL_TARGET)/modules/identity
ifdef ENABLE_TESTS
DIRS += tests
endif
include $(topsrcdir)/config/rules.mk
libs::
$(NSINSTALL) -D $(FINAL_TARGET)/modules/identity
$(NSINSTALL) -R $(srcdir)/*.jsm $(FINAL_TARGET)/modules/identity

2
toolkit/identity/tests/unit/test_crypto_service.js
View File

@ -5,7 +5,7 @@
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import('resource://gre/modules/LogUtils.jsm');
Cu.import('resource://gre/modules/identity/LogUtils.jsm');
const idService = Cc["@mozilla.org/identity/crypto-service;1"]
.getService(Ci.nsIIdentityCryptoService);

2
toolkit/identity/tests/unit/test_jwcrypto.js
View File

@ -3,7 +3,7 @@
"use strict"
Cu.import('resource://gre/modules/LogUtils.jsm');
Cu.import('resource://gre/modules/identity/LogUtils.jsm');
XPCOMUtils.defineLazyModuleGetter(this, "IDService",
"resource://gre/modules/identity/Identity.jsm",