Bug 928579 - Backout bug 793906 to re-enable desktop Signin-to-Web UI. f=ozten,r=dolske
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Tue, 22 Oct 2013 21:01:33 -0700
changeset 151745 4e075a69e78b7beaf61a472f3030c1602ab7b2b2
parent 151744 f55d3aab80d430970d3062b75a169ffff8734798
child 151746 568d296995e0d806e8e7fadca1d2dfeeb2e7f301
child 151778 c0e6e76aafedbdc3852fc3fc114b8f57b7ddf851
push id3167
push usermozilla@noorenberghe.ca
push dateWed, 23 Oct 2013 04:05:38 +0000
treeherderfx-team@4e075a69e78b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs928579, 793906
milestone27.0a1
Bug 928579 - Backout bug 793906 to re-enable desktop Signin-to-Web UI. f=ozten,r=dolske
browser/modules/SignInToWebsite.jsm
browser/modules/test/Makefile.in
browser/modules/test/browser.ini
--- a/browser/modules/SignInToWebsite.jsm
+++ b/browser/modules/SignInToWebsite.jsm
@@ -22,38 +22,27 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 function log(...aMessageArgs) {
   Logger.log.apply(Logger, ["SignInToWebsiteUX"].concat(aMessageArgs));
 }
 
 this.SignInToWebsiteUX = {
 
   init: function SignInToWebsiteUX_init() {
 
-    /*
-     * bug 793906 - temporarily disabling desktop UI so we can
-     * focus on b2g without worrying about desktop as well
-     *
     Services.obs.addObserver(this, "identity-request", false);
     Services.obs.addObserver(this, "identity-auth", false);
     Services.obs.addObserver(this, "identity-auth-complete", false);
     Services.obs.addObserver(this, "identity-login-state-changed", false);
-     */
   },
 
   uninit: function SignInToWebsiteUX_uninit() {
-    /*
-     * As above:
-     * bug 793906 - temporarily disabling desktop UI so we can
-     * focus on b2g without worrying about desktop as well
-     *
     Services.obs.removeObserver(this, "identity-request");
     Services.obs.removeObserver(this, "identity-auth");
     Services.obs.removeObserver(this, "identity-auth-complete");
     Services.obs.removeObserver(this, "identity-login-state-changed");
-     */
   },
 
   observe: function SignInToWebsiteUX_observe(aSubject, aTopic, aData) {
     log("observe: received", aTopic, "with", aData, "for", aSubject);
     let options = null;
     if (aSubject) {
       options = aSubject.wrappedJSObject;
     }
--- a/browser/modules/test/Makefile.in
+++ b/browser/modules/test/Makefile.in
@@ -2,11 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 MOCHITEST_BROWSER_FILES += \
   browser_taskbar_preview.js \
   $(NULL)
 endif
-
-# bug 793906 - temporarily disabling desktop UI while working on b2g
-# browser_SignInToWebsite.js
--- a/browser/modules/test/browser.ini
+++ b/browser/modules/test/browser.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 
 [browser_NetworkPrioritizer.js]
+[browser_SignInToWebsite.js]
 [browser_UITour.js]
 support-files = uitour.*
\ No newline at end of file