Bug 1297456 - use nsIXULRuntime's accessibilityEnabled attribute in Troubleshoot.jsm to check if accessibility service is enabled. r=felipe draft
authorYura Zenevich <yzenevich@mozilla.com>
Wed, 24 Aug 2016 11:09:55 -0400
changeset 404990 3f90217d7718037d14768b66d1db31a903c37ab7
parent 404988 01748a2b1a463f24efd9cd8abad9ccfd76b037b8
child 529325 24944bcdc947b0d2f043444125e116ec3e813bd1
push id27361
push useryura.zenevich@gmail.com
push dateWed, 24 Aug 2016 15:10:33 +0000
reviewersfelipe
bugs1297456
milestone51.0a1
Bug 1297456 - use nsIXULRuntime's accessibilityEnabled attribute in Troubleshoot.jsm to check if accessibility service is enabled. r=felipe MozReview-Commit-ID: C5YPq58yemB
toolkit/modules/Troubleshoot.jsm
--- 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);
   },