Bug 1297456 - use nsIXULRuntime's accessibilityEnabled attribute in Troubleshoot.jsm to check if accessibility service is enabled. r=felipe
MozReview-Commit-ID: C5YPq58yemB
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -501,25 +501,19 @@ var dataProviders = {
QueryInterface(Ci.nsIInterfaceRequestor).
getInterface(Ci.nsIDOMWindowUtils).
isIncrementalGCEnabled();
done(data);
},
accessibility: function accessibility(done) {
let data = {};
- try {
- data.isActive = Components.manager.QueryInterface(Ci.nsIServiceManager).
- isServiceInstantiatedByContractID(
- "@mozilla.org/accessibilityService;1",
- Ci.nsISupports);
- }
- catch (e) {
- data.isActive = false;
- }
+ data.isActive = Cc["@mozilla.org/xre/app-info;1"].
+ getService(Ci.nsIXULRuntime).
+ accessibilityEnabled;
try {
data.forceDisabled =
Services.prefs.getIntPref("accessibility.force_disabled");
}
catch (e) {}
done(data);
},