diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 571693278392..0c674040346d 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -617,7 +617,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // get the nsIPluginHost interface pluginHost = do_GetService(kCPluginManagerCID); if (!pluginHost) - return NS_ERROR_MODULE_PLUGINS; + return NS_ERROR_FAILURE; mInstanceOwner->SetPluginHost(pluginHost); rv = InstantiatePlugin(aPresContext, aMetrics, aReflowState, pluginHost, mimeType, fullURL); @@ -657,7 +657,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // get the nsIPluginHost interface pluginHost = do_GetService(kCPluginManagerCID); if (!pluginHost) - return NS_ERROR_MODULE_PLUGINS; + return NS_ERROR_FAILURE; mInstanceOwner->SetPluginHost(pluginHost); if(pluginHost->IsPluginEnabledForType("application/x-oleobject") == NS_OK) @@ -699,7 +699,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // get the nsIPluginHost interface pluginHost = do_GetService(kCPluginManagerCID); if (!pluginHost) - return NS_ERROR_MODULE_PLUGINS; + return NS_ERROR_FAILURE; mInstanceOwner->SetPluginHost(pluginHost); diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp index 571693278392..0c674040346d 100644 --- a/layout/html/base/src/nsObjectFrame.cpp +++ b/layout/html/base/src/nsObjectFrame.cpp @@ -617,7 +617,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // get the nsIPluginHost interface pluginHost = do_GetService(kCPluginManagerCID); if (!pluginHost) - return NS_ERROR_MODULE_PLUGINS; + return NS_ERROR_FAILURE; mInstanceOwner->SetPluginHost(pluginHost); rv = InstantiatePlugin(aPresContext, aMetrics, aReflowState, pluginHost, mimeType, fullURL); @@ -657,7 +657,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // get the nsIPluginHost interface pluginHost = do_GetService(kCPluginManagerCID); if (!pluginHost) - return NS_ERROR_MODULE_PLUGINS; + return NS_ERROR_FAILURE; mInstanceOwner->SetPluginHost(pluginHost); if(pluginHost->IsPluginEnabledForType("application/x-oleobject") == NS_OK) @@ -699,7 +699,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // get the nsIPluginHost interface pluginHost = do_GetService(kCPluginManagerCID); if (!pluginHost) - return NS_ERROR_MODULE_PLUGINS; + return NS_ERROR_FAILURE; mInstanceOwner->SetPluginHost(pluginHost);