Commit 72aacbd7 authored by Georg Koppen's avatar Georg Koppen
Browse files

Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"

This reverts commit d127873b.
parent 1b8977f5
...@@ -175,9 +175,6 @@ var torbutton_unique_pref_observer = ...@@ -175,9 +175,6 @@ var torbutton_unique_pref_observer =
case "privacy.firstparty.isolate": case "privacy.firstparty.isolate":
torbutton_update_isolation_prefs(); torbutton_update_isolation_prefs();
break; break;
case "extensions.torbutton.hide_sync_ui":
torbutton_update_sync_ui();
break;
} }
} }
} }
...@@ -404,7 +401,6 @@ function torbutton_init() { ...@@ -404,7 +401,6 @@ function torbutton_init() {
torbutton_update_toolbutton(); torbutton_update_toolbutton();
torbutton_notify_if_update_needed(); torbutton_notify_if_update_needed();
torbutton_update_sync_ui();
createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host,
m_tb_control_port, m_tb_control_pass, m_tb_control_port, m_tb_control_pass,
...@@ -2339,18 +2335,6 @@ function torbutton_is_homepage_url(aURI) ...@@ -2339,18 +2335,6 @@ function torbutton_is_homepage_url(aURI)
return (urls.indexOf(aURI.spec) >= 0); 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 // Update the NoScript button to reflect any changes to noscript prefs
function torbutton_update_noscript_button() function torbutton_update_noscript_button()
{ {
......
...@@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo ...@@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo
pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton.display_circuit", true);
pref("extensions.torbutton@torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton@torproject.org.description", "chrome://torbutton/locale/torbutton.properties");
pref("extensions.torbutton.updateNeeded", false); pref("extensions.torbutton.updateNeeded", false);
pref("extensions.torbutton.hide_sync_ui", true);
// Tor check and proxy prefs // Tor check and proxy prefs
pref("extensions.torbutton.test_enabled",true); pref("extensions.torbutton.test_enabled",true);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment