Bug 1387832 - Remove @deprecated nsIAccessibleRetrieval. r?surkov
MozReview-Commit-ID: DaqIezvQvUe
--- a/accessible/interfaces/nsIAccessibilityService.idl
+++ b/accessible/interfaces/nsIAccessibilityService.idl
@@ -93,16 +93,8 @@ interface nsIAccessibilityService : nsIS
*/
void setLogging(in ACString aModules);
/**
* Return true if the given module is logged.
*/
boolean isLogged(in AString aModule);
};
-
-/**
- * @deprecated, use nsIAccessibilityService instead.
- */
-[scriptable, builtinclass, uuid(d85e0cbe-47ce-490c-8488-f821dd2be0c2)]
-interface nsIAccessibleRetrieval : nsIAccessibilityService
-{
-};
--- a/accessible/xpcom/xpcAccessibilityService.cpp
+++ b/accessible/xpcom/xpcAccessibilityService.cpp
@@ -86,18 +86,17 @@ xpcAccessibilityService::Release(void)
nsITimer::TYPE_ONE_SHOT,
"xpcAccessibilityService::Release");
}
}
return count;
}
-NS_IMPL_QUERY_INTERFACE(xpcAccessibilityService, nsIAccessibilityService,
- nsIAccessibleRetrieval)
+NS_IMPL_QUERY_INTERFACE(xpcAccessibilityService, nsIAccessibilityService)
NS_IMETHODIMP
xpcAccessibilityService::GetApplicationAccessible(nsIAccessible** aAccessibleApplication)
{
NS_ENSURE_ARG_POINTER(aAccessibleApplication);
NS_IF_ADDREF(*aAccessibleApplication = XPCApplicationAcc());
return NS_OK;
--- a/accessible/xpcom/xpcAccessibilityService.h
+++ b/accessible/xpcom/xpcAccessibilityService.h
@@ -2,23 +2,22 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_a11y_xpcAccessibilityService_h_
#define mozilla_a11y_xpcAccessibilityService_h_
#include "nsIAccessibilityService.h"
-class xpcAccessibilityService : public nsIAccessibleRetrieval
+class xpcAccessibilityService : public nsIAccessibilityService
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIACCESSIBILITYSERVICE
- NS_DECL_NSIACCESSIBLERETRIEVAL
/**
* Return true if xpc accessibility service is in use.
*/
static bool IsInUse() {
// When ref count goes down to 1 (held internally as a static reference),
// it means that there are no more external references and thus it is not in
// use.