Skip to content

Commit

Permalink
Bug 1487333 - Remove nsIExternalSharingAppService. r=jchen
Browse files Browse the repository at this point in the history
It's unused.

The patch also renames nsIExternalSharingAppService.idl as
nsISharingHandlerApp.idl, because the only thing left in the file is the
declaration of nsISharingHandlerApp.

--HG--
rename : uriloader/exthandler/nsIExternalSharingAppService.idl => uriloader/exthandler/nsISharingHandlerApp.idl
extra : rebase_source : c1375d75f3c824c9fadd4164201a7e78c7227020
  • Loading branch information
nnethercote committed Aug 30, 2018
1 parent abb07f8 commit 796d9f8
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 157 deletions.
5 changes: 0 additions & 5 deletions docshell/build/nsDocShellModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "nsDBusHandlerApp.h"
#endif
#if defined(MOZ_WIDGET_ANDROID)
#include "nsExternalSharingAppService.h"
#include "nsExternalURLHandlerService.h"
#endif

Expand Down Expand Up @@ -88,7 +87,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(PlatformLocalHandlerApp_t)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDBusHandlerApp)
#endif
#if defined(MOZ_WIDGET_ANDROID)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalSharingAppService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalURLHandlerService)
#endif
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(ContentHandlerService, Init)
Expand All @@ -112,7 +110,6 @@ NS_DEFINE_NAMED_CID(NS_LOCALHANDLERAPP_CID);
NS_DEFINE_NAMED_CID(NS_DBUSHANDLERAPP_CID);
#endif
#if defined(MOZ_WIDGET_ANDROID)
NS_DEFINE_NAMED_CID(NS_EXTERNALSHARINGAPPSERVICE_CID);
NS_DEFINE_NAMED_CID(NS_EXTERNALURLHANDLERSERVICE_CID);
#endif
NS_DEFINE_NAMED_CID(NS_SHENTRY_CID);
Expand All @@ -139,7 +136,6 @@ const mozilla::Module::CIDEntry kDocShellCIDs[] = {
{ &kNS_DBUSHANDLERAPP_CID, false, nullptr, nsDBusHandlerAppConstructor },
#endif
#if defined(MOZ_WIDGET_ANDROID)
{ &kNS_EXTERNALSHARINGAPPSERVICE_CID, false, nullptr, nsExternalSharingAppServiceConstructor },
{ &kNS_EXTERNALURLHANDLERSERVICE_CID, false, nullptr, nsExternalURLHandlerServiceConstructor },
#endif
{ &kNS_SHENTRY_CID, false, nullptr, nsSHEntryConstructor },
Expand Down Expand Up @@ -196,7 +192,6 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
{ NS_DBUSHANDLERAPP_CONTRACTID, &kNS_DBUSHANDLERAPP_CID },
#endif
#if defined(MOZ_WIDGET_ANDROID)
{ NS_EXTERNALSHARINGAPPSERVICE_CONTRACTID, &kNS_EXTERNALSHARINGAPPSERVICE_CID },
{ NS_EXTERNALURLHANDLERSERVICE_CONTRACTID, &kNS_EXTERNALURLHANDLERSERVICE_CID },
#endif
{ NS_SHENTRY_CONTRACTID, &kNS_SHENTRY_CID },
Expand Down
2 changes: 1 addition & 1 deletion uriloader/exthandler/android/nsAndroidHandlerApp.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define nsAndroidHandlerApp_h

#include "nsMIMEInfoImpl.h"
#include "nsIExternalSharingAppService.h"
#include "nsISharingHandlerApp.h"

class nsAndroidHandlerApp : public nsISharingHandlerApp {
public:
Expand Down
61 changes: 0 additions & 61 deletions uriloader/exthandler/android/nsExternalSharingAppService.cpp

This file was deleted.

28 changes: 0 additions & 28 deletions uriloader/exthandler/android/nsExternalSharingAppService.h

This file was deleted.

4 changes: 1 addition & 3 deletions uriloader/exthandler/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ XPIDL_SOURCES += [
'nsIContentDispatchChooser.idl',
'nsIExternalHelperAppService.idl',
'nsIExternalProtocolService.idl',
'nsIExternalSharingAppService.idl',
'nsIExternalURLHandlerService.idl',
'nsIHandlerService.idl',
'nsIHelperAppLauncherDialog.idl',
'nsISharingHandlerApp.idl',
]

XPIDL_MODULE = 'exthandler'
Expand All @@ -40,7 +40,6 @@ EXPORTS += [

if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
EXPORTS += [ '%s/%s' % (osdir, f) for f in [
'nsExternalSharingAppService.h',
'nsExternalURLHandlerService.h',
]]

Expand Down Expand Up @@ -88,7 +87,6 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
UNIFIED_SOURCES += [
'android/nsAndroidHandlerApp.cpp',
'android/nsExternalSharingAppService.cpp',
'android/nsExternalURLHandlerService.cpp',
'android/nsMIMEInfoAndroid.cpp',
]
Expand Down
28 changes: 0 additions & 28 deletions uriloader/exthandler/nsIExternalSharingAppService.idl

This file was deleted.

12 changes: 12 additions & 0 deletions uriloader/exthandler/nsISharingHandlerApp.idl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */

#include "nsIMIMEInfo.idl"

[scriptable, uuid(7111f769-53ec-41fd-b314-613661d5b6ba)]
interface nsISharingHandlerApp : nsIHandlerApp
{
void share(in AString data, [optional] in AString title);
};

31 changes: 0 additions & 31 deletions uriloader/exthandler/unix/nsExternalSharingAppService.h

This file was deleted.

0 comments on commit 796d9f8

Please sign in to comment.