Bug 811095 - (Re)enable identity modules. r=benadida, a=blocking-basecamp
authorJed Parsons <jparsons@mozilla.com>
Mon, 12 Nov 2012 19:46:35 -0500
changeset 117392 8f03aaf1f30655b340af93f68b2cc7f77d8dc466
parent 117391 1cb531b32040fa510e921c7e7512d3eb7d4d70fb
child 117393 1a43b1b0ac965fda0133d09544ab6b8aec955e0a
push id1872
push userryanvm@gmail.com
push dateFri, 07 Dec 2012 21:45:16 +0000
treeherdermozilla-beta@3e03cd357b9f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenadida, blocking-basecamp
bugs811095
milestone18.0
Bug 811095 - (Re)enable identity modules. r=benadida, a=blocking-basecamp
b2g/chrome/content/shell.js
b2g/chrome/jar.mn
b2g/components/Makefile.in
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -17,16 +17,20 @@ Cu.import('resource://gre/modules/access
 Cu.import('resource://gre/modules/Payment.jsm');
 Cu.import("resource://gre/modules/AppsUtils.jsm");
 Cu.import('resource://gre/modules/UserAgentOverrides.jsm');
 Cu.import('resource://gre/modules/Keyboard.jsm');
 #ifdef MOZ_B2G_RIL
 Cu.import('resource://gre/modules/NetworkStatsService.jsm');
 #endif
 
+// identity
+Cu.import('resource://gre/modules/SignInToWebsite.jsm');
+SignInToWebsiteController.init();
+
 XPCOMUtils.defineLazyServiceGetter(Services, 'env',
                                    '@mozilla.org/process/environment;1',
                                    'nsIEnvironment');
 
 XPCOMUtils.defineLazyServiceGetter(Services, 'ss',
                                    '@mozilla.org/content/style-sheet-service;1',
                                    'nsIStyleSheetService');
 
--- a/b2g/chrome/jar.mn
+++ b/b2g/chrome/jar.mn
@@ -17,16 +17,17 @@ chrome.jar:
 #ifndef ANDROID
   content/screen.js                     (content/screen.js)
   content/runapp.js                     (content/runapp.js)
 #endif
   content/content.css                   (content/content.css)
   content/touchcontrols.css             (content/touchcontrols.css)
 
   content/payment.js                    (content/payment.js)
+  content/identity.js                   (content/identity.js)
 
 % override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml
 % override chrome://global/skin/netError.css chrome://browser/content/netError.css
 % override chrome://global/skin/media/videocontrols.css chrome://browser/content/touchcontrols.css
 
   content/netError.xhtml                (content/netError.xhtml)
   content/netError.css                  (content/netError.css)
   content/images/errorpage-larry-black.png (content/images/errorpage-larry-black.png)
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -31,16 +31,17 @@ EXTRA_PP_COMPONENTS = \
         TelProtocolHandler.js \
         YoutubeProtocolHandler.js \
         RecoveryService.js \
         $(NULL)
 
 EXTRA_JS_MODULES = \
 	Keyboard.jsm \
 	TelURIParser.jsm \
+	SignInToWebsite.jsm \
 	$(NULL)
 
 TEST_DIRS = \
 	test \
 	$(NULL)
 
 ifdef MOZ_UPDATER
 EXTRA_PP_COMPONENTS += UpdatePrompt.js