diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index b93996c0016..76d21ac4bd5 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -262,8 +262,6 @@ public: NS_IMETHOD GetValue(nsPluginInstancePeerVariable variable, void *value); - NS_IMETHOD PluginNotAvailable(const char *aMimeType); - //nsIPluginTagInfo interface NS_IMETHOD GetAttributes(PRUint16& n, const char*const*& names, @@ -1921,12 +1919,6 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetValue(nsPluginInstancePeerVariable varia return rv; } -NS_IMETHODIMP -nsPluginInstanceOwner::PluginNotAvailable(const char *aMimeType) -{ - return NS_OK; -} - NS_IMETHODIMP nsPluginInstanceOwner::GetTagType(nsPluginTagType *result) { NS_ENSURE_ARG_POINTER(result); diff --git a/mozilla/modules/plugin/base/public/nsIPluginInstanceOwner.idl b/mozilla/modules/plugin/base/public/nsIPluginInstanceOwner.idl index 5777d12282a..0cb2fd425ed 100644 --- a/mozilla/modules/plugin/base/public/nsIPluginInstanceOwner.idl +++ b/mozilla/modules/plugin/base/public/nsIPluginInstanceOwner.idl @@ -47,7 +47,7 @@ interface nsIDocument; [ref] native nsIPluginInstanceRef(nsIPluginInstance *); -[uuid(18270870-32f1-11d2-a830-0040959a28c9)] +[uuid(2e6cc23b-7d4e-4b0a-ad45-f2281c937f5c)] interface nsIPluginInstanceOwner : nsISupports { /** @@ -128,9 +128,4 @@ interface nsIPluginInstanceOwner : nsISupports * Get the specified variable */ void getValue(in nsPluginInstancePeerVariable aVariable, in voidPtr aValue); - - /** - * Inform the owner that no plugin for the given mime type was found. - */ - void pluginNotAvailable(in string aMimeType); }; diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index e0be39e93b5..913e697f0e9 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -3857,11 +3857,6 @@ NS_IMETHODIMP nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType, if (fileExtension.IsEmpty() || !(pluginTag = FindPluginEnabledForExtension(fileExtension.get(), mimetype))) { - - if (mDefaultPluginDisabled) { - aOwner->PluginNotAvailable(aMimeType ? aMimeType : mimetype); - } - return NS_ERROR_FAILURE; } }