[tbb-commits] [torbutton/master] Bug 26490: Remove the security slider notification

[gk at torproject.org]

commit 1eb701f4701340c89c9f76ad2eb6ae86ca051e61
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Aug 27 23:05:08 2018 +0000

    Bug 26490: Remove the security slider notification
    
    We now have the onboarding to show users our security slider. We
    remove the notification bar on first start as it was a workaround for
    that onboarding feature which on some system causes problems with
    window size rounding.
---
 src/chrome/content/torbutton.js           | 29 -----------------------------
 src/chrome/locale/en/torbutton.properties |  3 ---
 src/defaults/preferences/preferences.js   |  1 -
 3 files changed, 33 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 47621835..3f38830b 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -417,7 +417,6 @@ var torbutton_abouttor_message_handler = {
   receiveMessage: function(aMessage) {
     switch(aMessage.name) {
       case "AboutTor:Loaded":
-        torbutton_show_sec_slider_notification();
         aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData",
                                                         this.chromeData);
         break;
@@ -598,34 +597,6 @@ function torbutton_check_for_update() {
         prompter.checkForUpdates();
 }
 
-function torbutton_show_sec_slider_notification() {
-  // Show the notification about the new security slider.
-  if (m_tb_prefs.
-      getBoolPref("extensions.torbutton.show_slider_notification")) {
-    let sb = torbutton_get_stringbundle();
-    let button_label =
-      torbutton_get_property_string("torbutton.slider_notification_button");
-    let box = gBrowser.getNotificationBox();
-
-    let buttons = [{
-      label: button_label,
-      accessKey: 'S',
-      popup: null,
-      callback: torbutton_open_prefs_dialog,
-    }];
-
-    let priority = box.PRIORITY_INFO_LOW;
-    let message =
-      torbutton_get_property_string("torbutton.slider_notification");
-
-    box.appendNotification(message, 'new-menu-notification',
-                           "chrome://torbutton/skin/tor-enabled-16.png",
-                           priority, buttons);
-    m_tb_prefs.
-      setBoolPref("extensions.torbutton.show_slider_notification", false);
-  }
-}
-
 // Bug 1506 P4: Checking for Tor Browser updates is pretty important,
 // probably even as a fallback if we ever do get a working updater.
 function torbutton_do_async_versioncheck() {
diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index 60154dbe..f11fb5bf 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an
 torbutton.popup.never_ask_again = Never ask me again
 torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
-torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out!
-torbutton.slider_notification_button = Open security settings
-
 torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 428e70bc..92d1c106 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -42,7 +42,6 @@ pref("extensions.torbutton at torproject.org.getAddons.cache.enabled", false);
 // Security Slider
 pref("extensions.torbutton.security_slider", 4);
 pref("extensions.torbutton.security_custom", false);
-pref("extensions.torbutton.show_slider_notification", true);
 
 pref("extensions.torbutton.prompt_torbrowser", true);
 pref("extensions.torbutton.confirm_plugins", true);