Bug 976849 - Disable extension directory loading in Metro. r=rstrong, r=Mossop, a=lsblakk
authorMatt Brubeck <mbrubeck@mozilla.com>
Mon, 03 Mar 2014 13:41:24 -0800
changeset 183192 97bc6b7857e3359a6b2221e6d4aa84d0be972ec1
parent 183191 a19e2d114ebda0adec9493bca98f850eb37ea179
child 183193 1888bbfc57265e91c9843811cb968eeac2ce9f2d
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, Mossop, lsblakk
bugs976849
milestone29.0a2
Bug 976849 - Disable extension directory loading in Metro. r=rstrong, r=Mossop, a=lsblakk
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -578,16 +578,19 @@ LoadExtensionDirectories(nsINIParser &pa
     }
   }
   while (true);
 }
 
 void
 nsXREDirProvider::LoadExtensionBundleDirectories()
 {
+  if (!mozilla::Preferences::GetBool("extensions.defaultProviders.enabled", true))
+    return;
+
   if (mProfileDir && !gSafeMode) {
     nsCOMPtr<nsIFile> extensionsINI;
     mProfileDir->Clone(getter_AddRefs(extensionsINI));
     if (!extensionsINI)
       return;
 
     extensionsINI->AppendNative(NS_LITERAL_CSTRING("extensions.ini"));