Bug 1232467 - Remove "Open links in Private browsing" setting from Nightly. r=mcomella

--HG--
extra : commitid : E9nriJL1vFi
extra : rebase_source : 40a6dd58736cb0aa64623422bec5d22ff02d04b3
extra : amend_source : 82991eed7a3a168afb33c483fa9cbd820c99fd85

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -1684,11 +1684,6 @@ public class BrowserApp extends GeckoApp
             if (Versions.feature16Plus) {
                 Telemetry.addToHistogram("BROWSER_IS_ASSIST_DEFAULT", (isDefaultBrowser(Intent.ACTION_ASSIST) ? 1 : 0));
             }
-
-            final SharedPreferences sharedPrefs = GeckoSharedPrefs.forApp(BrowserApp.this);
-            if (sharedPrefs.getBoolean(GeckoPreferences.PREFS_OPEN_URLS_IN_PRIVATE, false)) {
-                Telemetry.addToHistogram("FENNEC_OPEN_URLS_IN_PRIVATE", 1);
-            }
         } else if ("Updater:Launch".equals(event)) {
             handleUpdaterLaunch();
         } else {

mobile/android/base/java/org/mozilla/gecko/Tabs.java

@@ -855,12 +855,6 @@ public class Tabs implements GeckoEventListener {
             boolean desktopMode = (flags & LOADURL_DESKTOP) != 0;
             boolean external = (flags & LOADURL_EXTERNAL) != 0;
 
-            final SharedPreferences sharedPrefs =  GeckoSharedPrefs.forApp(mAppContext);
-            final boolean isPrivatePref = sharedPrefs.getBoolean(GeckoPreferences.PREFS_OPEN_URLS_IN_PRIVATE, false);
-            if (isPrivatePref && external) {
-                isPrivate = true;
-            }
-
             args.put("url", url);
             args.put("engine", searchEngine);
             args.put("parentId", parentId);

mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java

@@ -131,7 +131,6 @@ OnSharedPreferenceChangeListener
     private static final String PREFS_SYNC = NON_PREF_PREFIX + "sync";
     private static final String PREFS_TRACKING_PROTECTION = "privacy.trackingprotection.state";
     private static final String PREFS_TRACKING_PROTECTION_PB = "privacy.trackingprotection.pbmode.enabled";
-    public static final String PREFS_OPEN_URLS_IN_PRIVATE = NON_PREF_PREFIX + "openExternalURLsPrivately";
     public static final String PREFS_VOICE_INPUT_ENABLED = NON_PREF_PREFIX + "voice_input_enabled";
     public static final String PREFS_QRCODE_ENABLED = NON_PREF_PREFIX + "qrcode_enabled";
     private static final String PREFS_ADVANCED = NON_PREF_PREFIX + "advanced.enabled";
@@ -701,13 +700,6 @@ OnSharedPreferenceChangeListener
                         i--;
                         continue;
                     }
-                } else if (PREFS_OPEN_URLS_IN_PRIVATE.equals(key)) {
-                    // Remove UI for opening external links in private browsing on non-Nightly builds.
-                    if (!AppConstants.NIGHTLY_BUILD || !Restrictions.isAllowed(this, Restrictable.PRIVATE_BROWSING)) {
-                        preferences.removePreference(pref);
-                        i--;
-                        continue;
-                    }
                 } else if (PREFS_TRACKING_PROTECTION.equals(key)) {
                     // Remove UI for global TP pref in non-Nightly builds.
                     if (!AppConstants.NIGHTLY_BUILD) {

mobile/android/base/locales/en-US/android_strings.dtd

@@ -170,8 +170,6 @@
 <!ENTITY pref_developer_remotedebugging_wifi "Remote debugging via Wi-Fi">
 <!ENTITY pref_developer_remotedebugging_wifi_disabled_summary "Wi-Fi debugging requires your device to have a QR code reader app installed.">
 <!ENTITY pref_remember_signons2 "Remember logins">
-<!ENTITY pref_open_external_urls_privately_title "Open links in Private browsing">
-<!ENTITY pref_open_external_urls_privately_summary "For all external links opened in &brandShortName;">
 <!ENTITY pref_manage_logins "Manage logins">
 
 <!ENTITY pref_category_home "Home">

mobile/android/base/resources/xml-v11/preferences_general.xml

@@ -33,10 +33,5 @@
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
-    <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
-                        android:title="@string/pref_open_external_urls_privately_title"
-                        android:summary="@string/pref_open_external_urls_privately_summary"
-                        android:defaultValue="false" />
-
 </PreferenceScreen>
 

mobile/android/base/resources/xml-v11/preferences_general_tablet.xml

@@ -35,10 +35,5 @@
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
-    <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
-                        android:title="@string/pref_open_external_urls_privately_title"
-                        android:summary="@string/pref_open_external_urls_privately_summary"
-                        android:defaultValue="false" />
-
 </PreferenceScreen>
 

mobile/android/base/resources/xml/preferences_general.xml

@@ -39,10 +39,5 @@
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
-    <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
-                        android:title="@string/pref_open_external_urls_privately_title"
-                        android:summary="@string/pref_open_external_urls_privately_summary"
-                        android:defaultValue="false" />
-
 </PreferenceScreen>
 

mobile/android/base/strings.xml.in

@@ -199,9 +199,6 @@
 
   <string name="pref_remember_signons">&pref_remember_signons2;</string>
 
-  <string name="pref_open_external_urls_privately_title">&pref_open_external_urls_privately_title;</string>
-  <string name="pref_open_external_urls_privately_summary">&pref_open_external_urls_privately_summary;</string>
-
   <string name="pref_manage_logins">&pref_manage_logins;</string>
 
   <string name="pref_cookies_menu">&pref_cookies_menu;</string>

toolkit/components/telemetry/Histograms.json

@@ -9275,12 +9275,6 @@
     "kind": "boolean",
     "description": "Has the tab queue functionality been enabled."
   },
-  "FENNEC_OPEN_URLS_IN_PRIVATE": {
-    "alert_emails": ["margaret@mozilla.com"],
-    "expires_in_version": "45",
-    "kind": "flag",
-    "description": "Reports the state of the open external links in private tabs preference"
-  },
   "GRAPHICS_DRIVER_STARTUP_TEST": {
     "alert_emails": ["danderson@mozilla.com"],
     "expires_in_version": "never",