Followup of the backout of bug 542999, fix an incorrect merge conflict resolution

This commit is contained in:
Ehsan Akhgari 2010-11-29 22:27:46 -05:00
parent 8b012b0588
commit 2ebe293b60

View File

@ -47,6 +47,9 @@ var chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"]
.QueryInterface(Ci.nsIToolkitChromeRegistry);
chromeReg.checkForNewChrome();
var localeService = Cc["@mozilla.org/intl/nslocaleservice;1"]
.getService(Ci.nsILocaleService);
var prefService = Cc["@mozilla.org/preferences-service;1"]
.getService(Ci.nsIPrefService)
.QueryInterface(Ci.nsIPrefBranch);