[tbb-commits] [tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! Bug 17502: Add a pref hiding the "Open with" option

[gk at torproject.org]

commit 721f255ca93675c6a3caf2e75678978c8a4db72c
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Dec 9 13:44:30 2015 +0000

    fixup! Bug 17502: Add a pref hiding the "Open with" option
---
 browser/app/profile/000-tor-browser.js |    4 ++++
 browser/app/profile/firefox.js         |    1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 1de3ed1..dc38ee4 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -177,6 +177,10 @@ pref("devtools.appmanager.enabled", false);
 // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as
 // a workaround. See bug 16523 for more details.
 pref("devtools.debugger.chrome-debugging-host", "127.0.0.1");
+// Don't show the "Open with" option on the download dialog if the preference
+// is |true|. This helps to avoid confusion e.g. in case the browser is
+// sandboxed. See bug 17502 for details.
+pref("browser.download.forbid_open_with", false);
 
 // Security slider
 pref("svg.in-content.enabled", true);
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 6c30b7d..a827f52 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -324,7 +324,6 @@ pref("browser.download.useDownloadDir", true);
 pref("browser.download.folderList", 1);
 pref("browser.download.manager.addToRecentDocs", true);
 pref("browser.download.manager.resumeOnWakeDelay", 10000);
-pref("browser.download.forbid_open_with", false);
 
 // This allows disabling the animated notifications shown by
 // the Downloads Indicator when a download starts or completes.