author | Jed Parsons <jparsons@mozilla.com> |
Mon, 12 Nov 2012 19:46:35 -0500 | |
changeset 113043 | 0c3592db8b447ac3a6a6dba2e0fa0f7434e5bb96 |
parent 113042 | c958c734e3d3580033d33fb406db26e53c646c94 |
child 113044 | e997348bdeaa20335a2fbd1169166055a6f830ab |
push id | 23848 |
push user | emorley@mozilla.com |
push date | Tue, 13 Nov 2012 16:29:34 +0000 |
treeherder | mozilla-central@d56d537a1843 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | benadida |
bugs | 811095 |
milestone | 19.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- 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