From caf4efc1952b29f17e3717329b58504ec4e62057 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Tue, 13 Sep 2005 13:29:52 +0000 Subject: [PATCH] return a better error code when content policy blocked the load followup to bug 305565, r+sr=bz a=asa git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@180107 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 8824c10545c..3a703abceba 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -169,6 +169,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) @@ -3365,7 +3366,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; }