diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 4efd4c0bc47..0bdd603408b 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -53,8 +53,6 @@ #include "nsServiceManagerUtils.h" #include "nsThreadUtils.h" #include "nsChromeRegistryChrome.h" -#include "nsExternalHelperAppService.h" -#include "nsCExternalHandlerService.h" #ifdef ANDROID #include "AndroidBridge.h" @@ -472,16 +470,6 @@ ContentParent::RecvSetURITitle(const IPC::URI& uri, return true; } -bool -ContentParent::RecvLoadURIExteneral(const URI& uri) -{ - nsCOMPtr extProtService (do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID)); - nsCOMPtr ourURI = uri; - extProtService->LoadURI(ourURI, nsnull); - return true; -} - - /* void onDispatchedEvent (in nsIThreadInternal thread); */ NS_IMETHODIMP ContentParent::OnDispatchedEvent(nsIThreadInternal *thread) diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index de7a666efd8..a183d87e40e 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -154,8 +154,6 @@ private: virtual bool RecvSetURITitle(const IPC::URI& uri, const nsString& title); - - virtual bool RecvLoadURIExteneral(const URI& uri); virtual bool RecvNotifyIME(const int&, const int&); diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index 38d62de7648..3dc4680c4f0 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -82,7 +82,6 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../../toolkit/components/places/src \ -I$(srcdir)/../src/geolocation \ -I$(topsrcdir)/chrome/src \ - -I$(topsrcdir)/uriloader/exthandler \ $(NULL) CXXFLAGS += $(TK_CFLAGS) diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl index 7d80fda4342..e38ff064878 100644 --- a/dom/ipc/PContent.ipdl +++ b/dom/ipc/PContent.ipdl @@ -81,8 +81,6 @@ parent: async VisitURI(URI uri, URI referrer, PRUint32 flags); async SetURITitle(URI uri, nsString title); - async LoadURIExteneral(URI uri); - // PrefService messages sync GetPrefType(nsCString prefName) returns (PRInt32 retValue, nsresult rv); sync GetBoolPref(nsCString prefName) returns (PRBool retValue, nsresult rv); diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 0cc3fa57e52..5d68475e79b 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -175,8 +175,6 @@ EXTRA_COMPONENTS = \ # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 SRCS_IN_OBJDIR = 1 -include $(topsrcdir)/config/config.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk ifneq (,$(filter qt gtk2, $(MOZ_WIDGET_TOOLKIT))) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index d35d11ad503..c87af9b5874 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -42,11 +42,6 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC -#include "mozilla/dom/ContentChild.h" -#include "nsXULAppAPI.h" -#endif - #include "nsExternalHelperAppService.h" #include "nsCExternalHandlerService.h" #include "nsIURI.h" @@ -866,13 +861,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, { NS_ENSURE_ARG_POINTER(aURI); -#ifdef MOZ_IPC - if (XRE_GetProcessType() == GeckoProcessType_Content) { - mozilla::dom::ContentChild::GetSingleton()->SendLoadURIExteneral(aURI); - return NS_OK; - } -#endif - nsCAutoString spec; aURI->GetSpec(spec);