diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 162a14c27cd..71de5849283 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -194,7 +194,8 @@ static const char *kPluginTmpDirName = "plugtmp"; // 0.02 added caching of CanUnload to fix bug 105935 // 0.03 changed name, description and mime desc from string to bytes, bug 108246 // 0.04 added new mime entry point on Mac, bug 113464 -static const char *kPluginInfoVersion = "0.04"; +// 0.05 added new entry point for the default plugin, bug 132430 +static const char *kPluginInfoVersion = "0.05"; //////////////////////////////////////////////////////////////////////// // CID's && IID's static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID); @@ -3900,7 +3901,6 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, } } #endif - this->PostStartupMessageForType(aMimeType, aOwner); result = plugin->CreateInstance(NULL, kIPluginInstanceIID, (void **)&instance); #ifdef XP_WIN @@ -4410,50 +4410,6 @@ nsPluginHostImpl::FindPluginEnabledForType(const char* aMimeType, return NS_ERROR_FAILURE; } -nsresult -nsPluginHostImpl::PostStartupMessageForType(const char* aMimeType, - nsIPluginInstanceOwner* aOwner) -{ - nsresult rv; - NS_ASSERTION(aOwner && aMimeType, - "PostStartupMessageForType: invalid arguments"); - - PRUnichar *messageUni = nsnull; - nsAutoString msg; - nsCOMPtr regionalBundle; - nsCOMPtr strings(do_GetService(kStringBundleServiceCID, - &rv)); - if (!strings) { - return rv; - } - rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, - getter_AddRefs(regionalBundle)); - if (NS_FAILED(rv)) { - return rv; - } - rv = regionalBundle->GetStringFromName(NS_LITERAL_STRING("pluginStartupMessage").get(), - &messageUni); - if (NS_FAILED(rv)){ - return rv; - } - msg = messageUni; - nsMemory::Free((void *)messageUni); - - msg.Append(PRUnichar(' ')); - msg.AppendWithConversion(aMimeType, PL_strlen(aMimeType)); -#ifdef PLUGIN_LOGGING - PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_ALWAYS, - ("nsPluginHostImpl::PostStartupMessageForType(aMimeType=%s)\n", - aMimeType)); - - PR_LogFlush(); -#endif - - rv = aOwner->ShowStatus(msg.get()); - - return rv; -} - //////////////////////////////////////////////////////////////////////// NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugin** aPlugin) { diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h index 6d502c897be..1c8c1bfef72 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h @@ -402,10 +402,6 @@ private: nsresult FindPluginEnabledForType(const char* aMimeType, nsPluginTag* &aPlugin); - nsresult - PostStartupMessageForType(const char* aMimeType, - nsIPluginInstanceOwner* aOwner); - nsresult FindStoppedPluginForURL(nsIURI* aURL, nsIPluginInstanceOwner *aOwner);