From 2751ea016ba86eaf76f49178292af2a37fbde716 Mon Sep 17 00:00:00 2001 From: "peterlubczynski%netscape.com" Date: Mon, 21 Oct 2002 02:05:59 +0000 Subject: [PATCH] Backing out fix to bug 163568 to fix bug 169991, r=darin, sr=bzbarsky, a=dbaron --- docshell/base/nsDocShell.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 303aa6a9c1fb..897c972aed82 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -140,7 +140,6 @@ #include "nsIWebBrowserChromeFocus.h" #include "nsPluginError.h" -#include "nsIURL.h" static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID); static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); @@ -4456,26 +4455,6 @@ nsDocShell::NewContentViewerObj(const char *aContentType, nsCOMPtr pluginHost (do_GetService(kPluginManagerCID)); nsCOMPtr aOpenedChannel = do_QueryInterface(request); - // check plugins to see if there is an override mime type for this extension - if (pluginHost && - NS_FAILED(pluginHost->IsPluginEnabledForType(aContentType))) { - // get the extension from the url which we get from the channel - nsCOMPtr uri; - if (NS_SUCCEEDED(aOpenedChannel->GetURI(getter_AddRefs(uri)))) { - nsCOMPtr url = do_QueryInterface(uri); - if (url) { - nsCAutoString fileExtension; - url->GetFileExtension(fileExtension); - if (!fileExtension.IsEmpty()) { - // ask the plugin host for a mime type for this extension - const char* pluginMimeType; - if (NS_SUCCEEDED(pluginHost->IsPluginEnabledForExtension(fileExtension.get(), pluginMimeType))) - aContentType = pluginMimeType; - } - } - } - } - //XXX This should probably be some category thing.... nsCAutoString contractId(NS_DOCUMENT_LOADER_FACTORY_CONTRACTID_PREFIX "view"