From 847d2589413d4d39dce2f5e8b6fd7d7b26ef1c2d Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 31 Mar 2017 11:07:31 -0700
Subject: [PATCH] Backed out changeset 94c77723eead (bug 1096343) at
 developer's request a=backout

---
 .../components/preferences/in-content/main.js | 26 +++----------------
 .../preferences/in-content/main.xul           |  5 +---
 .../en-US/chrome/browser/preferences/main.dtd |  3 +--
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
index 440b1b2c190a..b6e5e6659f0e 100644
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -18,15 +18,9 @@ if (AppConstants.E10S_TESTING_ONLY) {
   XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
                                     "resource://gre/modules/UpdateUtils.jsm");
 }
-
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
                                   "resource://gre/modules/PlacesUtils.jsm");
 
-if (AppConstants.MOZ_DEV_EDITION) {
-  XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
-                                    "resource://gre/modules/FxAccounts.jsm");
-}
-
 const ENGINE_FLAVOR = "text/x-moz-search-engine";
 
 var gEngineView = null;
@@ -191,11 +185,6 @@ var gMainPane = {
 
       OS.File.stat(ignoreSeparateProfile).then(() => separateProfileModeCheckbox.checked = false,
                                                () => separateProfileModeCheckbox.checked = true);
-
-      fxAccounts.getSignedInUser().then(data => {
-        document.getElementById("getStarted").selectedIndex = data ? 1 : 0;
-      })
-      .catch(Cu.reportError);
     }
 
     // Notify observers that the UI is now ready
@@ -293,17 +282,10 @@ var gMainPane = {
                   .getService(Ci.nsIWindowMediator);
       let win = wm.getMostRecentWindow("navigator:browser");
 
-      fxAccounts.getSignedInUser().then(data => {
-        if (win) {
-          if (data) {
-            // We have a user, open Sync preferences in the same tab
-            win.openUILinkIn("about:preferences#sync", "current");
-            return;
-          }
-          let accountsTab = win.gBrowser.addTab("about:accounts?action=signin&entrypoint=dev-edition-setup");
-          win.gBrowser.selectedTab = accountsTab;
-        }
-      });
+      if (win) {
+        let accountsTab = win.gBrowser.addTab("about:accounts?action=signin&entrypoint=dev-edition-setup");
+        win.gBrowser.selectedTab = accountsTab;
+      }
     }
   },
 
diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul
index 90d8a8ef06e8..2bb411f42c33 100644
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -202,10 +202,7 @@
               label="&separateProfileMode.label;"/>
     <hbox align="center" class="indent">
       <label id="useFirefoxSync">&useFirefoxSync.label;</label>
-      <deck id="getStarted">
-        <label class="text-link">&getStarted.notlogged.label;</label>
-        <label class="text-link">&getStarted.configured.label;</label>
-      </deck>
+      <label id="getStarted" class="text-link">&getStarted.label;</label>
     </hbox>
   </vbox>
 #endif
diff --git a/browser/locales/en-US/chrome/browser/preferences/main.dtd b/browser/locales/en-US/chrome/browser/preferences/main.dtd
index ccc8ad4f318e..3085ffd0dead 100644
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -40,7 +40,6 @@
 
 <!ENTITY separateProfileMode.label        "Allow &brandShortName; and Firefox to run at the same time">
 <!ENTITY useFirefoxSync.label             "Tip: This uses separate profiles. Use Sync to share data between them.">
-<!ENTITY getStarted.notlogged.label       "Sign in to &syncBrand.shortName.label;…">
-<!ENTITY getStarted.configured.label      "Open &syncBrand.shortName.label; preferences">
+<!ENTITY getStarted.label                 "Start using Sync…">
 
 <!ENTITY e10sEnabled.label                "Enable multi-process &brandShortName;">