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 176454 9aacb77b35fb8857ef4ac5e912c50a6152e776bd
parent 176453 7ef609d31ddfa0f7437b62cd35634d17d51a7269
child 176455 5d2d60f3cb3792b1f9d6c0b289aa04ad9eec99f6
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, Mossop, lsblakk
bugs976849
milestone28.0
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"));