[tbb-commits] [torbutton/master] Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"

[gk at torproject.org]

commit 72aacbd7178d50abf2c95c43ce907e65b95ddb1c
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 15 12:33:21 2018 +0000

    Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"
    
    This reverts commit d127873b498fb83e4f608b82a8d382df25183dd3.
---
 src/chrome/content/torbutton.js         | 16 ----------------
 src/defaults/preferences/preferences.js |  1 -
 2 files changed, 17 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 7f750bc..b56a628 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -175,9 +175,6 @@ var torbutton_unique_pref_observer =
             case "privacy.firstparty.isolate":
                 torbutton_update_isolation_prefs();
                 break;
-            case "extensions.torbutton.hide_sync_ui":
-                torbutton_update_sync_ui();
-                break;
         }
     }
 }
@@ -404,7 +401,6 @@ function torbutton_init() {
 
     torbutton_update_toolbutton();
     torbutton_notify_if_update_needed();
-    torbutton_update_sync_ui();
 
     createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host,
                             m_tb_control_port, m_tb_control_pass,
@@ -2339,18 +2335,6 @@ function torbutton_is_homepage_url(aURI)
   return (urls.indexOf(aURI.spec) >= 0);
 }
 
-// Check if "extensions.torbutton.hide_sync_ui" is enabled, and if so,
-// hide the "Sign in to Sync" button on the hamburger menu.
-function torbutton_update_sync_ui()
-{
-  try {
-    document.getElementById("PanelUI-footer-fxa").style.display =
-      getBoolPref("extensions.torbutton.hide_sync_ui") ? "none" : "";
-  } catch (e) {
-    torbutton_log(5, 'Error updating the Sync UI: ' + e);
-  }
-}
-
 // Update the NoScript button to reflect any changes to noscript prefs
 function torbutton_update_noscript_button()
 {
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index f61cb89..5cfb0eb 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo
 pref("extensions.torbutton.display_circuit", true);
 pref("extensions.torbutton at torproject.org.description", "chrome://torbutton/locale/torbutton.properties");
 pref("extensions.torbutton.updateNeeded", false);
-pref("extensions.torbutton.hide_sync_ui", true);
 
 // Tor check and proxy prefs
 pref("extensions.torbutton.test_enabled",true);