mozilla-central: changeset 415507:9a092f00fdd698ea9b3f705dcea9e32b9979fb28

author	Igor Oliveira <igt0@torproject.org>
	Wed, 18 Apr 2018 17:16:00 +0300 (2018-04-18)
changeset 415507	9a092f00fdd698ea9b3f705dcea9e32b9979fb28
parent 415506	cbae9dd052934b6292f8e8675eb6cf7cde78333d
child 415508	44e4fec63d98c64f71591f93d6ee13c00e75ad64
push id	33896
push user	rgurzau@mozilla.com
push date	Wed, 25 Apr 2018 09:36:32 +0000 (2018-04-25)
treeherder	mozilla-central@a83a4ef50f6c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mcomella
bugs	1455165
milestone	61.0a1
first release with	nightly linux32 a83a4ef50f6c / 61.0a1 / 20180425100122 / files nightly linux64 a83a4ef50f6c / 61.0a1 / 20180425100122 / files nightly mac a83a4ef50f6c / 61.0a1 / 20180425100122 / files nightly win32 a83a4ef50f6c / 61.0a1 / 20180425100122 / files nightly win64 a83a4ef50f6c / 61.0a1 / 20180425100122 / files
last release without	nightly linux32 6eeb97ca94f4 / 61.0a1 / 20180424220100 / files nightly linux64 6eeb97ca94f4 / 61.0a1 / 20180424220100 / files nightly mac 6eeb97ca94f4 / 61.0a1 / 20180424220100 / files nightly win32 6eeb97ca94f4 / 61.0a1 / 20180424220100 / files nightly win64 6eeb97ca94f4 / 61.0a1 / 20180424220100 / files

--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6248,16 +6248,20 @@ var ExternalApps = {
 
       return apps.length == 1 ? Strings.browser.formatStringFromName("helperapps.openWithApp2", [apps[0].name], 1) :
                                 Strings.browser.GetStringFromName("helperapps.openWithList2");
     }, this.filter, this.openExternal);
   },
 
   filter: {
     matches: function(aElement) {
+      if (!Services.prefs.getBoolPref("network.protocol-handler.external-default")) {
+        return false;
+      }
+
       let uri = ExternalApps._getMediaLink(aElement);
       let apps = [];
       if (uri) {
         apps = HelperApps.getAppsForUri(uri);
       }
       return apps.length > 0;
     }
   },