Backed out changeset 1dd103323b7c (bug 1112552) for bc1 bustage

browser/base/content/browser-fxaccounts.js

@@ -2,11 +2,18 @@
 # 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/.
 
-let gFxAccounts = {
+XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function () {
+  return Cu.import("resource://gre/modules/FxAccountsCommon.js", {});
+});
 
-  PREF_SYNC_START_DOORHANGER: "services.sync.ui.showSyncStartDoorhanger",
-  DOORHANGER_ACTIVATE_DELAY_MS: 5000,
-  SYNC_MIGRATION_NOTIFICATION_TITLE: "fxa-migration",
+XPCOMUtils.defineLazyModuleGetter(this, "fxaMigrator",
+  "resource://services-sync/FxaMigrator.jsm");
+
+const PREF_SYNC_START_DOORHANGER = "services.sync.ui.showSyncStartDoorhanger";
+const DOORHANGER_ACTIVATE_DELAY_MS = 5000;
+const SYNC_MIGRATION_NOTIFICATION_TITLE = "fxa-migration";
+
+let gFxAccounts = {
 
   _initialized: false,
   _inCustomizationMode: false,
@@ -27,8 +34,8 @@ let gFxAccounts = {
       "weave:service:login:error",
       "weave:service:setup-complete",
       "fxa-migration:state-changed",
-      this.FxAccountsCommon.ONVERIFIED_NOTIFICATION,
-      this.FxAccountsCommon.ONLOGOUT_NOTIFICATION
+      FxAccountsCommon.ONVERIFIED_NOTIFICATION,
+      FxAccountsCommon.ONLOGOUT_NOTIFICATION
     ];
   },
 
@@ -101,8 +108,8 @@ let gFxAccounts = {
 
   observe: function (subject, topic, data) {
     switch (topic) {
-      case this.FxAccountsCommon.ONVERIFIED_NOTIFICATION:
-        Services.prefs.setBoolPref(this.PREF_SYNC_START_DOORHANGER, true);
+      case FxAccountsCommon.ONVERIFIED_NOTIFICATION:
+        Services.prefs.setBoolPref(PREF_SYNC_START_DOORHANGER, true);
         break;
       case "weave:service:sync:start":
         this.onSyncStart();
@@ -124,11 +131,11 @@ let gFxAccounts = {
     let showDoorhanger = false;
 
     try {
-      showDoorhanger = Services.prefs.getBoolPref(this.PREF_SYNC_START_DOORHANGER);
+      showDoorhanger = Services.prefs.getBoolPref(PREF_SYNC_START_DOORHANGER);
     } catch (e) { /* The pref might not exist. */ }
 
     if (showDoorhanger) {
-      Services.prefs.clearUserPref(this.PREF_SYNC_START_DOORHANGER);
+      Services.prefs.clearUserPref(PREF_SYNC_START_DOORHANGER);
       this.showSyncStartedDoorhanger();
     }
   },
@@ -148,7 +155,7 @@ let gFxAccounts = {
       // a short delay. Without this delay the doorhanger would not show up
       // or with a too small delay show up while we're still animating the
       // window.
-      setTimeout(() => this.onSyncStart(), this.DOORHANGER_ACTIVATE_DELAY_MS);
+      setTimeout(() => this.onSyncStart(), DOORHANGER_ACTIVATE_DELAY_MS);
     } else {
       this._inCustomizationMode = event.type == "customizationstarting";
       this.updateAppMenuItem();
@@ -244,12 +251,12 @@ let gFxAccounts = {
     let status = null;
     let label = null;
     switch (this._migrationInfo.state) {
-      case this.fxaMigrator.STATE_USER_FXA:
+      case fxaMigrator.STATE_USER_FXA:
         status = "migrate-signup";
         label = this.strings.formatStringFromName("needUserShort",
           [this.button.getAttribute("fxabrandname")], 1);
         break;
-      case this.fxaMigrator.STATE_USER_FXA_VERIFIED:
+      case fxaMigrator.STATE_USER_FXA_VERIFIED:
         status = "migrate-verify";
         label = this.strings.formatStringFromName("needVerifiedUserShort",
                                                   [this._migrationInfo.email],
@@ -263,7 +270,7 @@ let gFxAccounts = {
 
   updateMigrationNotification: Task.async(function* () {
     if (!this._migrationInfo) {
-      Weave.Notifications.removeAll(this.SYNC_MIGRATION_NOTIFICATION_TITLE);
+      Weave.Notifications.removeAll(SYNC_MIGRATION_NOTIFICATION_TITLE);
       return;
     }
     if (gBrowser.currentURI.spec.split("?")[0] == "about:accounts") {
@@ -273,7 +280,7 @@ let gFxAccounts = {
     }
     let note = null;
     switch (this._migrationInfo.state) {
-      case this.fxaMigrator.STATE_USER_FXA: {
+      case fxaMigrator.STATE_USER_FXA: {
         let msg = this.strings.GetStringFromName("needUserLong");
         let upgradeLabel =
           this.strings.GetStringFromName("upgradeToFxA.label");
@@ -282,13 +289,13 @@ let gFxAccounts = {
         note = new Weave.Notification(
           undefined, msg, undefined, Weave.Notifications.PRIORITY_WARNING, [
             new Weave.NotificationButton(upgradeLabel, upgradeAccessKey, () => {
-              this.fxaMigrator.createFxAccount(window);
+              fxaMigrator.createFxAccount(window);
             }),
           ]
         );
         break;
       }
-      case this.fxaMigrator.STATE_USER_FXA_VERIFIED: {
+      case fxaMigrator.STATE_USER_FXA_VERIFIED: {
         let msg =
           this.strings.formatStringFromName("needVerifiedUserLong",
                                             [this._migrationInfo.email], 1);
@@ -299,14 +306,14 @@ let gFxAccounts = {
         note = new Weave.Notification(
           undefined, msg, undefined, Weave.Notifications.PRIORITY_INFO, [
             new Weave.NotificationButton(resendLabel, resendAccessKey, () => {
-              this.fxaMigrator.resendVerificationMail();
+              fxaMigrator.resendVerificationMail();
             }),
           ]
         );
         break;
       }
     }
-    note.title = this.SYNC_MIGRATION_NOTIFICATION_TITLE;
+    note.title = SYNC_MIGRATION_NOTIFICATION_TITLE;
     Weave.Notifications.replaceTitle(note);
   }),
 
@@ -321,7 +328,7 @@ let gFxAccounts = {
       this.openSignInAgainPage("menupanel");
       break;
     case "migrate-signup":
-      this.fxaMigrator.createFxAccount(window);
+      fxaMigrator.createFxAccount(window);
       break;
     case "migrate-verify":
       // Instead of using the migrator module directly here the UX calls for
@@ -367,10 +374,3 @@ let gFxAccounts = {
     this.openAccountsPage("reauth", { entryPoint: entryPoint });
   },
 };
-
-XPCOMUtils.defineLazyGetter(gFxAccounts, "FxAccountsCommon", function () {
-  return Cu.import("resource://gre/modules/FxAccountsCommon.js", {});
-});
-
-XPCOMUtils.defineLazyModuleGetter(gFxAccounts, "fxaMigrator",
-  "resource://services-sync/FxaMigrator.jsm");