Bug 1105189 - Look for the distribution/bundles directory under Contents/Resources due to v2 signing requirements. r=bsmedberg, a=lsblakk
authorHector Zhao <bzhao@mozilla.com>
Wed, 26 Nov 2014 16:37:37 +0800
changeset 234116 4ebb521ae031b2c6a52d7a8977036bbc0af750e2
parent 234115 8aafebccd2abe82b7d1d78af05d7faf5c5989dd9
child 234117 c31367ac31468cfa305f00268e7a98ce5af21332
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersbsmedberg, lsblakk
bugs1105189
milestone35.0
Bug 1105189 - Look for the distribution/bundles directory under Contents/Resources due to v2 signing requirements. r=bsmedberg, a=lsblakk
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -644,21 +644,20 @@ nsXREDirProvider::LoadExtensionBundleDir
   }
 }
 
 void
 nsXREDirProvider::LoadAppBundleDirs()
 {
   nsCOMPtr<nsIFile> dir;
   bool persistent = false;
-  nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &persistent, getter_AddRefs(dir));
+  nsresult rv = GetFile(XRE_APP_DISTRIBUTION_DIR, &persistent, getter_AddRefs(dir));
   if (NS_FAILED(rv))
     return;
 
-  dir->SetNativeLeafName(NS_LITERAL_CSTRING("distribution"));
   dir->AppendNative(NS_LITERAL_CSTRING("bundles"));
 
   nsCOMPtr<nsISimpleEnumerator> e;
   rv = dir->GetDirectoryEntries(getter_AddRefs(e));
   if (NS_FAILED(rv))
     return;
 
   nsCOMPtr<nsIDirectoryEnumerator> files = do_QueryInterface(e);