From d3f83af35ceb6eeb3800b947cd61fd7d2704ac6a Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Wed, 7 Sep 2005 16:32:52 +0000 Subject: [PATCH] return a better error code when content policy blocked the load followup to bug 305565, r+sr=bz git-svn-id: svn://10.0.0.236/trunk@179798 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index deb17e13cfb..1704716f8e7 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -170,6 +170,7 @@ #include "nsIScriptSecurityManager.h" #include "nsIContentPolicy.h" #include "nsContentPolicyUtils.h" +#include "nsContentErrors.h" #ifdef XP_UNIX #if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) @@ -3366,7 +3367,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbeddedPlugin(const char *aMimeType, nsnull, //extra &shouldLoad); if (NS_FAILED(rv) || NS_CP_REJECTED(shouldLoad)) - return NS_ERROR_FAILURE; + return NS_ERROR_CONTENT_BLOCKED_SHOW_ALT; }